Changed structure and added XmlResponse