Moved enums to Entities