Hacked in some remoteStorage functionality