Big commit of Enum classes