Improve aggregation