Refactored enum values