Importer speedup

commit by commit