Allow grouping to use expressions
Allow grouping to use expressions