Improve wrapping