Improved importer.