Refactored Enum