ModelMigrator refactoring