Refactored enum