XSD schema improved