Change agg to expression leaf level