Removal of references to includeAggregates param