diff --git a/specifications/M1/context.json b/specifications/M1/context.json
index f668aaa..68d3316 100644
--- a/specifications/M1/context.json
+++ b/specifications/M1/context.json
@@ -86,8 +86,28 @@
     "PresentationQueryMessage": {
       "@id": "iatp:PresentationQueryMessage",
       "@context": {
-        "presentationDefinition": "iatp:presentationDefinition",
-        "scope": "iatp:scope"
+        "presentationDefinition": {
+          "@id": "iatp:presentationDefinition",
+          "@type": "@json"
+        },
+        "scope": {
+          "@id": "iatp:scope",
+          "@type": "xsd:string",
+          "@container": "@set"
+        }
+      }
+    },
+    "PresentationResponseMessage": {
+      "@id": "iatp:PresentationResponseMessage",
+      "@context": {
+        "presentation": {
+          "@id": "iatp:presentation",
+          "@type": "@json"
+        },
+        "presentationSubmission": {
+          "@id": "iatp:presentationSubmission",
+          "@type": "@json"
+        }
       }
     },
     "credentials": {
@@ -102,15 +122,6 @@
       "@id": "iatp:format",
       "@type": "xsd:string"
     },
-    "presentationDefinition": {
-      "@id": "iatp:presentationDefinition",
-      "@type": "@json"
-    },
-    "scope": {
-      "@id": "iatp:scope",
-      "@type": "xsd:string",
-      "@container": "@set"
-    },
     "type": "@type"
   }
 }