Refactored enum values into their own container class.