Work in progress to support the aggregation framework