Updated post-aggs to be easier to express and use