Refactored aggregator config