diff --git a/models/common/jwk.json b/models/common/jwk.json
index 18427f3aa4e4778e4dcdee331677a062541af8ae..d2be273f1862fba31f1c2f8233f77835960775b6 100644
--- a/models/common/jwk.json
+++ b/models/common/jwk.json
@@ -1,6 +1,7 @@
 {
   "title": "JSON Web Key (JWK)",
   "type": "object",
+  "description": "JSON Web Key - RFC 7517",
   "properties": {
     "kty": {
       "type": "string",
@@ -42,7 +43,8 @@
       "description": "Algorithm"
     },
     "kid": {
-      "description": "Key ID"
+      "description": "Key ID",
+      "type": "string"
     },
     "x5u": {
       "type": "string",
@@ -65,6 +67,5 @@
   },
   "required": [
     "kty"
-  ],
-  "description": "JSON Web Key - RFC 7517"
+  ]
 }
\ No newline at end of file
diff --git a/models/destination-no-id.json b/models/destination-no-id.json
index a526ef0a8cad29b2be1c258b1ad7e23476e9c4d9..ca4f509a8c51c84f199589bf239c4b307158d3a5 100644
--- a/models/destination-no-id.json
+++ b/models/destination-no-id.json
@@ -2,6 +2,62 @@
   "type": "object",
   "title": "Destination without ID",
   "description": "Daten eines technischen Ãœbergabepunkts (Ziel der Ãœbertragung - z.B. ein Fachverfahren) noch ohne ID, zum Anlegen eines neuen Ãœbergabepunkts. Nach dem Zuweisen der `destination-id` wird das Modell [Destination](destination.json) verwendet.",
+  "x-examples": {
+    "example-1": {
+      "publicOrganization": {
+        "organizationName": "Gewerbeamt Musterstadt",
+        "address": {
+          "type": "national",
+          "street": "Kurzer Weg",
+          "houseNumber": "7",
+          "postalCode": "12345",
+          "city": "Ankh-Morpork"
+        },
+        "contact": {
+          "telephones": [
+            {
+              "number": "+49 89 32168-0",
+              "mobile": false,
+              "description": "work"
+            }
+          ],
+          "email": "behoerde@example.com"
+        }
+      },
+      "technicalContact": [
+        {
+          "formOfAddress": "Herr",
+          "doctoralDegrees": "Dr.",
+          "firstName": "Kunibert",
+          "lastName": "Vonundzu",
+          "contact": {
+            "telephones": [
+              {
+                "number": "+49 89 32168-42",
+                "mobile": false,
+                "description": "work"
+              },
+              {
+                "number": "+49 123 456789",
+                "mobile": true,
+                "description": "work"
+              }
+            ],
+            "email": "kunibert.vonundzu@example.com"
+          }
+        }
+      ],
+      "schemas": [
+        {
+          "mimeType": "json",
+          "schemaSource": "none"
+        }
+      ],
+      "callback": {
+        "callbackURI": "http://127.0.0.1:4010/voluptas"
+      }
+    }
+  },
   "properties": {
     "publicOrganization": {
       "type": "object",
@@ -93,61 +149,49 @@
       "required": [
         "callbackURI"
       ]
-    }
-  },
-  "x-examples": {
-    "example-1": {
-      "publicOrganization": {
-        "organizationName": "Gewerbeamt Musterstadt",
-        "address": {
-          "type": "national",
-          "street": "Kurzer Weg",
-          "houseNumber": "7",
-          "postalCode": "12345",
-          "city": "Ankh-Morpork"
-        },
-        "contact": {
-          "telephones": [
-            {
-              "number": "+49 89 32168-0",
-              "mobile": false,
-              "description": "work"
-            }
-          ],
-          "email": "behoerde@example.com"
-        }
-      },
-      "technicalContact": [
-        {
-          "formOfAddress": "Herr",
-          "doctoralDegrees": "Dr.",
-          "firstName": "Kunibert",
-          "lastName": "Vonundzu",
-          "contact": {
-            "telephones": [
-              {
-                "number": "+49 89 32168-42",
-                "mobile": false,
-                "description": "work"
+    },
+    "publicKeys": {
+      "type": "object",
+      "description": "JSON Web Key Set mit den öffentlichen Schlüsseln\nRFC 7517 Sec. 5",
+      "properties": {
+        "keys": {
+          "type": "array",
+          "description": "RFC 7517 Sec. 5.1",
+          "items": {
+            "type": "object",
+            "description": "JSON Web Key",
+            "properties": {
+              "kty": {
+                "type": "string",
+                "enum": [
+                  "RSA"
+                ]
               },
-              {
-                "number": "+49 123 456789",
-                "mobile": true,
-                "description": "work"
+              "use": {
+                "type": "string",
+                "description": "Public Key Use",
+                "enum": [
+                  "sig",
+                  "enc"
+                ]
+              },
+              "kid": {
+                "description": "Key ID",
+                "type": "string"
+              },
+              "e": {
+                "type": "string"
+              },
+              "n": {
+                "type": "string"
               }
-            ],
-            "email": "kunibert.vonundzu@example.com"
+            },
+            "required": [
+              "kty",
+              "kid"
+            ]
           }
         }
-      ],
-      "schemas": [
-        {
-          "mimeType": "json",
-          "schemaSource": "none"
-        }
-      ],
-      "callback": {
-        "callbackURI": "http://127.0.0.1:4010/voluptas"
       }
     }
   }