Changes to aggregator