Added element and string wrapping.