Comments fixed and XmlParser definition added