Migrated more functionality into StorageFormatManager.