Update to SmartCash and XHV