Add the XML support