Bring into line with XSD