improvements to importer dsl