try to simplify importer class a bit more