adding aggregation framework support