Add groupByNodes