Importer optimizations