Expand GroupBy support