Lots of work done on the importer