moar enumeration support