Added unique and shared match_pair accumulators