Added aggregator class