Changes in Enumeration class