Refactor importer