Add xml decoding and CDATA