diff --git a/pom.xml b/pom.xml
index 018c3f19a..35cecfc50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <cpp.framework.action.mapping.enabled>true</cpp.framework.action.mapping.enabled>
         <mvn.site.url>file://${project.build.directory}/site</mvn.site.url>
         <file.alfresco.version>2.3.0</file.alfresco.version>
-        <coredomain.version>17.104.4</coredomain.version>
+        <coredomain.version>17.104.5-CHD-2786-SNAPSHOT</coredomain.version>
         <criminal-court-public-model.version>${coredomain.version}</criminal-court-public-model.version>
         <javax.el-api.version>3.0.0</javax.el-api.version>
         <joda-time.version>2.10</joda-time.version>
diff --git a/sjp-command/sjp-command-api/src/raml/json/schema/sjp.upload-case-document.json b/sjp-command/sjp-command-api/src/raml/json/schema/sjp.upload-case-document.json
index aa91169a3..4b3fea8e9 100644
--- a/sjp-command/sjp-command-api/src/raml/json/schema/sjp.upload-case-document.json
+++ b/sjp-command/sjp-command-api/src/raml/json/schema/sjp.upload-case-document.json
@@ -4,9 +4,22 @@
   "properties": {
     "caseDocument": {
       "type": "string"
+    },
+    "caseDocumentUri": {
+      "type": "string",
+      "format": "uri"
     }
   },
-  "required": [
-    "caseDocument"
+  "oneOf": [
+    {
+      "required": [
+        "caseDocument"
+      ]
+    },
+    {
+      "required": [
+        "caseDocumentUri"
+      ]
+    }
   ]
 }
diff --git a/sjp-command/sjp-command-controller/src/raml/json/schema/sjp.command.upload-case-document.json b/sjp-command/sjp-command-controller/src/raml/json/schema/sjp.command.upload-case-document.json
index 175452af3..42fe63527 100644
--- a/sjp-command/sjp-command-controller/src/raml/json/schema/sjp.command.upload-case-document.json
+++ b/sjp-command/sjp-command-controller/src/raml/json/schema/sjp.command.upload-case-document.json
@@ -9,13 +9,28 @@
     "caseDocument": {
       "type": "string"
     },
+    "caseDocumentUri": {
+      "type": "string",
+      "format": "uri"
+    },
     "caseDocumentType": {
       "type": "string"
     }
   },
   "required": [
     "caseId",
-    "caseDocument",
     "caseDocumentType"
+  ],
+  "oneOf": [
+    {
+      "required": [
+        "caseDocument"
+      ]
+    },
+    {
+      "required": [
+        "caseDocumentUri"
+      ]
+    }
   ]
 }
diff --git a/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.upload-case-document.json b/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.upload-case-document.json
index 175452af3..42fe63527 100644
--- a/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.upload-case-document.json
+++ b/sjp-command/sjp-command-handler/src/raml/json/schema/sjp.command.upload-case-document.json
@@ -9,13 +9,28 @@
     "caseDocument": {
       "type": "string"
     },
+    "caseDocumentUri": {
+      "type": "string",
+      "format": "uri"
+    },
     "caseDocumentType": {
       "type": "string"
     }
   },
   "required": [
     "caseId",
-    "caseDocument",
     "caseDocumentType"
+  ],
+  "oneOf": [
+    {
+      "required": [
+        "caseDocument"
+      ]
+    },
+    {
+      "required": [
+        "caseDocumentUri"
+      ]
+    }
   ]
 }
diff --git a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.sjp.case-document-uploaded.json b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.sjp.case-document-uploaded.json
index ddecadf7a..aba067a2b 100644
--- a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.sjp.case-document-uploaded.json
+++ b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.sjp.case-document-uploaded.json
@@ -6,12 +6,27 @@
     "documentId": {
       "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
     },
+    "documentUri": {
+      "type": "string",
+      "format": "uri"
+    },
     "caseId": {
       "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
     }
   },
   "required": [
-    "documentId",
     "caseId"
+  ],
+  "oneOf": [
+    {
+      "required": [
+        "documentId"
+      ]
+    },
+    {
+      "required": [
+        "documentUri"
+      ]
+    }
   ]
-}
\ No newline at end of file
+}
diff --git a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.systemdocgenerator.events.document-available.json b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.systemdocgenerator.events.document-available.json
index 745674907..6d6af8914 100644
--- a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.systemdocgenerator.events.document-available.json
+++ b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.systemdocgenerator.events.document-available.json
@@ -6,6 +6,10 @@
     "payloadFileServiceId": {
       "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
     },
+    "payloadFileUri": {
+      "type": "string",
+      "format": "uri"
+    },
     "templateIdentifier": {
       "type": "string"
     },
@@ -19,6 +23,10 @@
     "documentFileServiceId": {
       "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
     },
+    "destinationFileUri": {
+      "type": "string",
+      "format": "uri"
+    },
     "generatedTime": {
       "type": "string",
       "format": "date-time"
@@ -55,12 +63,24 @@
   },
   "additionalProperties": false,
   "required": [
-    "payloadFileServiceId",
     "templateIdentifier",
     "conversionFormat",
     "requestedTime",
-    "documentFileServiceId",
     "generatedTime",
     "generateVersion"
+  ],
+  "oneOf": [
+    {
+      "required": [
+        "payloadFileServiceId",
+        "documentFileServiceId"
+      ]
+    },
+    {
+      "required": [
+        "payloadFileUri",
+        "destinationFileUri"
+      ]
+    }
   ]
 }
diff --git a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.systemdocgenerator.events.generation-failed.json b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.systemdocgenerator.events.generation-failed.json
index 61f66a7a2..f01e2f7c7 100644
--- a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.systemdocgenerator.events.generation-failed.json
+++ b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.systemdocgenerator.events.generation-failed.json
@@ -6,6 +6,10 @@
     "payloadFileServiceId": {
       "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
     },
+    "payloadFileUri": {
+      "type": "string",
+      "format": "uri"
+    },
     "templateIdentifier": {
       "type": "string"
     },
@@ -52,11 +56,22 @@
   },
   "additionalProperties": false,
   "required": [
-    "payloadFileServiceId",
     "failedTime",
     "requestedTime",
     "templateIdentifier",
     "conversionFormat",
     "reason"
+  ],
+  "oneOf": [
+    {
+      "required": [
+        "payloadFileServiceId"
+      ]
+    },
+    {
+      "required": [
+        "payloadFileUri"
+      ]
+    }
   ]
 }
diff --git a/sjp-event/sjp-event-processor/src/yaml/json/schema/sjp.events.case-document-uploaded.json b/sjp-event/sjp-event-processor/src/yaml/json/schema/sjp.events.case-document-uploaded.json
index 82edff28a..f7e1ffbe8 100644
--- a/sjp-event/sjp-event-processor/src/yaml/json/schema/sjp.events.case-document-uploaded.json
+++ b/sjp-event/sjp-event-processor/src/yaml/json/schema/sjp.events.case-document-uploaded.json
@@ -10,6 +10,10 @@
     "documentReference": {
       "type": "string"
     },
+    "documentReferenceUri": {
+      "type": "string",
+      "format": "uri"
+    },
     "documentType": {
       "type": "string"
     }
@@ -17,7 +21,18 @@
   "additionalProperties": false,
   "required": [
     "caseId",
-    "documentReference",
     "documentType"
+  ],
+  "oneOf": [
+    {
+      "required": [
+        "documentReference"
+      ]
+    },
+    {
+      "required": [
+        "documentReferenceUri"
+      ]
+    }
   ]
 }