Sailee : Refactored the XmlParser code