refactored importer