Xml parser improved