Add support for multi-field group by clauses