Some improvements for the XML parsing, as there are somethings that we don't need...