Added Xml support