Updated aggregator