Fixed conversion, and added CDATA children