Updated XmlParser to include nested tags