ATEAM-380 Addressing comments, updating enum to be class