#515 XSD extended