Xml parser final commit