Add support for CDATA (v2)