Refactored enum's