Refactored enums into their own container class.