Aggregator improvements