Added enumeration to loop