Updated to use recent changes in importer-utils