Added WRAP_CONTENT support from inazaruk