New version of XSD and fixes in xml for 2012