Aggregations API suport improvements