CDATA support added