Replace the cdata-ing by the new method