refactored XSD for coherency