MetadataImporter refactorings