Changes to use String ID in Importer