Added aggregation support