Fixed XSD (finally?!)