Enums fixes and entities