Add GroupingExpression to replace the Seq[Expression]