Removed use of Enumeration