Added enumeration interface