Handling AGGREGATOR in v2.0.7