Aggregator refactoring