Some improvements for Aggregation functionality