Clean Up after fixing removal of Enums in Entity Classes
Fixed Issue with Enum types.  They needed to be annotated at the Field (method) level and not the class level for each entity.