Add xf:wrap, xf:unwrap