updated xsd, templates and codegen