+ Update DefinedType and SystemEmail entities to use Categories from Category table instead of free-form text