Changes in schema to be able to validate against xsd