refactor of importer