added Aggregations support