Updated XmlTypes