Got working with the latest importer code