Adding support for aggregating mode