Reworked StorageUri versioning