TAG disjoint class improvements