refactored importer. #483