Aggr

With these patches aggregation will work. Some fixes in data
path are also required.