Working with the latest importer code