@nmshd/runtime 2.0.0-beta.20 → 2.0.0-beta.23

package/lib-web/nmshd.runtime.js

@@ -448,11 +448,11 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.20",
-    build: "106",
-    date: "2022-08-25T08:33:05+00:00",
-    commit: "9d3977f9788c489ac4a353b0fc4c183a35b8a365",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.4","@js-soft/ts-utils":"^2.2.2","@nmshd/consumption":"2.0.0-beta.10","@nmshd/content":"2.0.0-beta.13","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.4","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","luxon":"^3.0.1","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "2.0.0-beta.23",
+    build: "109",
+    date: "2022-09-09T12:00:25+00:00",
+    commit: "c947562c2d16fb241d86de627a054fef64edc5bf",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.4","@js-soft/ts-utils":"^2.2.2","@nmshd/consumption":"2.0.0-beta.15","@nmshd/content":"2.0.0-beta.22","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.4","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","luxon":"^3.0.3","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         consumption: consumption_1.buildInformation,
@@ -710,7 +710,11 @@ let DataViewExpander = class DataViewExpander {
     async expandRelationshipTemplateDTO(template) {
         let onNewRelationship;
         let onExistingRelationship;
-        let name = "i18n://dvo.template.name";
+        const createdBy = await this.expandAddress(template.createdBy);
+        const type = template.isOwn ? "RelationshipTemplateDVO" : "PeerRelationshipTemplateDVO";
+        let name = template.isOwn ? "i18n://dvo.template.outgoing.name" : "i18n://dvo.template.incoming.name";
+        const description = template.isOwn ? "i18n://dvo.template.outgoing.description" : "i18n://dvo.template.incoming.description";
+        let expandedLocalRequest;
         if (template.content["@type"] === "RelationshipTemplateBody") {
             const templateBody = content_1.RelationshipTemplateBody.from(template.content).toJSON();
             if (templateBody.title) {
@@ -718,20 +722,28 @@ let DataViewExpander = class DataViewExpander {
             }
             let localRequest;
             if (!template.isOwn) {
-                const onNewRelationshipRequest = await this.consumption.incomingRequests.getRequests({
+                const incomingRequestResult = await this.consumption.incomingRequests.getRequests({
                     query: {
-                        "source.reference": template.id
+                        "source.reference": template.id,
+                        status: consumption_1.LocalRequestStatus.ManualDecisionRequired
                     }
                 });
-                localRequest = onNewRelationshipRequest.value[0];
-                return {
-                    name,
-                    type: "PeerRelationshipTemplateDVO",
-                    date: template.createdAt,
-                    ...template,
-                    createdBy: await this.expandAddress(template.createdBy),
-                    onNewRelationship: await this.expandLocalRequestDTO(localRequest)
-                };
+                if (incomingRequestResult.value.length > 0) {
+                    localRequest = incomingRequestResult.value[0];
+                    expandedLocalRequest = await this.expandLocalRequestDTO(localRequest);
+                }
+                else {
+                    const completedRequestResult = await this.consumption.incomingRequests.getRequests({
+                        query: {
+                            "source.reference": template.id,
+                            status: [consumption_1.LocalRequestStatus.Decided, consumption_1.LocalRequestStatus.Completed]
+                        }
+                    });
+                    if (completedRequestResult.value.length > 0) {
+                        localRequest = completedRequestResult.value[0];
+                        expandedLocalRequest = await this.expandLocalRequestDTO(localRequest);
+                    }
+                }
             }
             onNewRelationship = await this.expandRequest(templateBody.onNewRelationship);
             if (templateBody.onExistingRelationship) {
@@ -740,10 +752,12 @@ let DataViewExpander = class DataViewExpander {
         }
         return {
             name,
-            type: "RelationshipTemplateDVO",
+            description,
+            type,
             date: template.createdAt,
             ...template,
-            createdBy: await this.expandAddress(template.createdBy),
+            createdBy,
+            request: expandedLocalRequest,
             onNewRelationship,
             onExistingRelationship
         };
@@ -784,8 +798,8 @@ let DataViewExpander = class DataViewExpander {
                         ...readAttributeRequestItem,
                         type: "DecidableReadAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
-                        query: await this.processIdentityAttributeQuery(readAttributeRequestItem.query),
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableReadAttributeRequestItem.name",
+                        query: await this.processAttributeQuery(readAttributeRequestItem.query),
                         isDecidable
                     };
                 }
@@ -794,27 +808,45 @@ let DataViewExpander = class DataViewExpander {
                     type: "ReadAttributeRequestItemDVO",
                     id: "",
                     name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
-                    query: this.expandIdentityAttributeQuery(readAttributeRequestItem.query),
+                    query: await this.expandAttributeQuery(readAttributeRequestItem.query),
                     isDecidable
                 };
-            case "CreateRelationshipAttributeRequestItem":
+            case "CreateAttributeRequestItem":
                 const createAttributeRequestItem = requestItem;
+                const attribute = await this.expandAttribute(createAttributeRequestItem.attribute);
+                let isIdentityAttribute = false;
+                if (attribute.type === "DraftIdentityAttributeDVO") {
+                    isIdentityAttribute = true;
+                }
+                const name = requestItem.title;
+                const description = requestItem.description;
+                let fallbackName;
                 if (isDecidable) {
+                    fallbackName = "i18n://dvo.requestItem.DecidableCreateIdentityAttributeRequestItem.name";
+                    if (isIdentityAttribute) {
+                        fallbackName = "i18n://dvo.requestItem.DecidableCreateRelationshipAttributeRequestItem.name";
+                    }
                     return {
                         ...createAttributeRequestItem,
-                        type: "DecidableCreateRelationshipAttributeRequestItemDVO",
+                        type: "DecidableCreateAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.CreateRelationshipAttributeRequestItem.name",
-                        attribute: await this.expandAttribute(createAttributeRequestItem.attribute),
+                        name: name ? name : fallbackName,
+                        description: description ? description : fallbackName,
+                        attribute,
                         isDecidable
                     };
                 }
+                fallbackName = "i18n://dvo.requestItem.CreateIdentityAttributeRequestItem.name";
+                if (isIdentityAttribute) {
+                    fallbackName = "i18n://dvo.requestItem.CreateRelationshipAttributeRequestItem.name";
+                }
                 return {
                     ...createAttributeRequestItem,
-                    type: "CreateRelationshipAttributeRequestItemDVO",
+                    type: "CreateAttributeRequestItemDVO",
                     id: "",
-                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.CreateRelationshipAttributeRequestItem.name",
-                    attribute: await this.expandAttribute(createAttributeRequestItem.attribute),
+                    name: name ? name : fallbackName,
+                    description: description ? description : fallbackName,
+                    attribute,
                     isDecidable
                 };
             case "ProposeAttributeRequestItem":
@@ -827,9 +859,9 @@ let DataViewExpander = class DataViewExpander {
                         ...proposeAttributeRequestItem,
                         type: "DecidableProposeAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableProposeAttributeRequestItem.name",
                         attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
-                        query: await this.processIdentityAttributeQuery(proposeAttributeRequestItem.query),
+                        query: await this.processAttributeQuery(proposeAttributeRequestItem.query),
                         isDecidable
                     };
                 }
@@ -839,7 +871,7 @@ let DataViewExpander = class DataViewExpander {
                     id: "",
                     name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
                     attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
-                    query: this.expandIdentityAttributeQuery(proposeAttributeRequestItem.query),
+                    query: await this.expandAttributeQuery(proposeAttributeRequestItem.query),
                     isDecidable
                 };
             case "ShareAttributeRequestItem":
@@ -850,7 +882,7 @@ let DataViewExpander = class DataViewExpander {
                         ...shareAttributeRequestItem,
                         type: "DecidableShareAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableProposeAttributeRequestItem.name",
                         attribute: attributeDVO,
                         isDecidable
                     };
@@ -910,7 +942,7 @@ let DataViewExpander = class DataViewExpander {
                         name: name,
                         attribute: localAttributeDVOForRead
                     };
-                case "CreateRelationshipAttributeAcceptResponseItem":
+                case "CreateAttributeAcceptResponseItem":
                     const createAttributeResponseItem = responseItem;
                     const localAttributeResultForCreate = await this.consumption.attributes.getAttribute({ id: createAttributeResponseItem.attributeId });
                     const localAttributeDVOForCreate = await this.expandLocalAttributeDTO(localAttributeResultForCreate.value);
@@ -983,10 +1015,12 @@ let DataViewExpander = class DataViewExpander {
         }
         const directionLabel = request.isOwn ? "outgoing" : "incoming";
         const statusText = `i18n://dvo.localRequest.status.${request.status}`;
+        const response = request.response ? await this.expandLocalResponseDTO(request.response, request) : undefined;
         // TODO: Wait for request.title from content and use it
+        const requestIdOutOfResponse = request.response ? request.response.content.requestId : "";
         return {
             ...request,
-            id: request.id,
+            id: request.id ? request.id : requestIdOutOfResponse,
             content: requestDVO,
             items: requestDVO.items,
             name: `i18n://dvo.localRequest.${directionLabel}.name`,
@@ -996,7 +1030,7 @@ let DataViewExpander = class DataViewExpander {
             createdBy: request.isOwn ? this.expandSelf() : peerDVO,
             decider: request.isOwn ? peerDVO : this.expandSelf(),
             peer: peerDVO,
-            response: request.response ? await this.expandLocalResponseDTO(request.response, request) : undefined,
+            response,
             statusText: statusText,
             isDecidable
         };
@@ -1038,14 +1072,69 @@ let DataViewExpander = class DataViewExpander {
         const owner = attribute.content.owner;
         let name = `i18n://dvo.attribute.name.${valueType}`;
         let description = `i18n://dvo.attribute.description.${valueType}`;
-        if (localAttribute.content instanceof content_1.RelationshipAttribute) {
-            name = "";
-            description = "";
-        }
         const renderHints = localAttribute.content.value.renderHints.toJSON();
         const valueHints = localAttribute.content.value.valueHints.toJSON();
         if (localAttribute.shareInfo) {
             const peer = localAttribute.shareInfo.peer.toString();
+            if (localAttribute.content instanceof content_1.RelationshipAttribute) {
+                const relationshipAttribute = localAttribute.content;
+                const valueAsAny = relationshipAttribute.value;
+                if (valueAsAny.title) {
+                    name = valueAsAny.title;
+                }
+                if (valueAsAny.description) {
+                    description = valueAsAny.description;
+                }
+                // Peer Relationship Attribute
+                if (relationshipAttribute.owner === localAttribute.shareInfo.peer) {
+                    return {
+                        type: "PeerRelationshipAttributeDVO",
+                        id: attribute.id,
+                        name,
+                        key: relationshipAttribute.key,
+                        confidentiality: relationshipAttribute.confidentiality,
+                        description,
+                        content: attribute.content,
+                        value: attribute.content.value,
+                        date: attribute.createdAt,
+                        owner,
+                        renderHints,
+                        valueHints,
+                        isValid: true,
+                        createdAt: attribute.createdAt,
+                        isOwn: false,
+                        peer: peer,
+                        isDraft: false,
+                        requestReference: localAttribute.shareInfo.requestReference.toString(),
+                        valueType,
+                        isTechnical: relationshipAttribute.isTechnical
+                    };
+                }
+                // Own Relationship Attribute
+                return {
+                    type: "OwnRelationshipAttributeDVO",
+                    id: attribute.id,
+                    name,
+                    key: relationshipAttribute.key,
+                    confidentiality: relationshipAttribute.confidentiality,
+                    description,
+                    content: attribute.content,
+                    value: attribute.content.value,
+                    date: attribute.createdAt,
+                    owner,
+                    renderHints,
+                    valueHints,
+                    isValid: true,
+                    createdAt: attribute.createdAt,
+                    isOwn: true,
+                    peer: peer,
+                    isDraft: false,
+                    requestReference: localAttribute.shareInfo.requestReference.toString(),
+                    valueType,
+                    isTechnical: relationshipAttribute.isTechnical
+                };
+            }
+            const identityAttribute = localAttribute.content;
             if (localAttribute.shareInfo.sourceAttribute) {
                 // Own Shared Attribute
                 return {
@@ -1066,7 +1155,7 @@ let DataViewExpander = class DataViewExpander {
                     isDraft: false,
                     requestReference: localAttribute.shareInfo.requestReference.toString(),
                     sourceAttribute: localAttribute.shareInfo.sourceAttribute.toString(),
-                    tags: [],
+                    tags: identityAttribute.tags ? identityAttribute.tags : [],
                     valueType
                 };
             }
@@ -1088,10 +1177,11 @@ let DataViewExpander = class DataViewExpander {
                 peer: peer,
                 isDraft: false,
                 requestReference: localAttribute.shareInfo.requestReference.toString(),
-                tags: [],
+                tags: identityAttribute.tags ? identityAttribute.tags : [],
                 valueType
             };
         }
+        const identityAttribute = localAttribute.content;
         const sharedToPeerAttributes = await this.consumption.attributes.getAttributes({ query: { "shareInfo.sourceAttribute": attribute.id } });
         const sharedToPeerDVOs = await this.expandLocalAttributeDTOs(sharedToPeerAttributes.value);
         // Own Source Attribute
@@ -1111,7 +1201,7 @@ let DataViewExpander = class DataViewExpander {
             isOwn: true,
             isDraft: false,
             sharedWith: sharedToPeerDVOs,
-            tags: [],
+            tags: identityAttribute.tags ? identityAttribute.tags : [],
             valueType
         };
     }
@@ -1119,50 +1209,83 @@ let DataViewExpander = class DataViewExpander {
         const attributesPromise = attributes.map((attribute) => this.expandLocalAttributeDTO(attribute));
         return await Promise.all(attributesPromise);
     }
+    async expandAttributeQuery(query) {
+        switch (query["@type"]) {
+            case "IdentityAttributeQuery":
+                return this.expandIdentityAttributeQuery(query);
+            case "RelationshipAttributeQuery":
+                return await this.expandRelationshipAttributeQuery(query);
+            case "ThirdPartyRelationshipAttributeQuery":
+                return await this.expandThirdPartyRelationshipAttributeQuery(query);
+            default:
+                throw new Error("Wrong attribute query");
+        }
+    }
     expandIdentityAttributeQuery(query) {
         const valueType = query.valueType;
         const name = `i18n://dvo.attribute.name.${valueType}`;
         const description = `i18n://dvo.attribute.description.${valueType}`;
-        const valueTypeClass = ts_serval_1.SerializableBase.getModule(valueType, 1);
-        if (!valueTypeClass) {
-            throw new Error(`No class implementation found for ${valueType}`);
-        }
-        let renderHints = {
-            "@type": "RenderHints",
-            editType: content_1.RenderHintsEditType.InputLike,
-            technicalType: content_1.RenderHintsTechnicalType.String
-        };
-        let valueHints = {
-            "@type": "ValueHints",
-            max: 200
+        const hints = this.getHintsForValueType(valueType);
+        return {
+            type: "IdentityAttributeQueryDVO",
+            id: "",
+            name,
+            description,
+            valueType,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            renderHints: hints.renderHints,
+            valueHints: hints.valueHints,
+            isProcessed: false
         };
-        if (valueTypeClass.renderHints && valueTypeClass.renderHints instanceof content_1.RenderHints) {
-            renderHints = valueTypeClass.renderHints.toJSON();
+    }
+    async expandRelationshipAttributeQuery(query) {
+        const valueType = query.attributeCreationHints.valueType;
+        let name = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        let description = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        if (query.attributeCreationHints.title) {
+            name = query.attributeCreationHints.title;
         }
-        if (valueTypeClass.valueHints && valueTypeClass.valueHints instanceof content_1.ValueHints) {
-            valueHints = valueTypeClass.valueHints.toJSON();
+        if (query.attributeCreationHints.description) {
+            description = query.attributeCreationHints.description;
+        }
+        const hints = this.getHintsForValueType(valueType);
+        if (query.attributeCreationHints.valueHints) {
+            hints.valueHints = query.attributeCreationHints.valueHints;
         }
         return {
-            type: "IdentityAttributeQueryDVO",
+            type: "RelationshipAttributeQueryDVO",
             id: "",
             name,
             description,
-            valueType,
             validFrom: query.validFrom,
             validTo: query.validTo,
-            renderHints,
-            valueHints,
+            owner: await this.expandAddress(query.owner),
+            key: query.key,
+            attributeCreationHints: query.attributeCreationHints,
+            renderHints: hints.renderHints,
+            valueHints: hints.valueHints,
+            isProcessed: false,
+            valueType
+        };
+    }
+    async expandThirdPartyRelationshipAttributeQuery(query) {
+        const name = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        const description = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        return {
+            type: "ThirdPartyRelationshipAttributeQueryDVO",
+            id: "",
+            name,
+            description,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            owner: await this.expandAddress(query.owner),
+            thirdParty: await this.expandAddress(query.thirdParty),
+            key: query.key,
             isProcessed: false
         };
     }
-    async processIdentityAttributeQuery(query) {
-        const matchedAttributeDTOs = await this.consumption.attributes.executeIdentityAttributeQuery({
-            query
-        });
-        const matchedAttributeDVOs = await this.expandLocalAttributeDTOs(matchedAttributeDTOs.value);
-        const valueType = query.valueType;
-        const name = `i18n://dvo.attribute.name.${valueType}`;
-        const description = `i18n://dvo.attribute.description.${valueType}`;
+    getHintsForValueType(valueType) {
         const valueTypeClass = ts_serval_1.SerializableBase.getModule(valueType, 1);
         if (!valueTypeClass) {
             throw new Error(`No class implementation found for ${valueType}`);
@@ -1182,37 +1305,127 @@ let DataViewExpander = class DataViewExpander {
         if (valueTypeClass.valueHints && valueTypeClass.valueHints instanceof content_1.ValueHints) {
             valueHints = valueTypeClass.valueHints.toJSON();
         }
+        return { renderHints, valueHints };
+    }
+    async processAttributeQuery(attributeQuery) {
+        switch (attributeQuery["@type"]) {
+            case "IdentityAttributeQuery":
+                return await this.processIdentityAttributeQuery(attributeQuery);
+            case "RelationshipAttributeQuery":
+                return await this.processRelationshipAttributeQuery(attributeQuery);
+            case "ThirdPartyRelationshipAttributeQuery":
+                return await this.processThirdPartyRelationshipAttributeQuery(attributeQuery);
+            default:
+                throw new Error("Wrong attribute query");
+        }
+    }
+    async processIdentityAttributeQuery(query) {
+        const matchedAttributeDTOs = await this.consumption.attributes.executeIdentityAttributeQuery({
+            query
+        });
+        const matchedAttributeDVOs = await this.expandLocalAttributeDTOs(matchedAttributeDTOs.value);
         return {
+            ...this.expandIdentityAttributeQuery(query),
             type: "ProcessedIdentityAttributeQueryDVO",
-            id: "",
+            results: matchedAttributeDVOs,
+            isProcessed: true
+        };
+    }
+    async processRelationshipAttributeQuery(query) {
+        const matchedAttributeDTOResult = await this.consumption.attributes.executeRelationshipAttributeQuery({
+            query
+        });
+        if (matchedAttributeDTOResult.isError) {
+            if (matchedAttributeDTOResult.error.code !== "error.runtime.recordNotFound") {
+                throw matchedAttributeDTOResult.error;
+            }
+            return {
+                ...(await this.expandRelationshipAttributeQuery(query)),
+                type: "ProcessedRelationshipAttributeQueryDVO",
+                results: [],
+                isProcessed: true
+            };
+        }
+        const matchedAttributeDVOs = await this.expandLocalAttributeDTO(matchedAttributeDTOResult.value);
+        return {
+            ...(await this.expandRelationshipAttributeQuery(query)),
+            type: "ProcessedRelationshipAttributeQueryDVO",
+            results: [matchedAttributeDVOs],
+            isProcessed: true
+        };
+    }
+    async processThirdPartyRelationshipAttributeQuery(query) {
+        const matchedAttributeDTOResult = await this.consumption.attributes.executeThirdPartyRelationshipAttributeQuery({
+            query
+        });
+        if (matchedAttributeDTOResult.isError) {
+            if (matchedAttributeDTOResult.error.code !== "error.runtime.recordNotFound") {
+                throw matchedAttributeDTOResult.error;
+            }
+            return {
+                ...(await this.expandThirdPartyRelationshipAttributeQuery(query)),
+                type: "ProcessedThirdPartyRelationshipAttributeQueryDVO",
+                results: [],
+                isProcessed: true
+            };
+        }
+        const matchedAttributeDVO = await this.expandLocalAttributeDTO(matchedAttributeDTOResult.value);
+        const correctlyTypedAttribute = matchedAttributeDVO;
+        return {
+            ...(await this.expandThirdPartyRelationshipAttributeQuery(query)),
+            type: "ProcessedThirdPartyRelationshipAttributeQueryDVO",
+            results: [correctlyTypedAttribute],
+            renderHints: correctlyTypedAttribute.renderHints,
+            valueHints: correctlyTypedAttribute.valueHints,
+            valueType: correctlyTypedAttribute.valueType,
+            isProcessed: true
+        };
+    }
+    async expandIdentityAttribute(attribute, attributeInstance) {
+        const valueType = attribute.value["@type"];
+        const name = `i18n://dvo.attribute.name.${valueType}`;
+        const description = `i18n://dvo.attribute.description.${valueType}`;
+        const renderHints = attributeInstance.value.renderHints.toJSON();
+        const valueHints = attributeInstance.value.valueHints.toJSON();
+        const owner = await this.expandAddress(attribute.owner);
+        return {
+            type: "DraftIdentityAttributeDVO",
+            content: attribute,
             name,
             description,
-            valueType,
-            validFrom: query.validFrom,
-            validTo: query.validTo,
-            results: matchedAttributeDVOs,
+            id: "",
+            owner: owner,
             renderHints,
             valueHints,
-            isProcessed: true
+            value: attribute.value,
+            isDraft: true,
+            isOwn: owner.isSelf,
+            valueType,
+            tags: attributeInstance.tags ? attributeInstance.tags : []
         };
     }
-    async expandAttribute(attribute) {
-        const attributeInstance = ts_serval_1.Serializable.fromAny(attribute);
+    async expandRelationshipAttribute(attribute, attributeInstance) {
         const valueType = attribute.value["@type"];
         let name = `i18n://dvo.attribute.name.${valueType}`;
         let description = `i18n://dvo.attribute.description.${valueType}`;
         const renderHints = attributeInstance.value.renderHints.toJSON();
         const valueHints = attributeInstance.value.valueHints.toJSON();
-        if (attributeInstance instanceof content_1.RelationshipAttribute) {
-            name = ""; // attributeInstance.value.title;
-            description = ""; // attributeInstance.value.description;
+        const valueAsAny = attributeInstance.value;
+        if (valueAsAny.title) {
+            name = valueAsAny.title;
+        }
+        if (valueAsAny.description) {
+            description = valueAsAny.description;
         }
         const owner = await this.expandAddress(attribute.owner);
         return {
-            type: "DraftAttributeDVO",
+            type: "DraftRelationshipAttributeDVO",
             content: attribute,
             name,
             description,
+            key: attribute.key,
+            confidentiality: attribute.confidentiality,
+            isTechnical: !!attribute.isTechnical,
             id: "",
             owner: owner,
             renderHints,
@@ -1220,9 +1433,19 @@ let DataViewExpander = class DataViewExpander {
             value: attribute.value,
             isDraft: true,
             isOwn: owner.isSelf,
-            valueType: attribute.value["@type"]
+            valueType
         };
     }
+    async expandAttribute(attribute) {
+        const attributeInstance = ts_serval_1.Serializable.fromAny(attribute);
+        if (attributeInstance instanceof content_1.IdentityAttribute) {
+            return await this.expandIdentityAttribute(attribute, attributeInstance);
+        }
+        else if (attributeInstance instanceof content_1.RelationshipAttribute) {
+            return await this.expandRelationshipAttribute(attribute, attributeInstance);
+        }
+        throw new Error("Wrong attribute instance");
+    }
     async expandAttributes(attributes) {
         const attributesPromise = attributes.map((attribute) => this.expandAttribute(attribute));
         return await Promise.all(attributesPromise);
@@ -1346,7 +1569,7 @@ let DataViewExpander = class DataViewExpander {
                 attributesByType[valueType] = [attribute];
             }
             if (nameRelevantAttributeTypes.includes(valueType)) {
-                if (stringByType[valueType]) {
+                if (stringByType[valueType] && valueType === "GivenName") {
                     stringByType[valueType] += ` ${attribute.content.value.value}`;
                 }
                 else {
@@ -1379,12 +1602,18 @@ let DataViewExpander = class DataViewExpander {
         if (stringByType["DisplayName"]) {
             name = stringByType["DisplayName"];
         }
+        else if (stringByType["MiddleName"] && stringByType["GivenName"] && stringByType["Surname"]) {
+            name = `${stringByType["GivenName"]} ${stringByType["MiddleName"]} ${stringByType["Surname"]}`;
+        }
         else if (stringByType["GivenName"] && stringByType["Surname"]) {
             name = `${stringByType["GivenName"]} ${stringByType["Surname"]}`;
         }
         else if (stringByType["Sex"] && stringByType["Surname"]) {
             name = `i18n://dvo.identity.Salutation.${stringByType["Sex"]} ${stringByType["Surname"]}`;
         }
+        else if (stringByType["Surname"]) {
+            name = `${stringByType["Surname"]}`;
+        }
         else {
             name = relationship.peer.substring(3, 9);
         }
@@ -1403,7 +1632,8 @@ let DataViewExpander = class DataViewExpander {
             items: expandedAttributes,
             nameMap: stringByType,
             changes: changes,
-            changeCount: changes.length
+            changeCount: changes.length,
+            templateId: relationship.template.id
         };
     }
     async expandRelationshipDTO(relationship) {
@@ -3069,7 +3299,7 @@ exports.AttributesFacade = void 0;
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const useCases_1 = __webpack_require__(/*! ../../../useCases */ "./dist/useCases/index.js");
 let AttributesFacade = class AttributesFacade {
-    constructor(createAttributeUseCase, createSharedAttributeCopyUseCase, deleteAttributeUseCase, getPeerAttributesUseCase, getSharedToPeerAttributesUseCase, getAttributeUseCase, getAttributesUseCase, succeedAttributeUseCase, updateAttributeUseCase, executeIdentityAttributeQueryUseCase, executeRelationshipAttributeQueryUseCase) {
+    constructor(createAttributeUseCase, createSharedAttributeCopyUseCase, deleteAttributeUseCase, getPeerAttributesUseCase, getSharedToPeerAttributesUseCase, getAttributeUseCase, getAttributesUseCase, succeedAttributeUseCase, updateAttributeUseCase, executeIdentityAttributeQueryUseCase, executeRelationshipAttributeQueryUseCase, executeThirdPartyRelationshipAttributeQueryUseCase) {
         this.createAttributeUseCase = createAttributeUseCase;
         this.createSharedAttributeCopyUseCase = createSharedAttributeCopyUseCase;
         this.deleteAttributeUseCase = deleteAttributeUseCase;
@@ -3081,6 +3311,7 @@ let AttributesFacade = class AttributesFacade {
         this.updateAttributeUseCase = updateAttributeUseCase;
         this.executeIdentityAttributeQueryUseCase = executeIdentityAttributeQueryUseCase;
         this.executeRelationshipAttributeQueryUseCase = executeRelationshipAttributeQueryUseCase;
+        this.executeThirdPartyRelationshipAttributeQueryUseCase = executeThirdPartyRelationshipAttributeQueryUseCase;
     }
     async createAttribute(request) {
         return await this.createAttributeUseCase.execute(request);
@@ -3109,6 +3340,9 @@ let AttributesFacade = class AttributesFacade {
     async executeRelationshipAttributeQuery(request) {
         return await this.executeRelationshipAttributeQueryUseCase.execute(request);
     }
+    async executeThirdPartyRelationshipAttributeQuery(request) {
+        return await this.executeThirdPartyRelationshipAttributeQueryUseCase.execute(request);
+    }
     async succeedAttribute(request) {
         return await this.succeedAttributeUseCase.execute(request);
     }
@@ -3128,6 +3362,7 @@ AttributesFacade = __decorate([
     __param(8, typescript_ioc_1.Inject),
     __param(9, typescript_ioc_1.Inject),
     __param(10, typescript_ioc_1.Inject),
+    __param(11, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [useCases_1.CreateAttributeUseCase,
         useCases_1.CreateSharedAttributeCopyUseCase,
         useCases_1.DeleteAttributeUseCase,
@@ -3138,7 +3373,8 @@ AttributesFacade = __decorate([
         useCases_1.SucceedAttributeUseCase,
         useCases_1.UpdateAttributeUseCase,
         useCases_1.ExecuteIdentityAttributeQueryUseCase,
-        useCases_1.ExecuteRelationshipAttributeQueryUseCase])
+        useCases_1.ExecuteRelationshipAttributeQueryUseCase,
+        useCases_1.ExecuteThirdPartyRelationshipAttributeQueryUseCase])
 ], AttributesFacade);
 exports.AttributesFacade = AttributesFacade;
 //# sourceMappingURL=AttributesFacade.js.map
@@ -5524,7 +5760,7 @@ const ajv_formats_1 = __importDefault(__webpack_require__(/*! ajv-formats */ "./
 class SchemaRepository {
     constructor() {
         this.jsonSchemas = new Map();
-        this.compiler = new ajv_1.default({ allErrors: true });
+        this.compiler = new ajv_1.default({ allErrors: true, allowUnionTypes: true });
         (0, ajv_formats_1.default)(this.compiler);
         (0, ajv_errors_1.default)(this.compiler);
     }
@@ -5570,8 +5806,8 @@ exports.JsonSchema = JsonSchema;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.CreateDeviceRequest = exports.ValidateChallengeRequest = exports.CreateChallengeRequest = exports.CreateDeviceChallengeRequest = exports.CreateIdentityChallengeRequest = exports.CreateRelationshipChallengeRequest = exports.SyncEverythingRequest = exports.DownloadAttachmentRequest = exports.SyncDatawalletRequest = exports.RegisterPushNotificationTokenRequest = exports.LoadItemFromTruncatedReferenceRequest = exports.DownloadFileRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.SentOutgoingRequestRequest = exports.RequireManualDecisionOfIncomingRequestRequest = exports.ReceivedIncomingRequestRequest = exports.GetOutgoingRequestsRequest = exports.GetOutgoingRequestRequest = exports.GetIncomingRequestsRequest = exports.GetIncomingRequestRequest = exports.CreateOutgoingRequestRequest = exports.CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeRequest = exports.CompleteOutgoingRequestRequest = exports.CompleteIncomingRequestRequest = exports.CheckPrerequisitesOfIncomingRequestRequest = exports.RejectIncomingRequestRequest = exports.CanCreateOutgoingRequestRequest = exports.AcceptIncomingRequestRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.GetSharedToPeerAttributesRequest = exports.GetPeerAttributesRequest = exports.GetAttributesRequest = exports.GetAttributeRequest = exports.ExecuteRelationshipAttributeQueryRequest = exports.ExecuteIdentityAttributeQueryRequest = exports.DeleteAttributeRequest = exports.CreateSharedAttributeCopyRequest = exports.CreateAttributeRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
-exports.LoadPeerTokenRequest = exports.LoadPeerTokenViaSecretRequest = exports.LoadPeerTokenViaReferenceRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.LoadPeerRelationshipTemplateViaReferenceRequest = exports.LoadPeerRelationshipTemplateViaSecretRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateTokenQrCodeForOwnTemplateRequest = exports.CreateTokenForOwnTemplateRequest = exports.CreateQrCodeForOwnTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.GetAttributesForRelationshipRequest = exports.CreateRelationshipChangeRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.CheckIdentityRequest = exports.UploadOwnFileValidatableRequest = exports.UploadOwnFileRequest = exports.GetOrLoadFileRequest = exports.GetOrLoadFileViaReferenceRequest = exports.GetOrLoadFileViaSecretRequest = exports.GetFilesRequest = exports.GetFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.CreateQrCodeForFileRequest = exports.UpdateDeviceRequest = exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = void 0;
+exports.ValidateChallengeRequest = exports.CreateChallengeRequest = exports.CreateDeviceChallengeRequest = exports.CreateIdentityChallengeRequest = exports.CreateRelationshipChallengeRequest = exports.SyncEverythingRequest = exports.DownloadAttachmentRequest = exports.SyncDatawalletRequest = exports.RegisterPushNotificationTokenRequest = exports.LoadItemFromTruncatedReferenceRequest = exports.DownloadFileRequest = exports.UpdateSettingRequest = exports.GetSettingsRequest = exports.GetSettingRequest = exports.DeleteSettingRequest = exports.CreateSettingRequest = exports.SentOutgoingRequestRequest = exports.RequireManualDecisionOfIncomingRequestRequest = exports.ReceivedIncomingRequestRequest = exports.GetOutgoingRequestsRequest = exports.GetOutgoingRequestRequest = exports.GetIncomingRequestsRequest = exports.GetIncomingRequestRequest = exports.CreateOutgoingRequestRequest = exports.CreateAndCompleteOutgoingRequestFromRelationshipCreationChangeRequest = exports.CompleteOutgoingRequestRequest = exports.CompleteIncomingRequestRequest = exports.CheckPrerequisitesOfIncomingRequestRequest = exports.RejectIncomingRequestRequest = exports.CanCreateOutgoingRequestRequest = exports.AcceptIncomingRequestRequest = exports.UpdateDraftRequest = exports.GetDraftsRequest = exports.GetDraftRequest = exports.DeleteDraftRequest = exports.CreateDraftRequest = exports.UpdateAttributeRequest = exports.SucceedAttributeRequest = exports.GetSharedToPeerAttributesRequest = exports.GetPeerAttributesRequest = exports.GetAttributesRequest = exports.GetAttributeRequest = exports.ExecuteThirdPartyRelationshipAttributeQueryRequest = exports.ExecuteRelationshipAttributeQueryRequest = exports.ExecuteIdentityAttributeQueryRequest = exports.DeleteAttributeRequest = exports.CreateSharedAttributeCopyRequest = exports.CreateAttributeRequest = exports.LoadPeerTokenAnonymousByTruncatedReferenceRequest = exports.LoadPeerTokenAnonymousByIdAndKeyRequest = void 0;
+exports.LoadPeerTokenRequest = exports.LoadPeerTokenViaSecretRequest = exports.LoadPeerTokenViaReferenceRequest = exports.GetTokensRequest = exports.GetTokenRequest = exports.GetQRCodeForTokenRequest = exports.CreateOwnTokenRequest = exports.LoadPeerRelationshipTemplateRequest = exports.LoadPeerRelationshipTemplateViaReferenceRequest = exports.LoadPeerRelationshipTemplateViaSecretRequest = exports.GetRelationshipTemplatesRequest = exports.GetRelationshipTemplateRequest = exports.CreateTokenQrCodeForOwnTemplateRequest = exports.CreateTokenForOwnTemplateRequest = exports.CreateQrCodeForOwnTemplateRequest = exports.CreateOwnRelationshipTemplateRequest = exports.RevokeRelationshipChangeRequest = exports.RejectRelationshipChangeRequest = exports.GetRelationshipsRequest = exports.GetRelationshipByAddressRequest = exports.GetRelationshipRequest = exports.GetAttributesForRelationshipRequest = exports.CreateRelationshipChangeRequest = exports.CreateRelationshipRequest = exports.AcceptRelationshipChangeRequest = exports.SendMessageRequest = exports.GetMessagesRequest = exports.GetMessageRequest = exports.GetAttachmentMetadataRequest = exports.CheckIdentityRequest = exports.UploadOwnFileValidatableRequest = exports.UploadOwnFileRequest = exports.GetOrLoadFileRequest = exports.GetOrLoadFileViaReferenceRequest = exports.GetOrLoadFileViaSecretRequest = exports.GetFilesRequest = exports.GetFileRequest = exports.CreateTokenQrCodeForFileRequest = exports.CreateTokenForFileRequest = exports.CreateQrCodeForFileRequest = exports.UpdateDeviceRequest = exports.GetDeviceOnboardingInfoRequest = exports.GetDeviceRequest = exports.DeleteDeviceRequest = exports.CreateDeviceOnboardingTokenRequest = exports.CreateDeviceRequest = void 0;
 exports.LoadPeerTokenAnonymousByIdAndKeyRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/LoadPeerTokenAnonymousByIdAndKeyRequest",
@@ -5647,7 +5883,8 @@ exports.CreateAttributeRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "IdentityAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -5699,7 +5936,8 @@ exports.CreateAttributeRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -5848,15 +6086,15 @@ exports.ExecuteIdentityAttributeQueryRequest = {
         "IIdentityAttributeQuery": {
             "type": "object",
             "properties": {
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "$ref": "#/definitions/ICoreDate"
                 },
                 "validTo": {
                     "$ref": "#/definitions/ICoreDate"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -5864,10 +6102,10 @@ exports.ExecuteIdentityAttributeQueryRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "valueType"
-            ]
+            ],
+            "additionalProperties": false
         },
         "ICoreDate": {
             "type": "object",
@@ -5885,7 +6123,8 @@ exports.ExecuteIdentityAttributeQueryRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "IdentityAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -5893,15 +6132,15 @@ exports.ExecuteIdentityAttributeQueryRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
                 "validTo": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -5909,11 +6148,11 @@ exports.ExecuteIdentityAttributeQueryRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "@type",
                 "valueType"
-            ]
+            ],
+            "additionalProperties": false
         }
     }
 };
@@ -5943,9 +6182,6 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
         "IRelationshipAttributeQuery": {
             "type": "object",
             "properties": {
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "$ref": "#/definitions/ICoreDate"
                 },
@@ -5958,18 +6194,14 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
                 "owner": {
                     "$ref": "#/definitions/ICoreAddress"
                 },
-                "thirdParty": {
-                    "$ref": "#/definitions/ICoreAddress"
-                },
                 "attributeCreationHints": {
                     "$ref": "#/definitions/IRelationshipAttributeCreationHints"
                 }
             },
             "required": [
-                "attributeCreationHints",
                 "key",
                 "owner",
-                "valueType"
+                "attributeCreationHints"
             ],
             "additionalProperties": false
         },
@@ -6003,6 +6235,9 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
                 "title": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "description": {
                     "type": "string"
                 },
@@ -6018,6 +6253,7 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
             },
             "required": [
                 "title",
+                "valueType",
                 "confidentiality"
             ],
             "additionalProperties": false
@@ -6091,7 +6327,8 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -6099,9 +6336,6 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
@@ -6114,9 +6348,6 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
                 "owner": {
                     "type": "string"
                 },
-                "thirdParty": {
-                    "type": "string"
-                },
                 "attributeCreationHints": {
                     "$ref": "#/definitions/RelationshipAttributeCreationHintsJSON"
                 }
@@ -6125,8 +6356,7 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
                 "@type",
                 "attributeCreationHints",
                 "key",
-                "owner",
-                "valueType"
+                "owner"
             ],
             "additionalProperties": false
         },
@@ -6136,6 +6366,9 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
                 "title": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "description": {
                     "type": "string"
                 },
@@ -6151,6 +6384,7 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
             },
             "required": [
                 "title",
+                "valueType",
                 "confidentiality"
             ],
             "additionalProperties": false
@@ -6159,7 +6393,8 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ValueHints"
                 },
                 "@context": {
                     "type": "string"
@@ -6199,10 +6434,10 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "@type"
-            ]
+            ],
+            "additionalProperties": false
         },
         "ValueHintsValueJSON": {
             "type": "object",
@@ -6226,6 +6461,118 @@ exports.ExecuteRelationshipAttributeQueryRequest = {
         }
     }
 };
+exports.ExecuteThirdPartyRelationshipAttributeQueryRequest = {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/ExecuteThirdPartyRelationshipAttributeQueryRequest",
+    "definitions": {
+        "ExecuteThirdPartyRelationshipAttributeQueryRequest": {
+            "type": "object",
+            "properties": {
+                "query": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/IThirdPartyRelationshipAttributeQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/ThirdPartyRelationshipAttributeQueryJSON"
+                        }
+                    ]
+                }
+            },
+            "required": [
+                "query"
+            ],
+            "additionalProperties": false
+        },
+        "IThirdPartyRelationshipAttributeQuery": {
+            "type": "object",
+            "properties": {
+                "validFrom": {
+                    "$ref": "#/definitions/ICoreDate"
+                },
+                "validTo": {
+                    "$ref": "#/definitions/ICoreDate"
+                },
+                "key": {
+                    "type": "string"
+                },
+                "owner": {
+                    "$ref": "#/definitions/ICoreAddress"
+                },
+                "thirdParty": {
+                    "$ref": "#/definitions/ICoreAddress"
+                }
+            },
+            "required": [
+                "key",
+                "owner",
+                "thirdParty"
+            ],
+            "additionalProperties": false
+        },
+        "ICoreDate": {
+            "type": "object",
+            "properties": {
+                "date": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "date"
+            ],
+            "additionalProperties": false
+        },
+        "ICoreAddress": {
+            "type": "object",
+            "properties": {
+                "address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "address"
+            ],
+            "additionalProperties": false
+        },
+        "ThirdPartyRelationshipAttributeQueryJSON": {
+            "type": "object",
+            "properties": {
+                "@type": {
+                    "type": "string",
+                    "const": "ThirdPartyRelationshipAttributeQuery"
+                },
+                "@context": {
+                    "type": "string"
+                },
+                "@version": {
+                    "type": "string"
+                },
+                "validFrom": {
+                    "type": "string"
+                },
+                "validTo": {
+                    "type": "string"
+                },
+                "key": {
+                    "type": "string"
+                },
+                "owner": {
+                    "type": "string"
+                },
+                "thirdParty": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "@type",
+                "key",
+                "owner",
+                "thirdParty"
+            ],
+            "additionalProperties": false
+        }
+    }
+};
 exports.GetAttributeRequest = {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$ref": "#/definitions/GetAttributeRequest",
@@ -6840,7 +7187,8 @@ exports.SucceedAttributeRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "IdentityAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -6892,7 +7240,8 @@ exports.SucceedAttributeRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -6994,7 +7343,8 @@ exports.UpdateAttributeRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "IdentityAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -7046,7 +7396,8 @@ exports.UpdateAttributeRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -7459,7 +7810,8 @@ exports.CanCreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RequestItemGroup"
                 },
                 "@context": {
                     "type": "string"
@@ -7505,7 +7857,7 @@ exports.CanCreateOutgoingRequestRequest = {
                     "$ref": "#/definitions/RequestItemJSON"
                 },
                 {
-                    "$ref": "#/definitions/CreateRelationshipAttributeRequestItemJSON"
+                    "$ref": "#/definitions/CreateAttributeRequestItemJSON"
                 },
                 {
                     "$ref": "#/definitions/ShareAttributeRequestItemJSON"
@@ -7563,11 +7915,12 @@ exports.CanCreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "CreateRelationshipAttributeRequestItemJSON": {
+        "CreateAttributeRequestItemJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "CreateAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -7596,7 +7949,14 @@ exports.CanCreateOutgoingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "attribute": {
-                    "$ref": "#/definitions/RelationshipAttributeJSON"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/RelationshipAttributeJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/IdentityAttributeJSON"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -7610,7 +7970,8 @@ exports.CanCreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -7674,12 +8035,52 @@ exports.CanCreateOutgoingRequestRequest = {
                 "protected"
             ]
         },
-        "ShareAttributeRequestItemJSON": {
+        "IdentityAttributeJSON": {
             "type": "object",
             "properties": {
                 "@type": {
+                    "type": "string",
+                    "const": "IdentityAttribute"
+                },
+                "@context": {
+                    "type": "string"
+                },
+                "@version": {
+                    "type": "string"
+                },
+                "owner": {
+                    "type": "string"
+                },
+                "validFrom": {
+                    "type": "string"
+                },
+                "validTo": {
                     "type": "string"
                 },
+                "value": {
+                    "$ref": "#/definitions/AbstractAttributeValueJSON"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "@type",
+                "owner",
+                "value"
+            ],
+            "additionalProperties": false
+        },
+        "ShareAttributeRequestItemJSON": {
+            "type": "object",
+            "properties": {
+                "@type": {
+                    "type": "string",
+                    "const": "ShareAttributeRequestItem"
+                },
                 "@context": {
                     "type": "string"
                 },
@@ -7728,49 +8129,12 @@ exports.CanCreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "IdentityAttributeJSON": {
-            "type": "object",
-            "properties": {
-                "@type": {
-                    "type": "string"
-                },
-                "@context": {
-                    "type": "string"
-                },
-                "@version": {
-                    "type": "string"
-                },
-                "owner": {
-                    "type": "string"
-                },
-                "validFrom": {
-                    "type": "string"
-                },
-                "validTo": {
-                    "type": "string"
-                },
-                "value": {
-                    "$ref": "#/definitions/AbstractAttributeValueJSON"
-                },
-                "tags": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            },
-            "required": [
-                "@type",
-                "owner",
-                "value"
-            ],
-            "additionalProperties": false
-        },
         "ProposeAttributeRequestItemJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ProposeAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -7831,7 +8195,8 @@ exports.CanCreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "IdentityAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -7839,15 +8204,15 @@ exports.CanCreateOutgoingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
                 "validTo": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -7855,17 +8220,18 @@ exports.CanCreateOutgoingRequestRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "@type",
                 "valueType"
-            ]
+            ],
+            "additionalProperties": false
         },
         "RelationshipAttributeQueryJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -7873,9 +8239,6 @@ exports.CanCreateOutgoingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
@@ -7888,9 +8251,6 @@ exports.CanCreateOutgoingRequestRequest = {
                 "owner": {
                     "type": "string"
                 },
-                "thirdParty": {
-                    "type": "string"
-                },
                 "attributeCreationHints": {
                     "$ref": "#/definitions/RelationshipAttributeCreationHintsJSON"
                 }
@@ -7899,8 +8259,7 @@ exports.CanCreateOutgoingRequestRequest = {
                 "@type",
                 "attributeCreationHints",
                 "key",
-                "owner",
-                "valueType"
+                "owner"
             ],
             "additionalProperties": false
         },
@@ -7910,6 +8269,9 @@ exports.CanCreateOutgoingRequestRequest = {
                 "title": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "description": {
                     "type": "string"
                 },
@@ -7925,6 +8287,7 @@ exports.CanCreateOutgoingRequestRequest = {
             },
             "required": [
                 "title",
+                "valueType",
                 "confidentiality"
             ],
             "additionalProperties": false
@@ -7933,7 +8296,8 @@ exports.CanCreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ValueHints"
                 },
                 "@context": {
                     "type": "string"
@@ -7973,10 +8337,10 @@ exports.CanCreateOutgoingRequestRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "@type"
-            ]
+            ],
+            "additionalProperties": false
         },
         "ValueHintsValueJSON": {
             "type": "object",
@@ -8002,7 +8366,8 @@ exports.CanCreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ReadAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -8031,7 +8396,17 @@ exports.CanCreateOutgoingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "query": {
-                    "$ref": "#/definitions/AbstractAttributeQueryJSON"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/IdentityAttributeQueryJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/RelationshipAttributeQueryJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/ThirdPartyRelationshipAttributeQueryJSON"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -8041,11 +8416,12 @@ exports.CanCreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "AbstractAttributeQueryJSON": {
+        "ThirdPartyRelationshipAttributeQueryJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ThirdPartyRelationshipAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -8053,19 +8429,27 @@ exports.CanCreateOutgoingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
                 "validTo": {
                     "type": "string"
+                },
+                "key": {
+                    "type": "string"
+                },
+                "owner": {
+                    "type": "string"
+                },
+                "thirdParty": {
+                    "type": "string"
                 }
             },
             "required": [
                 "@type",
-                "valueType"
+                "key",
+                "owner",
+                "thirdParty"
             ],
             "additionalProperties": false
         },
@@ -8073,7 +8457,8 @@ exports.CanCreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ConsentRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -8117,10 +8502,10 @@ exports.CanCreateOutgoingRequestRequest = {
         },
         "AuthenticationRequestItemJSON": {
             "type": "object",
-            "additionalProperties": false,
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "AuthenticationRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -8152,7 +8537,8 @@ exports.CanCreateOutgoingRequestRequest = {
             "required": [
                 "@type",
                 "mustBeAccepted"
-            ]
+            ],
+            "additionalProperties": false
         },
         "IRequestItemGroup": {
             "type": "object",
@@ -8194,7 +8580,7 @@ exports.CanCreateOutgoingRequestRequest = {
                     "$ref": "#/definitions/IRequestItem"
                 },
                 {
-                    "$ref": "#/definitions/ICreateRelationshipAttributeRequestItem"
+                    "$ref": "#/definitions/ICreateAttributeRequestItem"
                 },
                 {
                     "$ref": "#/definitions/IShareAttributeRequestItem"
@@ -8242,7 +8628,7 @@ exports.CanCreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "ICreateRelationshipAttributeRequestItem": {
+        "ICreateAttributeRequestItem": {
             "type": "object",
             "properties": {
                 "title": {
@@ -8266,7 +8652,14 @@ exports.CanCreateOutgoingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "attribute": {
-                    "$ref": "#/definitions/IRelationshipAttribute"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/IRelationshipAttribute"
+                        },
+                        {
+                            "$ref": "#/definitions/IIdentityAttribute"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -8325,6 +8718,34 @@ exports.CanCreateOutgoingRequestRequest = {
             "additionalProperties": false,
             "properties": {}
         },
+        "IIdentityAttribute": {
+            "type": "object",
+            "properties": {
+                "owner": {
+                    "$ref": "#/definitions/ICoreAddress"
+                },
+                "validFrom": {
+                    "$ref": "#/definitions/ICoreDate"
+                },
+                "validTo": {
+                    "$ref": "#/definitions/ICoreDate"
+                },
+                "value": {
+                    "$ref": "#/definitions/IAbstractAttributeValue"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "owner",
+                "value"
+            ],
+            "additionalProperties": false
+        },
         "IShareAttributeRequestItem": {
             "type": "object",
             "properties": {
@@ -8369,34 +8790,6 @@ exports.CanCreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "IIdentityAttribute": {
-            "type": "object",
-            "properties": {
-                "owner": {
-                    "$ref": "#/definitions/ICoreAddress"
-                },
-                "validFrom": {
-                    "$ref": "#/definitions/ICoreDate"
-                },
-                "validTo": {
-                    "$ref": "#/definitions/ICoreDate"
-                },
-                "value": {
-                    "$ref": "#/definitions/IAbstractAttributeValue"
-                },
-                "tags": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            },
-            "required": [
-                "owner",
-                "value"
-            ],
-            "additionalProperties": false
-        },
         "ICoreId": {
             "type": "object",
             "properties": {
@@ -8463,15 +8856,15 @@ exports.CanCreateOutgoingRequestRequest = {
         "IIdentityAttributeQuery": {
             "type": "object",
             "properties": {
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "$ref": "#/definitions/ICoreDate"
                 },
                 "validTo": {
                     "$ref": "#/definitions/ICoreDate"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -8479,17 +8872,14 @@ exports.CanCreateOutgoingRequestRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "valueType"
-            ]
+            ],
+            "additionalProperties": false
         },
         "IRelationshipAttributeQuery": {
             "type": "object",
             "properties": {
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "$ref": "#/definitions/ICoreDate"
                 },
@@ -8502,18 +8892,14 @@ exports.CanCreateOutgoingRequestRequest = {
                 "owner": {
                     "$ref": "#/definitions/ICoreAddress"
                 },
-                "thirdParty": {
-                    "$ref": "#/definitions/ICoreAddress"
-                },
                 "attributeCreationHints": {
                     "$ref": "#/definitions/IRelationshipAttributeCreationHints"
                 }
             },
             "required": [
-                "attributeCreationHints",
                 "key",
                 "owner",
-                "valueType"
+                "attributeCreationHints"
             ],
             "additionalProperties": false
         },
@@ -8523,6 +8909,9 @@ exports.CanCreateOutgoingRequestRequest = {
                 "title": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "description": {
                     "type": "string"
                 },
@@ -8538,6 +8927,7 @@ exports.CanCreateOutgoingRequestRequest = {
             },
             "required": [
                 "title",
+                "valueType",
                 "confidentiality"
             ],
             "additionalProperties": false
@@ -8623,7 +9013,17 @@ exports.CanCreateOutgoingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "query": {
-                    "$ref": "#/definitions/IAbstractAttributeQuery"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/IIdentityAttributeQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/IRelationshipAttributeQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/IThirdPartyRelationshipAttributeQuery"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -8632,21 +9032,29 @@ exports.CanCreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "IAbstractAttributeQuery": {
+        "IThirdPartyRelationshipAttributeQuery": {
             "type": "object",
             "properties": {
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "$ref": "#/definitions/ICoreDate"
                 },
                 "validTo": {
                     "$ref": "#/definitions/ICoreDate"
+                },
+                "key": {
+                    "type": "string"
+                },
+                "owner": {
+                    "$ref": "#/definitions/ICoreAddress"
+                },
+                "thirdParty": {
+                    "$ref": "#/definitions/ICoreAddress"
                 }
             },
             "required": [
-                "valueType"
+                "key",
+                "owner",
+                "thirdParty"
             ],
             "additionalProperties": false
         },
@@ -8896,7 +9304,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "Response"
                 },
                 "@context": {
                     "type": "string"
@@ -8943,7 +9352,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ResponseItemGroup"
                 },
                 "@context": {
                     "type": "string"
@@ -8983,7 +9393,7 @@ exports.CompleteOutgoingRequestRequest = {
                     "$ref": "#/definitions/AcceptResponseItemJSON"
                 },
                 {
-                    "$ref": "#/definitions/CreateRelationshipAttributeAcceptResponseItemJSON"
+                    "$ref": "#/definitions/CreateAttributeAcceptResponseItemJSON"
                 },
                 {
                     "$ref": "#/definitions/ShareAttributeAcceptResponseItemJSON"
@@ -9019,11 +9429,12 @@ exports.CompleteOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "CreateRelationshipAttributeAcceptResponseItemJSON": {
+        "CreateAttributeAcceptResponseItemJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "CreateAttributeAcceptResponseItem"
                 },
                 "@context": {
                     "type": "string"
@@ -9050,7 +9461,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ShareAttributeAcceptResponseItem"
                 },
                 "@context": {
                     "type": "string"
@@ -9077,7 +9489,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ProposeAttributeAcceptResponseItem"
                 },
                 "@context": {
                     "type": "string"
@@ -9115,7 +9528,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "IdentityAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -9170,7 +9584,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -9221,7 +9636,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ReadAttributeAcceptResponseItem"
                 },
                 "@context": {
                     "type": "string"
@@ -9262,7 +9678,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RejectResponseItem"
                 },
                 "@context": {
                     "type": "string"
@@ -9294,7 +9711,8 @@ exports.CompleteOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ErrorResponseItem"
                 },
                 "@context": {
                     "type": "string"
@@ -9472,7 +9890,8 @@ exports.CreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RequestItemGroup"
                 },
                 "@context": {
                     "type": "string"
@@ -9518,7 +9937,7 @@ exports.CreateOutgoingRequestRequest = {
                     "$ref": "#/definitions/RequestItemJSON"
                 },
                 {
-                    "$ref": "#/definitions/CreateRelationshipAttributeRequestItemJSON"
+                    "$ref": "#/definitions/CreateAttributeRequestItemJSON"
                 },
                 {
                     "$ref": "#/definitions/ShareAttributeRequestItemJSON"
@@ -9576,11 +9995,12 @@ exports.CreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "CreateRelationshipAttributeRequestItemJSON": {
+        "CreateAttributeRequestItemJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "CreateAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -9609,7 +10029,14 @@ exports.CreateOutgoingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "attribute": {
-                    "$ref": "#/definitions/RelationshipAttributeJSON"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/RelationshipAttributeJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/IdentityAttributeJSON"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -9623,7 +10050,8 @@ exports.CreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -9687,12 +10115,52 @@ exports.CreateOutgoingRequestRequest = {
                 "protected"
             ]
         },
-        "ShareAttributeRequestItemJSON": {
+        "IdentityAttributeJSON": {
             "type": "object",
             "properties": {
                 "@type": {
+                    "type": "string",
+                    "const": "IdentityAttribute"
+                },
+                "@context": {
                     "type": "string"
                 },
+                "@version": {
+                    "type": "string"
+                },
+                "owner": {
+                    "type": "string"
+                },
+                "validFrom": {
+                    "type": "string"
+                },
+                "validTo": {
+                    "type": "string"
+                },
+                "value": {
+                    "$ref": "#/definitions/AbstractAttributeValueJSON"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "@type",
+                "owner",
+                "value"
+            ],
+            "additionalProperties": false
+        },
+        "ShareAttributeRequestItemJSON": {
+            "type": "object",
+            "properties": {
+                "@type": {
+                    "type": "string",
+                    "const": "ShareAttributeRequestItem"
+                },
                 "@context": {
                     "type": "string"
                 },
@@ -9741,49 +10209,12 @@ exports.CreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "IdentityAttributeJSON": {
-            "type": "object",
-            "properties": {
-                "@type": {
-                    "type": "string"
-                },
-                "@context": {
-                    "type": "string"
-                },
-                "@version": {
-                    "type": "string"
-                },
-                "owner": {
-                    "type": "string"
-                },
-                "validFrom": {
-                    "type": "string"
-                },
-                "validTo": {
-                    "type": "string"
-                },
-                "value": {
-                    "$ref": "#/definitions/AbstractAttributeValueJSON"
-                },
-                "tags": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            },
-            "required": [
-                "@type",
-                "owner",
-                "value"
-            ],
-            "additionalProperties": false
-        },
         "ProposeAttributeRequestItemJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ProposeAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -9844,7 +10275,8 @@ exports.CreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "IdentityAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -9852,15 +10284,15 @@ exports.CreateOutgoingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
                 "validTo": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -9868,17 +10300,18 @@ exports.CreateOutgoingRequestRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "@type",
                 "valueType"
-            ]
+            ],
+            "additionalProperties": false
         },
         "RelationshipAttributeQueryJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -9886,9 +10319,6 @@ exports.CreateOutgoingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
@@ -9901,9 +10331,6 @@ exports.CreateOutgoingRequestRequest = {
                 "owner": {
                     "type": "string"
                 },
-                "thirdParty": {
-                    "type": "string"
-                },
                 "attributeCreationHints": {
                     "$ref": "#/definitions/RelationshipAttributeCreationHintsJSON"
                 }
@@ -9912,8 +10339,7 @@ exports.CreateOutgoingRequestRequest = {
                 "@type",
                 "attributeCreationHints",
                 "key",
-                "owner",
-                "valueType"
+                "owner"
             ],
             "additionalProperties": false
         },
@@ -9923,6 +10349,9 @@ exports.CreateOutgoingRequestRequest = {
                 "title": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "description": {
                     "type": "string"
                 },
@@ -9938,6 +10367,7 @@ exports.CreateOutgoingRequestRequest = {
             },
             "required": [
                 "title",
+                "valueType",
                 "confidentiality"
             ],
             "additionalProperties": false
@@ -9946,7 +10376,8 @@ exports.CreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ValueHints"
                 },
                 "@context": {
                     "type": "string"
@@ -9986,10 +10417,10 @@ exports.CreateOutgoingRequestRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "@type"
-            ]
+            ],
+            "additionalProperties": false
         },
         "ValueHintsValueJSON": {
             "type": "object",
@@ -10015,7 +10446,8 @@ exports.CreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ReadAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -10044,7 +10476,17 @@ exports.CreateOutgoingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "query": {
-                    "$ref": "#/definitions/AbstractAttributeQueryJSON"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/IdentityAttributeQueryJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/RelationshipAttributeQueryJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/ThirdPartyRelationshipAttributeQueryJSON"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -10054,11 +10496,12 @@ exports.CreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "AbstractAttributeQueryJSON": {
+        "ThirdPartyRelationshipAttributeQueryJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ThirdPartyRelationshipAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -10066,19 +10509,27 @@ exports.CreateOutgoingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
                 "validTo": {
                     "type": "string"
+                },
+                "key": {
+                    "type": "string"
+                },
+                "owner": {
+                    "type": "string"
+                },
+                "thirdParty": {
+                    "type": "string"
                 }
             },
             "required": [
                 "@type",
-                "valueType"
+                "key",
+                "owner",
+                "thirdParty"
             ],
             "additionalProperties": false
         },
@@ -10086,7 +10537,8 @@ exports.CreateOutgoingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ConsentRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -10130,10 +10582,10 @@ exports.CreateOutgoingRequestRequest = {
         },
         "AuthenticationRequestItemJSON": {
             "type": "object",
-            "additionalProperties": false,
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "AuthenticationRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -10165,7 +10617,8 @@ exports.CreateOutgoingRequestRequest = {
             "required": [
                 "@type",
                 "mustBeAccepted"
-            ]
+            ],
+            "additionalProperties": false
         },
         "IRequestItemGroup": {
             "type": "object",
@@ -10207,7 +10660,7 @@ exports.CreateOutgoingRequestRequest = {
                     "$ref": "#/definitions/IRequestItem"
                 },
                 {
-                    "$ref": "#/definitions/ICreateRelationshipAttributeRequestItem"
+                    "$ref": "#/definitions/ICreateAttributeRequestItem"
                 },
                 {
                     "$ref": "#/definitions/IShareAttributeRequestItem"
@@ -10255,7 +10708,7 @@ exports.CreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "ICreateRelationshipAttributeRequestItem": {
+        "ICreateAttributeRequestItem": {
             "type": "object",
             "properties": {
                 "title": {
@@ -10279,7 +10732,14 @@ exports.CreateOutgoingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "attribute": {
-                    "$ref": "#/definitions/IRelationshipAttribute"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/IRelationshipAttribute"
+                        },
+                        {
+                            "$ref": "#/definitions/IIdentityAttribute"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -10338,6 +10798,34 @@ exports.CreateOutgoingRequestRequest = {
             "additionalProperties": false,
             "properties": {}
         },
+        "IIdentityAttribute": {
+            "type": "object",
+            "properties": {
+                "owner": {
+                    "$ref": "#/definitions/ICoreAddress"
+                },
+                "validFrom": {
+                    "$ref": "#/definitions/ICoreDate"
+                },
+                "validTo": {
+                    "$ref": "#/definitions/ICoreDate"
+                },
+                "value": {
+                    "$ref": "#/definitions/IAbstractAttributeValue"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "owner",
+                "value"
+            ],
+            "additionalProperties": false
+        },
         "IShareAttributeRequestItem": {
             "type": "object",
             "properties": {
@@ -10382,34 +10870,6 @@ exports.CreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "IIdentityAttribute": {
-            "type": "object",
-            "properties": {
-                "owner": {
-                    "$ref": "#/definitions/ICoreAddress"
-                },
-                "validFrom": {
-                    "$ref": "#/definitions/ICoreDate"
-                },
-                "validTo": {
-                    "$ref": "#/definitions/ICoreDate"
-                },
-                "value": {
-                    "$ref": "#/definitions/IAbstractAttributeValue"
-                },
-                "tags": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            },
-            "required": [
-                "owner",
-                "value"
-            ],
-            "additionalProperties": false
-        },
         "ICoreId": {
             "type": "object",
             "properties": {
@@ -10476,15 +10936,15 @@ exports.CreateOutgoingRequestRequest = {
         "IIdentityAttributeQuery": {
             "type": "object",
             "properties": {
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "$ref": "#/definitions/ICoreDate"
                 },
                 "validTo": {
                     "$ref": "#/definitions/ICoreDate"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -10492,17 +10952,14 @@ exports.CreateOutgoingRequestRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "valueType"
-            ]
+            ],
+            "additionalProperties": false
         },
         "IRelationshipAttributeQuery": {
             "type": "object",
             "properties": {
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "$ref": "#/definitions/ICoreDate"
                 },
@@ -10515,18 +10972,14 @@ exports.CreateOutgoingRequestRequest = {
                 "owner": {
                     "$ref": "#/definitions/ICoreAddress"
                 },
-                "thirdParty": {
-                    "$ref": "#/definitions/ICoreAddress"
-                },
                 "attributeCreationHints": {
                     "$ref": "#/definitions/IRelationshipAttributeCreationHints"
                 }
             },
             "required": [
-                "attributeCreationHints",
                 "key",
                 "owner",
-                "valueType"
+                "attributeCreationHints"
             ],
             "additionalProperties": false
         },
@@ -10536,6 +10989,9 @@ exports.CreateOutgoingRequestRequest = {
                 "title": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "description": {
                     "type": "string"
                 },
@@ -10551,6 +11007,7 @@ exports.CreateOutgoingRequestRequest = {
             },
             "required": [
                 "title",
+                "valueType",
                 "confidentiality"
             ],
             "additionalProperties": false
@@ -10636,7 +11093,17 @@ exports.CreateOutgoingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "query": {
-                    "$ref": "#/definitions/IAbstractAttributeQuery"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/IIdentityAttributeQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/IRelationshipAttributeQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/IThirdPartyRelationshipAttributeQuery"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -10645,21 +11112,29 @@ exports.CreateOutgoingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "IAbstractAttributeQuery": {
+        "IThirdPartyRelationshipAttributeQuery": {
             "type": "object",
             "properties": {
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "$ref": "#/definitions/ICoreDate"
                 },
                 "validTo": {
                     "$ref": "#/definitions/ICoreDate"
+                },
+                "key": {
+                    "type": "string"
+                },
+                "owner": {
+                    "$ref": "#/definitions/ICoreAddress"
+                },
+                "thirdParty": {
+                    "$ref": "#/definitions/ICoreAddress"
                 }
             },
             "required": [
-                "valueType"
+                "key",
+                "owner",
+                "thirdParty"
             ],
             "additionalProperties": false
         },
@@ -11215,7 +11690,8 @@ exports.ReceivedIncomingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "Request"
                 },
                 "@context": {
                     "type": "string"
@@ -11268,7 +11744,8 @@ exports.ReceivedIncomingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RequestItemGroup"
                 },
                 "@context": {
                     "type": "string"
@@ -11314,7 +11791,7 @@ exports.ReceivedIncomingRequestRequest = {
                     "$ref": "#/definitions/RequestItemJSON"
                 },
                 {
-                    "$ref": "#/definitions/CreateRelationshipAttributeRequestItemJSON"
+                    "$ref": "#/definitions/CreateAttributeRequestItemJSON"
                 },
                 {
                     "$ref": "#/definitions/ShareAttributeRequestItemJSON"
@@ -11372,11 +11849,12 @@ exports.ReceivedIncomingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "CreateRelationshipAttributeRequestItemJSON": {
+        "CreateAttributeRequestItemJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "CreateAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -11405,7 +11883,14 @@ exports.ReceivedIncomingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "attribute": {
-                    "$ref": "#/definitions/RelationshipAttributeJSON"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/RelationshipAttributeJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/IdentityAttributeJSON"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -11419,7 +11904,8 @@ exports.ReceivedIncomingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttribute"
                 },
                 "@context": {
                     "type": "string"
@@ -11483,12 +11969,52 @@ exports.ReceivedIncomingRequestRequest = {
                 "protected"
             ]
         },
-        "ShareAttributeRequestItemJSON": {
+        "IdentityAttributeJSON": {
             "type": "object",
             "properties": {
                 "@type": {
+                    "type": "string",
+                    "const": "IdentityAttribute"
+                },
+                "@context": {
+                    "type": "string"
+                },
+                "@version": {
+                    "type": "string"
+                },
+                "owner": {
                     "type": "string"
                 },
+                "validFrom": {
+                    "type": "string"
+                },
+                "validTo": {
+                    "type": "string"
+                },
+                "value": {
+                    "$ref": "#/definitions/AbstractAttributeValueJSON"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "@type",
+                "owner",
+                "value"
+            ],
+            "additionalProperties": false
+        },
+        "ShareAttributeRequestItemJSON": {
+            "type": "object",
+            "properties": {
+                "@type": {
+                    "type": "string",
+                    "const": "ShareAttributeRequestItem"
+                },
                 "@context": {
                     "type": "string"
                 },
@@ -11537,49 +12063,12 @@ exports.ReceivedIncomingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "IdentityAttributeJSON": {
-            "type": "object",
-            "properties": {
-                "@type": {
-                    "type": "string"
-                },
-                "@context": {
-                    "type": "string"
-                },
-                "@version": {
-                    "type": "string"
-                },
-                "owner": {
-                    "type": "string"
-                },
-                "validFrom": {
-                    "type": "string"
-                },
-                "validTo": {
-                    "type": "string"
-                },
-                "value": {
-                    "$ref": "#/definitions/AbstractAttributeValueJSON"
-                },
-                "tags": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            },
-            "required": [
-                "@type",
-                "owner",
-                "value"
-            ],
-            "additionalProperties": false
-        },
         "ProposeAttributeRequestItemJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ProposeAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -11640,7 +12129,8 @@ exports.ReceivedIncomingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "IdentityAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -11648,15 +12138,15 @@ exports.ReceivedIncomingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
                 "validTo": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -11664,17 +12154,18 @@ exports.ReceivedIncomingRequestRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "@type",
                 "valueType"
-            ]
+            ],
+            "additionalProperties": false
         },
         "RelationshipAttributeQueryJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "RelationshipAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -11682,9 +12173,6 @@ exports.ReceivedIncomingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
@@ -11697,9 +12185,6 @@ exports.ReceivedIncomingRequestRequest = {
                 "owner": {
                     "type": "string"
                 },
-                "thirdParty": {
-                    "type": "string"
-                },
                 "attributeCreationHints": {
                     "$ref": "#/definitions/RelationshipAttributeCreationHintsJSON"
                 }
@@ -11708,8 +12193,7 @@ exports.ReceivedIncomingRequestRequest = {
                 "@type",
                 "attributeCreationHints",
                 "key",
-                "owner",
-                "valueType"
+                "owner"
             ],
             "additionalProperties": false
         },
@@ -11719,6 +12203,9 @@ exports.ReceivedIncomingRequestRequest = {
                 "title": {
                     "type": "string"
                 },
+                "valueType": {
+                    "type": "string"
+                },
                 "description": {
                     "type": "string"
                 },
@@ -11734,6 +12221,7 @@ exports.ReceivedIncomingRequestRequest = {
             },
             "required": [
                 "title",
+                "valueType",
                 "confidentiality"
             ],
             "additionalProperties": false
@@ -11742,7 +12230,8 @@ exports.ReceivedIncomingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ValueHints"
                 },
                 "@context": {
                     "type": "string"
@@ -11782,10 +12271,10 @@ exports.ReceivedIncomingRequestRequest = {
                     }
                 }
             },
-            "additionalProperties": false,
             "required": [
                 "@type"
-            ]
+            ],
+            "additionalProperties": false
         },
         "ValueHintsValueJSON": {
             "type": "object",
@@ -11811,7 +12300,8 @@ exports.ReceivedIncomingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ReadAttributeRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -11840,7 +12330,17 @@ exports.ReceivedIncomingRequestRequest = {
                     "description": "If set to `true`, it advices the recipient of this RequestItem to carefully consider their decision and especially do not decide based on some automation rules."
                 },
                 "query": {
-                    "$ref": "#/definitions/AbstractAttributeQueryJSON"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/IdentityAttributeQueryJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/RelationshipAttributeQueryJSON"
+                        },
+                        {
+                            "$ref": "#/definitions/ThirdPartyRelationshipAttributeQueryJSON"
+                        }
+                    ]
                 }
             },
             "required": [
@@ -11850,11 +12350,12 @@ exports.ReceivedIncomingRequestRequest = {
             ],
             "additionalProperties": false
         },
-        "AbstractAttributeQueryJSON": {
+        "ThirdPartyRelationshipAttributeQueryJSON": {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ThirdPartyRelationshipAttributeQuery"
                 },
                 "@context": {
                     "type": "string"
@@ -11862,19 +12363,27 @@ exports.ReceivedIncomingRequestRequest = {
                 "@version": {
                     "type": "string"
                 },
-                "valueType": {
-                    "type": "string"
-                },
                 "validFrom": {
                     "type": "string"
                 },
                 "validTo": {
                     "type": "string"
+                },
+                "key": {
+                    "type": "string"
+                },
+                "owner": {
+                    "type": "string"
+                },
+                "thirdParty": {
+                    "type": "string"
                 }
             },
             "required": [
                 "@type",
-                "valueType"
+                "key",
+                "owner",
+                "thirdParty"
             ],
             "additionalProperties": false
         },
@@ -11882,7 +12391,8 @@ exports.ReceivedIncomingRequestRequest = {
             "type": "object",
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "ConsentRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -11926,10 +12436,10 @@ exports.ReceivedIncomingRequestRequest = {
         },
         "AuthenticationRequestItemJSON": {
             "type": "object",
-            "additionalProperties": false,
             "properties": {
                 "@type": {
-                    "type": "string"
+                    "type": "string",
+                    "const": "AuthenticationRequestItem"
                 },
                 "@context": {
                     "type": "string"
@@ -11961,7 +12471,8 @@ exports.ReceivedIncomingRequestRequest = {
             "required": [
                 "@type",
                 "mustBeAccepted"
-            ]
+            ],
+            "additionalProperties": false
         },
         "MessageIdString": {
             "type": "string",
@@ -12048,7 +12559,7 @@ exports.CreateSettingRequest = {
                     ]
                 },
                 "succeedsAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 },
                 "succeedsItem": {
                     "$ref": "#/definitions/LocalSettingIdString"
@@ -12064,9 +12575,10 @@ exports.CreateSettingRequest = {
             "type": "string",
             "pattern": "[A-Za-z0-9]{20}"
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         },
         "LocalSettingIdString": {
             "type": "string",
@@ -12564,7 +13076,7 @@ exports.CreateDeviceOnboardingTokenRequest = {
                     "$ref": "#/definitions/DeviceIdString"
                 },
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 }
             },
             "required": [
@@ -12576,9 +13088,10 @@ exports.CreateDeviceOnboardingTokenRequest = {
             "type": "string",
             "pattern": "DVC[A-Za-z0-9]{17}"
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -12709,7 +13222,7 @@ exports.CreateTokenForFileRequest = {
                     "$ref": "#/definitions/FileIdString"
                 },
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 },
                 "ephemeral": {
                     "type": "boolean"
@@ -12724,9 +13237,10 @@ exports.CreateTokenForFileRequest = {
             "type": "string",
             "pattern": "FIL[A-Za-z0-9]{17}"
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -12741,7 +13255,7 @@ exports.CreateTokenQrCodeForFileRequest = {
                     "$ref": "#/definitions/FileIdString"
                 },
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 }
             },
             "required": [
@@ -12753,9 +13267,10 @@ exports.CreateTokenQrCodeForFileRequest = {
             "type": "string",
             "pattern": "FIL[A-Za-z0-9]{17}"
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -13121,7 +13636,7 @@ exports.UploadOwnFileRequest = {
                     "type": "string"
                 },
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 },
                 "title": {
                     "type": "string"
@@ -13139,9 +13654,10 @@ exports.UploadOwnFileRequest = {
             ],
             "additionalProperties": false
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -13159,7 +13675,7 @@ exports.UploadOwnFileValidatableRequest = {
                     "type": "string"
                 },
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 },
                 "title": {
                     "type": "string"
@@ -13180,9 +13696,10 @@ exports.UploadOwnFileValidatableRequest = {
             ],
             "additionalProperties": false
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -13588,7 +14105,7 @@ exports.CreateOwnRelationshipTemplateRequest = {
             "type": "object",
             "properties": {
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 },
                 "content": {},
                 "maxNumberOfAllocations": {
@@ -13607,9 +14124,10 @@ exports.CreateOwnRelationshipTemplateRequest = {
             ],
             "additionalProperties": false
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -13646,7 +14164,7 @@ exports.CreateTokenForOwnTemplateRequest = {
                     "$ref": "#/definitions/RelationshipTemplateIdString"
                 },
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 },
                 "ephemeral": {
                     "type": "boolean"
@@ -13661,9 +14179,10 @@ exports.CreateTokenForOwnTemplateRequest = {
             "type": "string",
             "pattern": "RLT[A-Za-z0-9]{17}"
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -13678,7 +14197,7 @@ exports.CreateTokenQrCodeForOwnTemplateRequest = {
                     "$ref": "#/definitions/RelationshipTemplateIdString"
                 },
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 }
             },
             "required": [
@@ -13690,9 +14209,10 @@ exports.CreateTokenQrCodeForOwnTemplateRequest = {
             "type": "string",
             "pattern": "RLT[A-Za-z0-9]{17}"
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -13876,7 +14396,7 @@ exports.CreateOwnTokenRequest = {
             "properties": {
                 "content": {},
                 "expiresAt": {
-                    "$ref": "#/definitions/DateTimeString"
+                    "$ref": "#/definitions/ISO8601DateTimeString"
                 },
                 "ephemeral": {
                     "type": "boolean"
@@ -13889,9 +14409,10 @@ exports.CreateOwnTokenRequest = {
             ],
             "additionalProperties": false
         },
-        "DateTimeString": {
+        "ISO8601DateTimeString": {
             "type": "string",
-            "format": "date-time"
+            "errorMessage": "must match ISO8601 datetime format",
+            "pattern": "^([+-]?\\d{4}(?!\\d{2}\\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24:?00)([.,]\\d+(?!:))?)?(\\17[0-5]\\d([.,]\\d+)?)?([zZ]|([+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$"
         }
     }
 };
@@ -14696,8 +15217,11 @@ let ExecuteRelationshipAttributeQueryUseCase = class ExecuteRelationshipAttribut
         this.attributeController = attributeController;
     }
     async executeInternal(request) {
-        const attributes = await this.attributeController.executeRelationshipAttributeQuery(content_1.RelationshipAttributeQuery.from(request.query));
-        return ts_utils_1.Result.ok(AttributeMapper_1.AttributeMapper.toAttributeDTOList(attributes));
+        const attribute = await this.attributeController.executeRelationshipAttributeQuery(content_1.RelationshipAttributeQuery.from(request.query));
+        if (!attribute) {
+            return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound("RelationshipAttribute"));
+        }
+        return ts_utils_1.Result.ok(AttributeMapper_1.AttributeMapper.toAttributeDTO(attribute));
     }
 };
 ExecuteRelationshipAttributeQueryUseCase = __decorate([
@@ -14709,6 +15233,56 @@ exports.ExecuteRelationshipAttributeQueryUseCase = ExecuteRelationshipAttributeQ
 
 /***/ }),
 
+/***/ "./dist/useCases/consumption/attributes/ExecuteThirdPartyRelationshipAttributeQuery.js":
+/*!*********************************************************************************************!*\
+  !*** ./dist/useCases/consumption/attributes/ExecuteThirdPartyRelationshipAttributeQuery.js ***!
+  \*********************************************************************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ExecuteThirdPartyRelationshipAttributeQueryUseCase = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
+const consumption_1 = __webpack_require__(/*! @nmshd/consumption */ "@nmshd/consumption");
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
+const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
+const AttributeMapper_1 = __webpack_require__(/*! ./AttributeMapper */ "./dist/useCases/consumption/attributes/AttributeMapper.js");
+let ExecuteThirdPartyRelationshipAttributeQueryUseCase = class ExecuteThirdPartyRelationshipAttributeQueryUseCase extends common_1.UseCase {
+    constructor(attributeController) {
+        super();
+        this.attributeController = attributeController;
+    }
+    async executeInternal(request) {
+        const attribute = await this.attributeController.executeThirdPartyRelationshipAttributeQuery(content_1.ThirdPartyRelationshipAttributeQuery.from(request.query));
+        if (!attribute) {
+            return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.recordNotFound("RelationshipAttribute"));
+        }
+        return ts_utils_1.Result.ok(AttributeMapper_1.AttributeMapper.toAttributeDTO(attribute));
+    }
+};
+ExecuteThirdPartyRelationshipAttributeQueryUseCase = __decorate([
+    __param(0, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [consumption_1.LocalAttributesController])
+], ExecuteThirdPartyRelationshipAttributeQueryUseCase);
+exports.ExecuteThirdPartyRelationshipAttributeQueryUseCase = ExecuteThirdPartyRelationshipAttributeQueryUseCase;
+//# sourceMappingURL=ExecuteThirdPartyRelationshipAttributeQuery.js.map
+
+/***/ }),
+
 /***/ "./dist/useCases/consumption/attributes/GetAttribute.js":
 /*!**************************************************************!*\
   !*** ./dist/useCases/consumption/attributes/GetAttribute.js ***!
@@ -15209,6 +15783,7 @@ __exportStar(__webpack_require__(/*! ./CreateSharedAttributeCopy */ "./dist/useC
 __exportStar(__webpack_require__(/*! ./DeleteAttribute */ "./dist/useCases/consumption/attributes/DeleteAttribute.js"), exports);
 __exportStar(__webpack_require__(/*! ./ExecuteIdentityAttributeQuery */ "./dist/useCases/consumption/attributes/ExecuteIdentityAttributeQuery.js"), exports);
 __exportStar(__webpack_require__(/*! ./ExecuteRelationshipAttributeQuery */ "./dist/useCases/consumption/attributes/ExecuteRelationshipAttributeQuery.js"), exports);
+__exportStar(__webpack_require__(/*! ./ExecuteThirdPartyRelationshipAttributeQuery */ "./dist/useCases/consumption/attributes/ExecuteThirdPartyRelationshipAttributeQuery.js"), exports);
 __exportStar(__webpack_require__(/*! ./GetAttribute */ "./dist/useCases/consumption/attributes/GetAttribute.js"), exports);
 __exportStar(__webpack_require__(/*! ./GetAttributes */ "./dist/useCases/consumption/attributes/GetAttributes.js"), exports);
 __exportStar(__webpack_require__(/*! ./GetPeerAttributes */ "./dist/useCases/consumption/attributes/GetPeerAttributes.js"), exports);
@@ -15753,18 +16328,16 @@ const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transpor
 const typescript_ioc_1 = __webpack_require__(/*! typescript-ioc */ "./node_modules/typescript-ioc/dist/typescript-ioc.js");
 const common_1 = __webpack_require__(/*! ../../common */ "./dist/useCases/common/index.js");
 const RequestValidationResultMapper_1 = __webpack_require__(/*! ./RequestValidationResultMapper */ "./dist/useCases/consumption/requests/RequestValidationResultMapper.js");
-let Validator = class Validator extends common_1.SchemaValidator {
-    constructor(schemaRepository) {
+/*
+class Validator extends SchemaValidator<CanCreateOutgoingRequestRequest> {
+    public constructor(@Inject schemaRepository: SchemaRepository) {
         super(schemaRepository.getSchema("CanCreateOutgoingRequestRequest"));
     }
-};
-Validator = __decorate([
-    __param(0, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [common_1.SchemaRepository])
-], Validator);
+}
+*/
 let CanCreateOutgoingRequestUseCase = class CanCreateOutgoingRequestUseCase extends common_1.UseCase {
-    constructor(outgoingRequestsController, validator) {
-        super(validator);
+    constructor(outgoingRequestsController) {
+        super();
         this.outgoingRequestsController = outgoingRequestsController;
     }
     async executeInternal(request) {
@@ -15780,8 +16353,7 @@ let CanCreateOutgoingRequestUseCase = class CanCreateOutgoingRequestUseCase exte
 };
 CanCreateOutgoingRequestUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
-    __param(1, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [consumption_1.OutgoingRequestsController, Validator])
+    __metadata("design:paramtypes", [consumption_1.OutgoingRequestsController])
 ], CanCreateOutgoingRequestUseCase);
 exports.CanCreateOutgoingRequestUseCase = CanCreateOutgoingRequestUseCase;
 //# sourceMappingURL=CanCreateOutgoingRequest.js.map
@@ -35765,7 +36337,8 @@ function clone$1(dur, alts, clear = false) {
       ...(alts.values || {})
     },
     loc: dur.loc.clone(alts.loc),
-    conversionAccuracy: alts.conversionAccuracy || dur.conversionAccuracy
+    conversionAccuracy: alts.conversionAccuracy || dur.conversionAccuracy,
+    matrix: alts.matrix || dur.matrix
   };
   return new Duration(conf);
 }
@@ -35804,7 +36377,7 @@ function normalizeValues(matrix, vals) {
  *
  * Here is a brief overview of commonly used methods and getters in Duration:
  *
- * * **Creation** To create a Duration, use {@link Duration#fromMillis}, {@link Duration#fromObject}, or {@link Duration#fromISO}.
+ * * **Creation** To create a Duration, use {@link Duration.fromMillis}, {@link Duration.fromObject}, or {@link Duration.fromISO}.
  * * **Unit values** See the {@link Duration#years}, {@link Duration#months}, {@link Duration#weeks}, {@link Duration#days}, {@link Duration#hours}, {@link Duration#minutes}, {@link Duration#seconds}, {@link Duration#milliseconds} accessors.
  * * **Configuration** See  {@link Duration#locale} and {@link Duration#numberingSystem} accessors.
  * * **Transformation** To create new Durations out of old ones use {@link Duration#plus}, {@link Duration#minus}, {@link Duration#normalize}, {@link Duration#set}, {@link Duration#reconfigure}, {@link Duration#shiftTo}, and {@link Duration#negate}.
@@ -35820,10 +36393,16 @@ class Duration {
    */
   constructor(config) {
     const accurate = config.conversionAccuracy === "longterm" || false;
+    let matrix = accurate ? accurateMatrix : casualMatrix;
+
+    if (config.matrix) {
+      matrix = config.matrix;
+    }
     /**
      * @access private
      */
 
+
     this.values = config.values;
     /**
      * @access private
@@ -35844,7 +36423,7 @@ class Duration {
      * @access private
      */
 
-    this.matrix = accurate ? accurateMatrix : casualMatrix;
+    this.matrix = matrix;
     /**
      * @access private
      */
@@ -35883,7 +36462,8 @@ class Duration {
    * @param {Object} [opts=[]] - options for creating this Duration
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the custom conversion system to use
    * @return {Duration}
    */
 
@@ -35896,7 +36476,8 @@ class Duration {
     return new Duration({
       values: normalizeObject(obj, Duration.normalizeUnit),
       loc: Locale.fromObject(opts),
-      conversionAccuracy: opts.conversionAccuracy
+      conversionAccuracy: opts.conversionAccuracy,
+      matrix: opts.matrix
     });
   }
   /**
@@ -35928,7 +36509,8 @@ class Duration {
    * @param {Object} opts - options for parsing
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the preset conversion system to use
    * @see https://en.wikipedia.org/wiki/ISO_8601#Durations
    * @example Duration.fromISO('P3Y6M1W4DT12H30M5S').toObject() //=> { years: 3, months: 6, weeks: 1, days: 4, hours: 12, minutes: 30, seconds: 5 }
    * @example Duration.fromISO('PT23H').toObject() //=> { hours: 23 }
@@ -35952,7 +36534,8 @@ class Duration {
    * @param {Object} opts - options for parsing
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the conversion system to use
    * @see https://en.wikipedia.org/wiki/ISO_8601#Times
    * @example Duration.fromISOTime('11:22:33.444').toObject() //=> { hours: 11, minutes: 22, seconds: 33, milliseconds: 444 }
    * @example Duration.fromISOTime('11:00').toObject() //=> { hours: 11, minutes: 0, seconds: 0 }
@@ -36283,7 +36866,7 @@ class Duration {
    * Scale this Duration by the specified amount. Return a newly-constructed Duration.
    * @param {function} fn - The function to apply to each unit. Arity is 1 or 2: the value of the unit and, optionally, the unit name. Must return a number.
    * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits(x => x * 2) //=> { hours: 2, minutes: 60 }
-   * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits((x, u) => u === "hour" ? x * 2 : x) //=> { hours: 2, minutes: 30 }
+   * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits((x, u) => u === "hours" ? x * 2 : x) //=> { hours: 2, minutes: 30 }
    * @return {Duration}
    */
 
@@ -36341,20 +36924,18 @@ class Duration {
   reconfigure({
     locale,
     numberingSystem,
-    conversionAccuracy
+    conversionAccuracy,
+    matrix
   } = {}) {
     const loc = this.loc.clone({
       locale,
       numberingSystem
-    }),
-          opts = {
-      loc
+    });
+    const opts = {
+      loc,
+      matrix,
+      conversionAccuracy
     };
-
-    if (conversionAccuracy) {
-      opts.conversionAccuracy = conversionAccuracy;
-    }
-
     return clone$1(this, opts);
   }
   /**
@@ -36628,10 +37209,10 @@ function validateStartEnd(start, end) {
  *
  * Here is a brief overview of the most commonly used methods and getters in Interval:
  *
- * * **Creation** To create an Interval, use {@link Interval#fromDateTimes}, {@link Interval#after}, {@link Interval#before}, or {@link Interval#fromISO}.
+ * * **Creation** To create an Interval, use {@link Interval.fromDateTimes}, {@link Interval.after}, {@link Interval.before}, or {@link Interval.fromISO}.
  * * **Accessors** Use {@link Interval#start} and {@link Interval#end} to get the start and end.
  * * **Interrogation** To analyze the Interval, use {@link Interval#count}, {@link Interval#length}, {@link Interval#hasSame}, {@link Interval#contains}, {@link Interval#isAfter}, or {@link Interval#isBefore}.
- * * **Transformation** To create other Intervals out of this one, use {@link Interval#set}, {@link Interval#splitAt}, {@link Interval#splitBy}, {@link Interval#divideEqually}, {@link Interval#merge}, {@link Interval#xor}, {@link Interval#union}, {@link Interval#intersection}, or {@link Interval#difference}.
+ * * **Transformation** To create other Intervals out of this one, use {@link Interval#set}, {@link Interval#splitAt}, {@link Interval#splitBy}, {@link Interval#divideEqually}, {@link Interval.merge}, {@link Interval.xor}, {@link Interval#union}, {@link Interval#intersection}, or {@link Interval#difference}.
  * * **Comparison** To compare this Interval to another one, use {@link Interval#equals}, {@link Interval#overlaps}, {@link Interval#abutsStart}, {@link Interval#abutsEnd}, {@link Interval#engulfs}
  * * **Output** To convert the Interval into other representations, see {@link Interval#toString}, {@link Interval#toISO}, {@link Interval#toISODate}, {@link Interval#toISOTime}, {@link Interval#toFormat}, and {@link Interval#toDuration}.
  */
@@ -38072,7 +38653,6 @@ function expandMacroTokens(tokens, locale) {
  * @private
  */
 
-
 function explainFromTokens(locale, input, format) {
   const tokens = expandMacroTokens(Formatter.parseFormat(format), locale),
         units = tokens.map(t => unitForToken(t, locale)),
@@ -38668,7 +39248,7 @@ function lastOpts(argList) {
  *
  * Here is a brief overview of the most commonly used functionality it provides:
  *
- * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link DateTime#local}, {@link DateTime#utc}, and (most flexibly) {@link DateTime#fromObject}. To create one from a standard string format, use {@link DateTime#fromISO}, {@link DateTime#fromHTTP}, and {@link DateTime#fromRFC2822}. To create one from a custom string format, use {@link DateTime#fromFormat}. To create one from a native JS date, use {@link DateTime#fromJSDate}.
+ * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link DateTime.local}, {@link DateTime.utc}, and (most flexibly) {@link DateTime.fromObject}. To create one from a standard string format, use {@link DateTime.fromISO}, {@link DateTime.fromHTTP}, and {@link DateTime.fromRFC2822}. To create one from a custom string format, use {@link DateTime.fromFormat}. To create one from a native JS date, use {@link DateTime.fromJSDate}.
  * * **Gregorian calendar and time**: To examine the Gregorian properties of a DateTime individually (i.e as opposed to collectively through {@link DateTime#toObject}), use the {@link DateTime#year}, {@link DateTime#month},
  * {@link DateTime#day}, {@link DateTime#hour}, {@link DateTime#minute}, {@link DateTime#second}, {@link DateTime#millisecond} accessors.
  * * **Week calendar**: For ISO week calendar attributes, see the {@link DateTime#weekYear}, {@link DateTime#weekNumber}, and {@link DateTime#weekday} accessors.
@@ -39207,6 +39787,19 @@ class DateTime {
   static parseFormatForOpts(formatOpts, localeOpts = {}) {
     const tokenList = formatOptsToTokens(formatOpts, Locale.fromObject(localeOpts));
     return !tokenList ? null : tokenList.map(t => t ? t.val : null).join("");
+  }
+  /**
+   * Produce the the fully expanded format token for the locale
+   * Does NOT quote characters, so quoted tokens will not round trip correctly
+   * @param fmt
+   * @param localeOpts
+   * @returns {string}
+   */
+
+
+  static expandFormat(fmt, localeOpts = {}) {
+    const expanded = expandMacroTokens(Formatter.parseFormat(fmt), Locale.fromObject(localeOpts));
+    return expanded.map(t => t.val).join("");
   } // INFO
 
   /**
@@ -39899,8 +40492,8 @@ class DateTime {
    * @param {Object} opts - opts to override the configuration options on this DateTime
    * @example DateTime.now().toLocaleString(); //=> 4/20/2017
    * @example DateTime.now().setLocale('en-gb').toLocaleString(); //=> '20/04/2017'
-   * @example DateTime.now().toLocaleString({ locale: 'en-gb' }); //=> '20/04/2017'
    * @example DateTime.now().toLocaleString(DateTime.DATE_FULL); //=> 'April 20, 2017'
+   * @example DateTime.now().toLocaleString(DateTime.DATE_FULL, { locale: 'fr' }); //=> '28 août 2022'
    * @example DateTime.now().toLocaleString(DateTime.TIME_SIMPLE); //=> '11:32 AM'
    * @example DateTime.now().toLocaleString(DateTime.DATETIME_SHORT); //=> '4/20/2017, 11:32 AM'
    * @example DateTime.now().toLocaleString({ weekday: 'long', month: 'long', day: '2-digit' }); //=> 'Thursday, April 20'
@@ -39937,7 +40530,7 @@ class DateTime {
    * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0
    * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0
    * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'
-   * @param {boolean} [opts.extendedZone=true] - add the time zone format extension
+   * @param {boolean} [opts.extendedZone=false] - add the time zone format extension
    * @param {string} [opts.format='extended'] - choose between the basic and extended format
    * @example DateTime.utc(1983, 5, 25).toISO() //=> '1982-05-25T00:00:00.000Z'
    * @example DateTime.now().toISO() //=> '2017-04-22T20:47:05.335-04:00'
@@ -40642,7 +41235,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.0.1";
+const VERSION = "3.0.3";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;