Replace GroupingResolver with AugmentationGroupingResolver