Adding aggregations to improve performance