Adding support for aggregated execution