Preparation for StorageTypeChange