Added better and working CDATA handling