Adding Aggregator support
Some changes to Aggregators