More refactoring on importers