Massive changes to XML classes.