Replaced Enumeration with Iterator