More intellgent use of party enumeration