Patched the xml classes.