Added missing XSD imports