Updated Enumeration handling