Even more importer updates