More work on importer class.