Importer framework improvements