Minor overhaul of importer interface