Some more updates for work on the importer.