Changing the importer to use objects.