Updates to XSD, XML and a new callback