Added better support for delta aggregations