Major updates to importer.