Improve groupBy and aggregate functions syntax