Currently, output model mapping uses the following piece of XML Schema: The suggested changes would require this new schema: Where the new element references are defined as: Notes: * The substitutionGroup attribute in the property element is related to its use in filters. * The class element is not directly used by the output model mapping, but it's a convenient definition that can be used by other parts of the protocol.