Improve entity importer performance