Make aggregations combinable and remove AVG aggregation