Updated for xsd generation using schemagen