improved enumeration performance