Importer improvements