Update to expression wrapper