Added enumeration support.