Added first version of non-aggregation mode.