Changes to importer