Aggregator validation rebase