Improved importer performance