Importer performance tweaks