Fixed to work with cloud and file storage
Version bump