Importer refactoring