importer refactoring