further reduce duplication in importer class