- improved enumeration parser