Added xsdHandler