diff --git a/.circleci/config.yml b/.circleci/config.yml
index ab7ea5f..99ce2be 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,6 @@ install_deploysuite: &install_deploysuite
             cp ./../buildscript/master_deploy.sh .
             cp ./../buildscript/buildenv.sh .
             cp ./../buildscript/awsconfiguration.sh .
-
 run_build: &run_build
           name: Installation of build dependencies.
           command: ./build.sh            
@@ -61,7 +60,6 @@ jobs:
             ./buildenv.sh -e PROD -b submission-processor-es_deployvar
             source buildenvvar
             ./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,submission-processor-es_appvar -i submission-processor-es
-
 workflows:
   version: 2
   build:
@@ -76,4 +74,4 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: master        
+              only: master
diff --git a/README.md b/README.md
index d67c503..70d1206 100755
--- a/README.md
+++ b/README.md
@@ -227,4 +227,4 @@ npm run view-data a12a4180-65aa-42ec-a945-5fd21dec0501
 
 ```
 { "topic":"submission.notification.delete", "originator":"submission-api", "timestamp":"2018-08-06T15:46:05.575Z", "mime-type":"application/json", "payload":{ "resource":"review", "id": "d34d4180-65aa-42ec-a945-5fd21dec0503" } }
-```
\ No newline at end of file
+```
diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js
index 4732d62..79527ff 100755
--- a/src/services/ProcessorService.js
+++ b/src/services/ProcessorService.js
@@ -28,6 +28,11 @@ function * getESData (id) {
  * @param {Object} message the message
  */
 function * create (message) {
+  if (message.payload.resource === 'submission') {
+    message.payload.challengeId = message.payload.v5ChallengeId
+    delete message.payload.v5ChallengeId
+  }
+
   yield client.create({
     index: config.get('esConfig.ES_INDEX'),
     type: config.get('esConfig.ES_TYPE'),
@@ -53,8 +58,8 @@ function * create (message) {
     const submission = yield getESData(message.payload.submissionId)
     let reviewSummationArr = []
     reviewSummationArr.push(_.omit(message.payload, ['resource']))
-    if (submission.reviewSummationArr) {
-      reviewSummationArr = reviewSummationArr.concat(submission.review)
+    if (submission.reviewSummation) {
+      reviewSummationArr = reviewSummationArr.concat(submission.reviewSummation)
     }
     yield client.update({
       index: config.get('esConfig.ES_INDEX'),
@@ -83,6 +88,13 @@ create.schema = {
  * @param {Object} message the message
  */
 function * update (message) {
+  if (message.payload.resource === 'submission') {
+    const legacyChallengeId = message.payload.challengeId
+    message.payload.challengeId = message.payload.v5ChallengeId
+    message.payload.legacyChallengeId = legacyChallengeId
+    delete message.payload.v5ChallengeId
+  }
+
   yield client.update({
     index: config.get('esConfig.ES_INDEX'),
     type: config.get('esConfig.ES_TYPE'),