Refactored enums