Improve XmlParser. AUTO-generated classes.