Changes to XmlAspect