Add category wrappers to migration script
Fix up metadata update script