diff --git a/README.md b/README.md
index e00e8026..68f17100 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,18 @@ Node-RED Watson Nodes for IBM Cloud
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.8.2
+- Node-RED & IBM-Watson & Use of promises on API invocation & IAM URL construct migration & Removal of default endpoint of
+    - Document Translator node
+    - Discovery node
+    - Discovery Document Loader node
+    - Discovery Query Builder node
+    - Assistant V1 Workspace Manager node
+- List Expansion list, and List Training data modes added to Discovery node
+- Fix to Create Classifier mode in NLC node
+
 ### New in version 0.8.1
-- Node-RED & IBM-Watson & Use of promises on API invokation & IAM URL construct migration & Removal of default endpoint of
+- Node-RED & IBM-Watson & Use of promises on API invocation & IAM URL construct migration & Removal of default endpoint of
     - Speech to Text node
     - Speech to Text Corpus Builder node
     - Natural Language Understanding node
@@ -33,7 +43,7 @@ During the migration there will be a dependancy on both modules.
 - Bump dependancy on node to >=10.0.0
 - Bump dependancy on cfenv, request, file-type
 - Bump dependancy on ibm-cloud-sdk-core to 0.3.7 (need to stay on 0.x, for STT Streaming to work)
-- Node-RED & IBM-Watson & Use of promises on API invokation & IAM URL construct migration & Removal of default endpoint of
+- Node-RED & IBM-Watson & Use of promises on API invocation & IAM URL construct migration & Removal of default endpoint of
     - Tone Analyzer node.
     - Personality Insights node.
     - Visual Recognition V3 node
@@ -46,7 +56,7 @@ During the migration there will be a dependancy on both modules.
 - Update language lists for STT, TTS, Language Translator and Document Translator Nodes
 
 ### Watson Nodes for Node-RED
-A collection of nodes to interact with the IBM Watson services in [IBM Cloud](http://bluemix.net).
+A collection of nodes to interact with the IBM Watson services in [IBM Cloud](http://cloud.ibm.com).
 
 # Nodes
 
diff --git a/package.json b/package.json
index 2798e354..bcfab526 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",
@@ -24,7 +24,7 @@
   "license": "Apache-2.0",
   "keywords": [
     "node-red",
-    "bluemix",
+    "ibm-cloud",
     "watson"
   ],
   "contributors": [
diff --git a/services/assistant/v1-workspace-manager.html b/services/assistant/v1-workspace-manager.html
index 369fd05c..60d56705 100644
--- a/services/assistant/v1-workspace-manager.html
+++ b/services/assistant/v1-workspace-manager.html
@@ -44,17 +44,12 @@
     </div>
 
     <div class="form-row credentials">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-cwm-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-cwm-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
-    </div>
-    <div class="form-row">
         <label for="node-input-cwm-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
         <input type="text" id="node-input-cwm-service-endpoint" placeholder="https://gateway.watsonplatform.net/assistant/api">
     </div>
 
     <div class="form-row">
-        <label for="node-input-cwm-custom-mode"><i class="fa fa-book"></i> Detect: </label>
+        <label for="node-input-cwm-custom-mode"><i class="fa fa-book"></i> Mode: </label>
         <select type="text" id="node-input-cwm-custom-mode" style="display: inline-block; width: 70%;">
             <option value="listWorkspaces">List Workspaces</option>
             <option value="getWorkspace">Get Workspace Details</option>
@@ -341,7 +336,7 @@
         defining the content of the updates
         should be passed in
         as <code>msg.payload</code>. Fields to be updated need a
-        <code>new_</code> prefix as part of their key. 
+        <code>new_</code> prefix as part of their key.
       </p>
     </li>
     <li>Delete Dialog Node
@@ -438,7 +433,6 @@
   // moved in if there is a clash with other nodes.
   var cv1wm = new CV1WM();
   cv1wm.mode_selected = null;
-  cv1wm.endpoint_required = false;
 
   cv1wm.showSelectedFields = function(fields) {
     for (i = 0; i < fields.length; i++) {
@@ -463,8 +457,7 @@
                      + ', #node-input-cwm-entity'
                      + ', #node-input-cwm-entity-value'
                      + ', #node-input-cwm-dialog-node'
-                     + ', #node-input-cwm-export-content'
-                     + ', #node-input-cwm-service-endpoint');
+                     + ', #node-input-cwm-export-content');
 
     cv1wm.hideSelectedFields(fields);
   }
@@ -546,9 +539,7 @@
       case 'createWorkspace':
         break;
     }
-    if (cv1wm.endpoint_required) {
-      fields.push('#node-input-cwm-service-endpoint');
-    }
+
     cv1wm.showSelectedFields(fields);
   }
 
@@ -558,10 +549,6 @@
       cv1wm.mode_selected = $('#node-input-cwm-custom-mode').val();
       cv1wm.processSelectedMethod(cv1wm.mode_selected);
     });
-    $('#node-input-cwm-default-endpoint').change(function () {
-      cv1wm.endpoint_required = ! $('#node-input-cwm-default-endpoint').prop('checked');
-      cv1wm.processSelectedMethod(cv1wm.mode_selected);
-    });
   }
 
   // This is the on edit prepare function, which will be invoked everytime the dialog
@@ -600,8 +587,7 @@
                 'cwm-entity-value': {value:""},
                 'cwm-dialog-node': {value:""},
                 'cwm-export-content': {value:false},
-                'cwm-default-endpoint' :{value: true},
-                'cwm-service-endpoint' :{value: 'https://gateway.watsonplatform.net/assistant/api'}
+                'cwm-service-endpoint' :{value: ''}
             },
             credentials: {
               username: {type:'text'},
diff --git a/services/assistant/v1-workspace-manager.js b/services/assistant/v1-workspace-manager.js
index 1c5ed395..14cb1d49 100644
--- a/services/assistant/v1-workspace-manager.js
+++ b/services/assistant/v1-workspace-manager.js
@@ -16,14 +16,16 @@
 
 module.exports = function (RED) {
   const SERVICE_IDENTIFIER = 'assistant',
-    OLD_SERVICE_IDENTIFIER = 'conversation';
+    OLD_SERVICE_IDENTIFIER = 'conversation',
+    AssistantV1 = require('ibm-watson/assistant/v1'),
+    { IamAuthenticator } = require('ibm-watson/auth');
 
   var pkg = require('../../package.json'),
     temp = require('temp'),
     fs = require('fs'),
     serviceutils = require('../../utilities/service-utils'),
     payloadutils = require('../../utilities/payload-utils'),
-    AssistantV1 = require('watson-developer-cloud/assistant/v1'),
+    responseutils = require('../../utilities/response-utils'),
     service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
     username = '', password = '', sUsername = '', sPassword = '',
     apikey = '', sApikey = '',
@@ -34,6 +36,40 @@ module.exports = function (RED) {
     service = serviceutils.getServiceCreds(OLD_SERVICE_IDENTIFIER);
   }
 
+  const ExecutionList = {
+    'listWorkspaces'  : executeListWorkspaces,
+    'getWorkspace'    : executeGetWorkspace,
+    'createWorkspace' : executeCreateWorkspace,
+    'updateWorkspace' : executeUpdateWorkspace,
+    'deleteWorkspace' : executeDeleteWorkspace,
+    'listIntents'     : executeListIntents,
+    'getIntent'       : executeGetIntent,
+    'createIntent'    : executeCreateIntent,
+    'updateIntent'    : executeUpdateIntent,
+    'deleteIntent'    : executeDeleteIntent,
+    'listExamples'    : executeListExamples,
+    'createExample'   : executeCreateExample,
+    'deleteExample'   : executeDeleteExample,
+    'listCounterExamples' : executeListCounterExamples,
+    'createCounterExample': executeCreateCounterExample,
+    'deleteCounterExample': executeDeleteCounterExample,
+    'listEntities'    : executeListEntities,
+    'getEntity'       : executeGetEntity,
+    'createEntity'    : executeCreateEntity,
+    'updateEntity'    : executeUpdateEntity,
+    'deleteEntity'    : executeDeleteEntity,
+    'listEntityValues': executeListEntityValues,
+    'getEntityValue'  : executeGetEntityValue,
+    'addEntityValue'  : executeAddEntityValue,
+    'updateEntityValue'   : executeUpdateEntityValue,
+    'deleteEntityValue'   : executeDeleteEntityValue,
+    'listDialogNodes' : executeListDialogNodes,
+    'getDialogNode'   : executeGetDialogNode,
+    'updateDialogNode': executeUpdateDialogNode,
+    'createDialogNode': executeCreateDialogNode,
+    'deleteDialogNode': executeDeleteDialogNode
+  };
+
   temp.track();
 
   // Require the Cloud Foundry Module to pull credentials from bound service
@@ -55,449 +91,408 @@ module.exports = function (RED) {
   }
 
   function executeListWorkspaces(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.listWorkspaces(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['workspaces'] = response.workspaces ?
-                                        response.workspaces: response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.listWorkspaces(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'workspaces');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeGetWorkspace(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.getWorkspace(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['workspace'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.getWorkspace(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'workspace');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeCreateWorkspace(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.createWorkspace(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['workspace'] = response;
+    return new Promise(function resolver(resolve, reject){
+      conv.createWorkspace(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'workspace');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeUpdateWorkspace(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.updateWorkspace(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['workspace'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.updateWorkspace(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'workspace');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeDeleteWorkspace(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.deleteWorkspace(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['workspace'] = response;
-          resolve();
-        }
+    return new Promise(function resolver(resolve, reject) {
+      conv.deleteWorkspace(params)
+      .then((response) => {
+        responseutils.assignResultToField(msg, response, 'workspace');
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
-    return p;
   }
 
   function executeListIntents(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.listIntents(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['intents'] = response.intents ?
-                                        response.intents: response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.listIntents(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'intents');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeGetIntent(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.getIntent(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          // returning the whole response even though response.intent has
-          // the intent, but the details with export = true
-          // are provided as response.examples
-          msg['intent'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.getIntent(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'intent');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeCreateIntent(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.createIntent(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['intent'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.createIntent(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'intent');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeUpdateIntent(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.updateIntent(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['intent'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.updateIntent(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'intent');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeDeleteIntent(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.deleteIntent(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['intent'] = response;
+    return new Promise(function resolver(resolve, reject){
+      conv.deleteIntent(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'intent');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   // For now we are not doing anything with the pagination
   // response
   function executeListExamples(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.listExamples(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['examples'] = response.examples ?
-                                        response.examples: response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.listExamples(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'examples');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeCreateExample(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.createExample(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['example'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.createExample(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'example');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeDeleteExample(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.deleteExample(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['example'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.deleteExample(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'example');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeListCounterExamples(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.listCounterexamples(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['counterexamples'] = response.counterexamples ?
-                                        response.counterexamples: response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.listCounterexamples(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'counterexamples');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeCreateCounterExample(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.createCounterexample(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['counterexample'] = response;
+    return new Promise(function resolver(resolve, reject){
+      conv.createCounterexample(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'counterexample');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeDeleteCounterExample(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.deleteCounterexample(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['counterexample'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.deleteCounterexample(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'counterexample');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeListEntities(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.listEntities(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['entities'] = response.entities ? response.entities: response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.listEntities(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'entities');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeGetEntity(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.getEntity(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          // returning the whole response even though response.intent has
-          // the intent, but the details with export = true
-          // are provided as response.examples
-          msg['entity'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.getEntity(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'entity');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeCreateEntity(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.createEntity(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['entity'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.createEntity(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'entity');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeUpdateEntity(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.updateEntity(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['entity'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.updateEntity(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'entity');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeDeleteEntity(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.deleteEntity(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['entity'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.deleteEntity(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'entity');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeListEntityValues(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.listValues(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['values'] = response.values ? response.values: response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.listValues(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'values');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeGetEntityValue(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.getValue(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['value'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.getValue(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'value');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeAddEntityValue(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.createValue(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['value'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.createValue(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'value');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeUpdateEntityValue(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.updateValue(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['value'] = response;
-          resolve();
-        }
+    return new Promise(function resolver(resolve, reject) {
+      conv.updateValue(params)
+      .then((response) => {
+        responseutils.assignResultToField(msg, response, 'value');
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
-    return p;
   }
 
   function executeDeleteEntityValue(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.deleteValue(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['value'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.deleteValue(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'value');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeListDialogNodes(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.listDialogNodes(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['dialog_nodes'] = response.dialog_nodes ? response.dialog_nodes: response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.listDialogNodes(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'dialog_nodes');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeGetDialogNode(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.getDialogNode(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['dialog_node'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.getDialogNode(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'dialog_node');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeCreateDialogNode(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.createDialogNode(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['dialog_node'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.createDialogNode(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'dialog_node');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeUpdateDialogNode(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.updateDialogNode(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['dialog_node'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.updateDialogNode(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'dialog_node');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeDeleteDialogNode(node, conv, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
-      conv.deleteDialogNode(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg['dialog_node'] = response;
+    return new Promise(function resolver(resolve, reject) {
+      conv.deleteDialogNode(params)
+        .then((response) => {
+          responseutils.assignResultToField(msg, response, 'dialog_node');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
-    return p;
   }
 
   function executeUnknownMethod(node, conv, params, msg) {
@@ -507,6 +502,7 @@ module.exports = function (RED) {
   function executeMethod(node, method, params, msg) {
     let conv = null,
       version = '2018-09-20',
+      authSettings = {},
       serviceSettings = {
         version_date: version,
         version: version,
@@ -516,124 +512,27 @@ module.exports = function (RED) {
       };
 
     if (apikey) {
-      serviceSettings.iam_apikey = apikey;
+      authSettings.apikey = apikey;
     } else {
-      serviceSettings.username = username;
-      serviceSettings.password = password;
+      authSettings.username = username;
+      authSettings.password = password;
     }
+    serviceSettings.authenticator = new IamAuthenticator(authSettings);
 
     if (endpoint) {
       serviceSettings.url = endpoint;
     }
 
-
-
     conv = new AssistantV1(serviceSettings);
 
     node.status({fill:'blue', shape:'dot', text:'executing'});
 
-    var p = null;
-
-    switch (method) {
-    case 'listWorkspaces':
-      p = executeListWorkspaces(node, conv, params, msg);
-      break;
-    case 'getWorkspace':
-      p = executeGetWorkspace(node, conv, params, msg);
-      break;
-    case 'createWorkspace':
-      p = executeCreateWorkspace(node, conv, params, msg);
-      break;
-    case 'updateWorkspace':
-      p = executeUpdateWorkspace(node, conv, params, msg);
-      break;
-    case 'deleteWorkspace':
-      p = executeDeleteWorkspace(node, conv, params, msg);
-      break;
-    case 'listIntents':
-      p = executeListIntents(node, conv, params, msg);
-      break;
-    case 'getIntent':
-      p = executeGetIntent(node, conv, params, msg);
-      break;
-    case 'createIntent':
-      p = executeCreateIntent(node, conv, params, msg);
-      break;
-    case 'updateIntent':
-      p = executeUpdateIntent(node, conv, params, msg);
-      break;
-    case 'deleteIntent':
-      p = executeDeleteIntent(node, conv, params, msg);
-      break;
-    case 'listExamples':
-      p = executeListExamples(node, conv, params, msg);
-      break;
-    case 'createExample':
-      p = executeCreateExample(node, conv, params, msg);
-      break;
-    case 'deleteExample':
-      p = executeDeleteExample(node, conv, params, msg);
-      break;
-    case 'listCounterExamples':
-      p = executeListCounterExamples(node, conv, params, msg);
-      break;
-    case 'createCounterExample':
-      p = executeCreateCounterExample(node, conv, params, msg);
-      break;
-    case 'deleteCounterExample':
-      p = executeDeleteCounterExample(node, conv, params, msg);
-      break;
-    case 'listEntities':
-      p = executeListEntities(node, conv, params, msg);
-      break;
-    case 'getEntity':
-      p = executeGetEntity(node, conv, params, msg);
-      break;
-    case 'createEntity':
-      p = executeCreateEntity(node, conv, params, msg);
-      break;
-    case 'updateEntity':
-      p = executeUpdateEntity(node, conv, params, msg);
-      break;
-    case 'deleteEntity':
-      p = executeDeleteEntity(node, conv, params, msg);
-      break;
-    case 'listEntityValues':
-      p = executeListEntityValues(node, conv, params, msg);
-      break;
-    case 'getEntityValue':
-      p = executeGetEntityValue(node, conv, params, msg);
-      break;
-    case 'addEntityValue':
-      p = executeAddEntityValue(node, conv, params, msg);
-      break;
-    case 'updateEntityValue':
-      p = executeUpdateEntityValue(node, conv, params, msg);
-      break;
-    case 'deleteEntityValue':
-      p = executeDeleteEntityValue(node, conv, params, msg);
-      break;
-    case 'listDialogNodes':
-      p = executeListDialogNodes(node, conv, params, msg);
-      break;
-    case 'getDialogNode':
-      p = executeGetDialogNode(node, conv, params, msg);
-      break;
-    case 'updateDialogNode':
-      p = executeUpdateDialogNode(node, conv, params, msg);
-      break;
-    case 'createDialogNode':
-      p = executeCreateDialogNode(node, conv, params, msg);
-      break;
-    case 'deleteDialogNode':
-      p = executeDeleteDialogNode(node, conv, params, msg);
-      break;
-    default:
-      p = executeUnknownMethod(node, conv, params, msg);
-      break;
+    let exe = ExecutionList[method];
+    if (!exe) {
+      exe = unknownMethod
     }
 
-    return p;
+    return exe(node, conv, params, msg);
   }
 
   function buildWorkspaceParams(msg, method, config, params) {
@@ -676,7 +575,7 @@ module.exports = function (RED) {
         workspace_id = config['cwm-workspace-id'];
       }
       if (workspace_id) {
-        params['workspace_id'] = workspace_id;
+        params['workspaceId'] = workspace_id;
       } else {
         message = 'Workspace ID is required';
       }
@@ -786,12 +685,12 @@ module.exports = function (RED) {
 
   function buildDialogParams(msg, method, config, params) {
     var message = '',
-      field = 'dialog_node',
+      field = 'dialogNode',
       dialogID = '';
 
     switch (method) {
     case 'updateDialogNode':
-      field = 'old_dialog_node';
+      field = 'old_dialogNode';
       // deliberate no break
     case 'getDialogNode':
     case 'deleteDialogNode':
@@ -849,7 +748,7 @@ module.exports = function (RED) {
     case 'getEntity':
     case 'listEntityValues':
     case 'getEntityValue':
-      params['export'] = config['cwm-export-content'];
+      params['_export'] = config['cwm-export-content'];
       break;
     }
     return Promise.resolve();
@@ -923,8 +822,8 @@ module.exports = function (RED) {
       }
       break;
     case 'updateDialogNode':
-      if (params['old_dialog_node']) {
-        stash['old_dialog_node'] = params['old_dialog_node'];
+      if (params['old_dialogNode']) {
+        stash['old_dialogNode'] = params['old_dialogNode'];
       }
       break;
     }
@@ -938,8 +837,8 @@ module.exports = function (RED) {
     case 'updateEntityValue':
     case 'createDialogNode':
     case 'updateDialogNode':
-      if (params['workspace_id']) {
-        stash['workspace_id'] = params['workspace_id'];
+      if (params['workspaceId']) {
+        stash['workspaceId'] = params['workspaceId'];
       }
       break;
     }
@@ -959,7 +858,7 @@ module.exports = function (RED) {
 
 
   function openTheFile() {
-    var p = new Promise(function resolver(resolve, reject){
+    return new Promise(function resolver(resolve, reject){
       temp.open({
         suffix: '.txt'
       }, function(err, info) {
@@ -970,11 +869,10 @@ module.exports = function (RED) {
         }
       });
     });
-    return p;
   }
 
   function syncTheFile(info, msg) {
-    var p = new Promise(function resolver(resolve, reject){
+    return new Promise(function resolver(resolve, reject){
       fs.writeFile(info.path, msg.payload, function(err) {
         if (err) {
           reject('Error processing data buffer');
@@ -982,7 +880,6 @@ module.exports = function (RED) {
         resolve();
       });
     });
-    return p;
   }
 
 
@@ -1018,8 +915,8 @@ module.exports = function (RED) {
   // compromising of all the promises from the async and
   // sync functions.
   function loadFile(node, method, params, msg) {
-    var fileInfo = null;
-    var p = openTheFile()
+    let fileInfo = null;
+    let p = openTheFile()
       .then(function(info){
         fileInfo = info;
         return syncTheFile(fileInfo, msg);
@@ -1052,6 +949,70 @@ module.exports = function (RED) {
     return Promise.resolve(false);
   }
 
+  function newOldUtility(params, field) {
+    let newField = 'new' + field[0].toUpperCase() + field.slice(1),
+      oldField = 'old_' + field;
+
+    if (params[oldField]) {
+      if (params[field]) {
+        params[newField] = params[field];
+      }
+      params[field] = params[oldField];
+      delete params[oldField];
+    }
+  }
+
+  function newUtility(params, field) {
+    let newField = 'new' + field[0].toUpperCase() + field.slice(1);
+
+    if (params[field]) {
+      params[newField] = params[field];
+    }
+    delete params[field];
+  }
+
+  function newOldParamShift(method, params) {
+    return new Promise(function resolver(resolve, reject) {
+      ['intent', 'entity', 'value', 'dialogNode'].forEach(function(field) {
+        newOldUtility(params, field);
+      });
+
+      switch (method) {
+        case 'updateIntent' :
+          ['description', 'examples'].forEach(function(field) {
+            newUtility(params, field);
+          });
+          break;
+        case 'updateEntity' :
+          ['description', 'metadata', 'fuzzyMatch', 'values'].forEach(function(field) {
+            newUtility(params, field);
+          });
+          break;
+        case 'updateEntityValue' :
+          ['metadata', 'type', 'synonyms', 'patterns'].forEach(function(field) {
+            newUtility(params, field);
+          });
+          break;
+        case 'updateDialogNode' :
+          ['description', 'conditions', 'parent', 'previousSibling', 'output',
+            'context', 'metadata', 'nextStep', 'title', 'type', 'eventName',
+            'variable', 'actions', 'digressIn', 'digressOut', 'digressOutSlots',
+            'userLabel', 'disambiguationOptOut'].forEach(function(field) {
+            newUtility(params, field);
+          });
+          // deliberate no break
+        case 'createDialogNode':
+          if (params && params.dialog_node){
+            params.dialogNode = params.dialog_node;
+            delete params.dialog_node;
+          }
+          break;
+      }
+
+      resolve(params);
+    });
+  }
+
   function initialCheck(a, u, p, m) {
     var message = '';
     if (!a && (!u || !p)) {
@@ -1079,10 +1040,10 @@ module.exports = function (RED) {
   // This is the Conversation Workspace Manager Node
   function Node (config) {
     RED.nodes.createNode(this, config);
-    var node = this;
+    let node = this;
 
-    this.on('input', function (msg) {
-      var method = config['cwm-custom-mode'],
+    this.on('input', function(msg, send, done) {
+      let method = config['cwm-custom-mode'],
         message = '',
         params = {};
 
@@ -1109,7 +1070,7 @@ module.exports = function (RED) {
         }
       }
       endpoint = sEndpoint;
-      if ((!config['cwm-default-endpoint']) && config['cwm-service-endpoint']) {
+      if (config['cwm-service-endpoint']) {
         endpoint = config['cwm-service-endpoint'];
       }
 
@@ -1132,6 +1093,10 @@ module.exports = function (RED) {
           }
           return Promise.resolve(params);
         })
+        .then(function(p){
+          params = p;
+          return newOldParamShift(method, params);
+        })
         .then(function(p){
           params = p;
           node.status({fill:'blue', shape:'dot', text:'executing'});
@@ -1140,11 +1105,13 @@ module.exports = function (RED) {
         .then(function(){
           temp.cleanup();
           node.status({});
-          node.send(msg);
+          send(msg);
+          done();
         })
         .catch(function(err){
           temp.cleanup();
-          payloadutils.reportError(node,msg,err);
+          let errMsg = payloadutils.reportError(node, msg, err);
+          done(errMsg);
         });
 
     });
diff --git a/services/discovery/discovery-utils.js b/services/discovery/discovery-utils.js
index b5b5ea3e..0a5e2fd1 100644
--- a/services/discovery/discovery-utils.js
+++ b/services/discovery/discovery-utils.js
@@ -14,25 +14,29 @@
  * limitations under the License.
  **/
 const pkg = require('../../package.json'),
-  DiscoveryV1 = require('watson-developer-cloud/discovery/v1');
+  DiscoveryV1 = require('ibm-watson/discovery/v1'),
+  { IamAuthenticator } = require('ibm-watson/auth');
+
 
 function DiscoveryUtils() {}
 DiscoveryUtils.prototype = {
 
   buildService: function(username, password, apikey, endpoint) {
+    let authSettings = {};
     let serviceSettings = {
-      version_date: '2018-12-03',
+      version: '2019-04-30',
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
     };
 
     if (apikey) {
-      serviceSettings.iam_apikey = apikey;
+      authSettings.apikey = apikey;
     } else {
-      serviceSettings.username = username;
-      serviceSettings.password = password;
+      authSettings.username = username;
+      authSettings.password = password;
     }
+    serviceSettings.authenticator = new IamAuthenticator(authSettings);
 
     if (endpoint) {
       serviceSettings.url = endpoint;
@@ -64,7 +68,7 @@ DiscoveryUtils.prototype = {
       targetField = 'query';
 
     if (config.nlp_query || (msg.discoveryparams && msg.discoveryparams.nlp_query)) {
-      targetField = 'natural_language_query';
+      targetField = 'naturalLanguageQuery';
     }
     if (msg.discoveryparams && msg.discoveryparams[sourceField]) {
       params[targetField] = msg.discoveryparams[sourceField];
@@ -83,7 +87,7 @@ DiscoveryUtils.prototype = {
       params.file = this.isJsonObject(msg.payload) ?
         JSON.stringify(msg.payload) :
         msg.payload;
-      params.file_content_type = 'application/json';
+      params.fileContentType = 'application/json';
     }
     return params;
   },
@@ -100,8 +104,8 @@ DiscoveryUtils.prototype = {
   buildParamsForPassages: function (me, msg, config, params) {
     let passagesFound = false;
 
-    // Allow the passages parameters to be passed in two ways
-    // 1. As the API is expecting
+    // Allow the passages parameters to be passed in three ways
+    // 1. As the API was expecting (watson-developer-cloud)
     ['passages.fields', 'passages.count', 'passages.characters'
     ].forEach(function(f) {
       params = me.buildParamsFor(msg, config, params, f);
@@ -109,6 +113,7 @@ DiscoveryUtils.prototype = {
     });
 
     // 2. As anyone misreading the documentation might do it.
+    // (again watson-developer-cloud)
     if (msg.discoveryparams && msg.discoveryparams.passages) {
       passagesFound = true;
       ['fields', 'count', 'characters'
@@ -119,7 +124,25 @@ DiscoveryUtils.prototype = {
       });
     }
 
+    // 3. As the ibm-watson SDK expects
+    ['passagesFields', 'passagesCount', 'passagesCharacters'
+    ].forEach(function(f) {
+      params = me.buildParamsFor(msg, config, params, f);
+      passagesFound = true;
+    });
+
     if (passagesFound) {
+      // Perform autocorrect for watson-developer-cloud to ibm-watson
+      // differences
+      ['passages.fields', 'passages.count', 'passages.characters'
+      ].forEach(function(f) {
+        if (params[f]) {
+          let parts = f.split(".");
+          let secondPart = parts[1]
+          let reformedField = parts[0] + secondPart[0].toUpperCase() + secondPart.slice(1);
+          params[reformedField] = params[f];
+        }
+      });
       params.passages = true;
     }
 
@@ -149,7 +172,7 @@ DiscoveryUtils.prototype = {
     params = me.buildParamsForName(msg, config, params);
     params = me.buildParamsForQuery(msg, config, params);
 
-    ['environment_id', 'collection_id', 'configuration_id',
+    ['environmentId', 'collectionId', 'configurationId',
       'collection_name', 'language_code',
       'passages', 'description', 'size', 'filename',
       'highlight'
@@ -173,10 +196,10 @@ DiscoveryUtils.prototype = {
   buildMsgOverrides: function(msg, config) {
     var params = {};
     if (config.environment) {
-      params.environment_id = config.environment;
+      params.environmentId = config.environment;
     }
     if (config.collection) {
-      params.collection_id = config.collection;
+      params.collectionId = config.collection;
     }
     if (config.passages) {
       params.passages = config.passages;
@@ -222,7 +245,7 @@ DiscoveryUtils.prototype = {
 
   paramEnvCheck: function(params) {
     var response = '';
-    if (!params.environment_id) {
+    if (!params.environmentId) {
       response = 'Missing Environment ID ';
     }
     return response;
@@ -262,7 +285,7 @@ DiscoveryUtils.prototype = {
 
   paramCollectionCheck: function(params) {
     var response = '';
-    if (!params.collection_id) {
+    if (!params.collectionId) {
       response = 'Missing Collection ID ';
     }
     return response;
@@ -270,7 +293,7 @@ DiscoveryUtils.prototype = {
 
   paramConfigurationCheck: function(params) {
     var response = '';
-    if (!params.configuration_id) {
+    if (!params.configurationId) {
       response = 'Missing Configuration ID ';
     }
     return response;
@@ -311,18 +334,20 @@ DiscoveryUtils.prototype = {
 
     if (schemaData &&
            'object' === typeof schemaData &&
-           schemaData['fields'] &&
-            Array.isArray(schemaData['fields'])) {
-      schemaData['fields'].forEach((f) => {
+           schemaData.result &&
+           'object' === typeof schemaData.result &&
+           schemaData.result['fields'] &&
+            Array.isArray(schemaData.result['fields'])) {
+      schemaData.result['fields'].forEach((f) => {
         if (f['field'] && f['type'] && 'nested' !== f['type']) {
           fields.push(f['field']);
         }
       });
-
     }
 
     if (fields.length) {
       fields = fields.filter(this.uniqueFilter);
+      fields.sort();
     }
 
     return fields;
diff --git a/services/discovery/v1-document-loader.html b/services/discovery/v1-document-loader.html
index 8d333779..cf6e942a 100644
--- a/services/discovery/v1-document-loader.html
+++ b/services/discovery/v1-document-loader.html
@@ -38,22 +38,17 @@
     </div>
 
     <div class="form-row credentials">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
-    </div>
-    <div class="form-row">
         <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
         <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/discovery/api">
     </div>
 
     <div class="form-row">
-        <label for="node-input-environment_id"><i class="fa fa-tag"></i> Environment ID</label>
-        <input type="text" id="node-input-environment_id" placeholder="">
+        <label for="node-input-environmentId"><i class="fa fa-tag"></i> Environment ID</label>
+        <input type="text" id="node-input-environmentId" placeholder="">
     </div>
     <div class="form-row">
-        <label for="node-input-collection_id"><i class="fa fa-tag"></i> Collection ID</label>
-        <input type="text" id="node-input-collection_id" placeholder="">
+        <label for="node-input-collectionId"><i class="fa fa-tag"></i> Collection ID</label>
+        <input type="text" id="node-input-collectionId" placeholder="">
     </div>
     <div class="form-row">
         <label for="node-input-filename"><i class="fa fa-tag"></i> Filename</label>
@@ -69,8 +64,8 @@
     <p>If a filename is not provided then one is automatically generated</p>
     <p>The collection being written to can be overridden by specifying the
     search ids in
-    <code>msg.discoveryparams.environment_id</code>
-    , <code>msg.discoveryparams.collection_id</code>
+    <code>msg.discoveryparams.environmentId</code>
+    , <code>msg.discoveryparams.collectionId</code>
     and <code>msg.discoveryparams.filename</code>
     </p>
     <p>The document to be added should be passed in as a data buffer
@@ -91,14 +86,6 @@
     var disdocV1 = new DiscoveryDocLoaderV1();
 
     disdocV1.UIListeners = function () {
-      $('input#node-input-default-endpoint').change(function () {
-          var checked = $('input#node-input-default-endpoint').prop('checked')
-          if (checked) {
-              $('#node-input-service-endpoint').parent().hide();
-          } else {
-              $('#node-input-service-endpoint').parent().show();
-          }
-      });
     }
 
     disdocV1.checkForPrepare = function () {
@@ -124,11 +111,10 @@
             category: 'IBM Watson',
             defaults: {
                 name: {value: ''},
-                environment_id: {value: ''},
-                collection_id: {value: ''},
+                environmentId: {value: ''},
+                collectionId: {value: ''},
                 filename: {value: ''},
-                'default-endpoint' :{value: true},
-                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/discovery/api'}
+                'service-endpoint' :{value: ''}
             },
             credentials: {
               username: {type:'text'},
diff --git a/services/discovery/v1-document-loader.js b/services/discovery/v1-document-loader.js
index aa8fed5b..2182bdb1 100644
--- a/services/discovery/v1-document-loader.js
+++ b/services/discovery/v1-document-loader.js
@@ -69,14 +69,18 @@ module.exports = function (RED) {
   function determineSuffix(msg) {
     // Let's assume that if we can't determine the suffix that
     // its a word doc.
-    var ext = '.json',
-      ft = fileType(msg.payload);
+    let ext = '.json';
+    if (! discoveryutils.isJsonObject(msg.payload)) {
+      let ext = '.json',
+        ft = fileType(msg.payload);
 
-    if (ft && ft.ext) {
-      ext = '.' + ft.ext;
-    }
-    if (isDocx(msg.payload)) {
-      ext = '.docx';
+      if (ft && ft.ext) {
+        ext = '.' + ft.ext;
+      }
+
+      if (isDocx(msg.payload)) {
+        ext = '.docx';
+      }
     }
 
     return Promise.resolve(ext);
@@ -131,20 +135,22 @@ module.exports = function (RED) {
       // modify as getting addJsonDocument will be deprecated messages
       if ('.json' === suffix) {
         //method = 'addJsonDocument';
-        params.file = JSON.stringify(params.file);
+        //params.file = JSON.stringify(params.file);
+
+        params.file = Buffer.from(JSON.stringify(params.file));
       //} else {
         //method = 'addDocument';
       }
       method = 'addDocument';
 
-      discovery[method](params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.document = response.document ? response.document : response;
+      discovery[method](params)
+        .then((response) => {
+          msg.document = response.result ? response.result : response;
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
 
     });
     return p;
@@ -166,7 +172,7 @@ module.exports = function (RED) {
     var node = this;
     RED.nodes.createNode(this, config);
 
-    this.on('input', function (msg) {
+    this.on('input', function(msg, send, done) {
       var message = '',
         fileInfo = '',
         fileSuffix = '',
@@ -177,7 +183,7 @@ module.exports = function (RED) {
       apikey = sApikey || this.credentials.apikey;
 
       endpoint = sEndpoint;
-      if ((!config['default-endpoint']) && config['service-endpoint']) {
+      if (config['service-endpoint']) {
         endpoint = config['service-endpoint'];
       }
 
@@ -223,12 +229,13 @@ module.exports = function (RED) {
         .then(function(){
           temp.cleanup();
           node.status({});
-          node.send(msg);
+          send(msg);
+          done();
         })
         .catch(function(err){
           temp.cleanup();
-          payloadutils.reportError(node,msg,err);
-          node.send(msg);
+          let errMsg = payloadutils.reportError(node, msg, err);
+          done(errMsg);
         });
     });
   }
diff --git a/services/discovery/v1-query-builder.html b/services/discovery/v1-query-builder.html
index 84d8c4f5..902c5225 100644
--- a/services/discovery/v1-query-builder.html
+++ b/services/discovery/v1-query-builder.html
@@ -54,11 +54,6 @@
     </div>
 
     <div class="form-row credentials">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
-    </div>
-    <div class="form-row">
         <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
         <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/discovery/api">
     </div>
@@ -275,15 +270,6 @@
           }
       });
 
-      $('input#node-input-default-endpoint').change(function () {
-          var checked = $('input#node-input-default-endpoint').prop('checked')
-          if (checked) {
-              $('#node-input-service-endpoint').parent().hide();
-          } else {
-              $('#node-input-service-endpoint').parent().show();
-          }
-      });
-
     }
 
     // The dialog is about to be shown.
@@ -458,10 +444,8 @@
       var k = $('#node-input-apikey').val();
 
       var creds = {un: u, pwd: p, key: k};
-      var eChecked = $('input#node-input-default-endpoint').prop('checked')
-      if (!eChecked) {
-        creds.endpoint = $('#node-input-service-endpoint').val();
-      }
+
+      creds.endpoint = $('#node-input-service-endpoint').val();
 
       $.getJSON('watson-discovery-v1-query-builder/environments', creds
       ).done(function (data) {
@@ -496,10 +480,9 @@
       var k = $('#node-input-apikey').val();
 
       var creds = {un: u, pwd: p, key: k};
-      var eChecked = $('input#node-input-default-endpoint').prop('checked')
-      if (!eChecked) {
-        creds.endpoint = $('#node-input-service-endpoint').val();
-      }
+
+      creds.endpoint = $('#node-input-service-endpoint').val();
+
       creds.environment_id = disQB.environment_selected;
 
       $.getJSON('watson-discovery-v1-query-builder/collections', creds
@@ -533,10 +516,9 @@
       var k = $('#node-input-apikey').val();
 
       var creds = {un: u, pwd: p, key: k};
-      var eChecked = $('input#node-input-default-endpoint').prop('checked')
-      if (!eChecked) {
-        creds.endpoint = $('#node-input-service-endpoint').val();
-      }
+
+      creds.endpoint = $('#node-input-service-endpoint').val();
+
       creds.environment_id = disQB.environment_selected;
       creds.collection_id = disQB.collection_selected;
 
@@ -731,8 +713,7 @@
                 queryvalue3hidden: {value: ''},
                 passages: {value: false},
                 passageshidden: {value: false},
-                'default-endpoint' :{value: true},
-                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/discovery/api'}
+                'service-endpoint' :{value: ''}
 
             },
             credentials: {
diff --git a/services/discovery/v1-query-builder.js b/services/discovery/v1-query-builder.js
index e23431ca..ec4933ff 100644
--- a/services/discovery/v1-query-builder.js
+++ b/services/discovery/v1-query-builder.js
@@ -37,6 +37,20 @@ module.exports = function(RED) {
     res.json(serviceutils.checkServiceBound(SERVICE_IDENTIFIER));
   });
 
+  function processResponse(response, field) {
+    let reply = response;
+    if (response) {
+      if (response.result) {
+        if (response.result[field]) {
+          reply = response.result[field];
+        } else {
+          reply = response.result;
+        }
+      }
+    }
+    return reply;
+  }
+
   // API used by widget to fetch available environments
   RED.httpAdmin.get('/watson-discovery-v1-query-builder/environments', function(req, res) {
 
@@ -45,13 +59,13 @@ module.exports = function(RED) {
                                          sApikey ? sApikey : req.query.key,
                                          req.query.endpoint ? req.query.endpoint : sEndpoint);
 
-    discovery.listEnvironments({}, function(err, response) {
-      if (err) {
+    discovery.listEnvironments({})
+      .then((response) => {
+        res.json(processResponse(response,'environments'));
+      })
+      .catch((err) => {
         res.json(err);
-      } else {
-        res.json(response.environments ? response.environments : response);
-      }
-    });
+      });
   });
 
   // API used by widget to fetch available collections in environment
@@ -61,17 +75,13 @@ module.exports = function(RED) {
                                          sApikey ? sApikey : req.query.key,
                                          req.query.endpoint ? req.query.endpoint : sEndpoint);
 
-    discovery.listCollections({
-      environment_id: req.query.environment_id
-    },
-      function(err, response) {
-        if (err) {
-          res.json(err);
-        } else {
-          res.json(response.collections ? response.collections : response);
-        }
-      }
-    );
+    discovery.listCollections({environmentId: req.query.environment_id})
+      .then((response) => {
+        res.json(processResponse(response,'collections'));
+      })
+      .catch((err) => {
+        res.json(err);
+      });
   });
 
 
@@ -83,18 +93,17 @@ module.exports = function(RED) {
                                          req.query.endpoint ? req.query.endpoint : sEndpoint);
 
     discovery.listCollectionFields({
-      environment_id: req.query.environment_id,
-      collection_id: req.query.collection_id
-    },
-      function(err, response) {
-        if (err) {
-          res.json(err);
-        } else {
-          var fieldList = discoveryutils.buildFieldList(response);
-          res.json(fieldList);
-        }
-      }
-    );
+      environmentId: req.query.environment_id,
+      collectionId: req.query.collection_id
+    })
+      .then((response) => {
+        let fieldList = discoveryutils.buildFieldList(response);
+        res.json(fieldList);
+      })
+      .catch((err) => {
+        res.json(err);
+      });
+
   });
 
   function Node(config) {
diff --git a/services/discovery/v1.html b/services/discovery/v1.html
index de6ad1c0..d26e6fa2 100644
--- a/services/discovery/v1.html
+++ b/services/discovery/v1.html
@@ -38,11 +38,6 @@
     </div>
 
     <div class="form-row credentials">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
-    </div>
-    <div class="form-row">
         <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
         <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/discovery/api">
     </div>
@@ -66,6 +61,10 @@
             <option value="createConfiguration">Create new configuration</option>
             <option value="listConfigurations">List existing configurations</option>
             <option value="getConfigurationDetails">Retrieve configuration details</option>
+            <option value="deleteConfiguration">Delete configuration</option>
+            <option disabled>______________</option>
+            <option value="listExpansions">Get expansion list for collection.</option>
+            <option value="listTrainingData">Get training data for collection.</option>
         </select>
     </div>
 
@@ -74,24 +73,24 @@
         <input type="text" id="node-input-environmentname" placeholder="">
     </div>
     <div class="form-row">
-        <label for="node-input-environment_id"><i class="fa fa-tag"></i> Environment ID</label>
-        <input type="text" id="node-input-environment_id" placeholder="">
+        <label for="node-input-environmentId"><i class="fa fa-tag"></i> Environment ID</label>
+        <input type="text" id="node-input-environmentId" placeholder="">
     </div>
     <div class="form-row">
         <label for="node-input-collection_name"><i class="fa fa-tag"></i> Collection Name</label>
         <input type="text" id="node-input-collection_name" placeholder="">
     </div>
     <div class="form-row">
-        <label for="node-input-collection_id"><i class="fa fa-tag"></i> Collection ID</label>
-        <input type="text" id="node-input-collection_id" placeholder="">
+        <label for="node-input-collectionId"><i class="fa fa-tag"></i> Collection ID</label>
+        <input type="text" id="node-input-collectionId" placeholder="">
     </div>
     <div class="form-row">
         <label for="node-input-configurationname"><i class="fa fa-tag"></i> Configuration Name</label>
         <input type="text" id="node-input-configurationname" placeholder="">
     </div>
     <div class="form-row">
-        <label for="node-input-configuration_id"><i class="fa fa-tag"></i> Configuration ID</label>
-        <input type="text" id="node-input-configuration_id" placeholder="">
+        <label for="node-input-configurationId"><i class="fa fa-tag"></i> Configuration ID</label>
+        <input type="text" id="node-input-configurationId" placeholder="">
     </div>
 
     <div class="form-row">
@@ -208,7 +207,7 @@
             <p>For this method the node needs an Environment ID as input.
             </p>
             <p>The environment being requested can be overridden by specifying the search id
-      in <code>msg.discoveryparams.environment_id</code>
+      in <code>msg.discoveryparams.environmentId</code>
             </p>
             <p>Node output : </p>
               <ul>
@@ -221,10 +220,10 @@
             Description, Configuration ID and Language Code as input.
             </p>
             <p>The fields can be overridden by specifying
-              in <code>msg.discoveryparams.environment_id</code>
+              in <code>msg.discoveryparams.environmentId</code>
               , <code>msg.discoveryparams.collection_name</code>
               , <code>msg.discoveryparams.description</code>
-              , <code>msg.discoveryparams.configuration_id</code>
+              , <code>msg.discoveryparams.configurationId</code>
               and <code>msg.discoveryparams.language_code</code>
             </p>
 
@@ -239,7 +238,7 @@
             <p><b>List Existing Collections</b><p>
             <p>For this method the node needs an Environment ID as input.</p>
             <p>The Environment ID for the collection list being requested can be overridden by specifying the search id
-      in <code>msg.discoveryparams.environment_id</code>
+      in <code>msg.discoveryparams.environmentId</code>
             </p>
             <p>Node output : </p>
               <ul>
@@ -254,8 +253,8 @@
             </p>
             <p>The collection being requested can be overridden by specifying the
             search ids in
-            <code>msg.discoveryparams.environment_id</code>
-            and <code>msg.discoveryparams.collection_id</code>
+            <code>msg.discoveryparams.environmentId</code>
+            and <code>msg.discoveryparams.collectionId</code>
             </p>
             <p>Node output : </p>
               <ul>
@@ -270,7 +269,7 @@
                configuration with the given name.</p>
             <p>The Environment ID for the configuration list being requested can be
                overridden by specifying the environment id in
-               <code>msg.discoveryparams.environment_id</code>
+               <code>msg.discoveryparams.environmentId</code>
                The configuration name can be overridden by specifying the name inspect
                <code>msg.discoveryparams.configuration_name</code>
             </p>
@@ -288,9 +287,9 @@
             <p>The Environment and Configuration IDs for the configuration being
                requested can be
                overridden by specifying the environment id in
-               <code>msg.discoveryparams.environment_id</code>
+               <code>msg.discoveryparams.environmentId</code>
                and the configuration id in
-               <code>msg.discoveryparams.configuration_id</code>
+               <code>msg.discoveryparams.configurationId</code>
             </p>
             <p>Node output : </p>
               <ul>
@@ -299,14 +298,58 @@
               </ul>
         </li>
         <br/>
+        <li>
+            <p><b>Delete Configuration</b><p>
+            <p>For this method node needs an Environment ID and Configuration ID as input.</p>
+            <p>The Environment and Configuration IDs for the configuration being
+               deleted can be
+               overridden by specifying the environment id in
+               <code>msg.discoveryparams.environmentId</code>
+               and the configuration id in
+               <code>msg.discoveryparams.configurationId</code>
+            </p>
+            <p>Node output : </p>
+              <ul>
+                <li><code>msg.configuration</code> : Details the
+                  deleted configuration.</li>
+              </ul>
+        </li>
+        <br/>
+        <li>
+            <p><b>List Expansions</b><p>
+            <p>For this method the node needs an Environment ID and Collection ID as input.</p>
+            <p>The Environment ID, and Collection ID for the collection list being requested can be overridden by specifying the search id
+      in <code>msg.discoveryparams.environmentId</code>
+      and in <code>msg.discoveryparams.collectionId</code>
+            </p>
+            <p>Node output : </p>
+              <ul>
+                <li><code>msg.expansions</code> : The current expansion list for the specified collection.
+                  If an expansion list is not specified, an object with empty expansion arrays is returned.</li>
+              </ul>
+        </li>
+        <br/>
+        <li>
+            <p><b>List Training Data</b><p>
+            <p>For this method the node needs an Environment ID and Collection ID as input.</p>
+            <p>The Environment ID, and Collection ID for the collection list being requested can be overridden by specifying the search id
+      in <code>msg.discoveryparams.environmentId</code>
+      and in <code>msg.discoveryparams.collectionId</code>
+            </p>
+            <p>Node output : </p>
+              <ul>
+                <li><code>msg.trainingData</code> : Lists the training data for the specified collection</li>
+              </ul>
+        </li>
+        <br/>
         <li>
             <p><b>Search in Collection</b><p>
             <p>For this method the node needs an Environment ID and Collection ID as input.
             </p>
             <p>The collection being requested can be overridden by specifying the
             search ids in
-            <code>msg.discoveryparams.environment_id</code>
-            and <code>msg.discoveryparams.collection_id</code>
+            <code>msg.discoveryparams.environmentId</code>
+            and <code>msg.discoveryparams.collectionId</code>
             </p>
             <p>Optionally you can specify the number of documents to retrieve, a
                query to find the most relevant search results, whether to
@@ -351,11 +394,11 @@
     //disV1.abc = 'abc';
     disV1.hideAll = function() {
       $('#node-input-environmentname').parent().hide();
-      $('#node-input-environment_id').parent().hide();
+      $('#node-input-environmentId').parent().hide();
       $('#node-input-collection_name').parent().hide();
-      $('#node-input-collection_id').parent().hide();
+      $('#node-input-collectionId').parent().hide();
       $('#node-input-configurationname').parent().hide();
-      $('#node-input-configuration_id').parent().hide();
+      $('#node-input-configurationId').parent().hide();
       $('#node-input-language_code').parent().hide();
       $('#node-input-count').parent().hide();
       $('#node-input-passages').parent().hide();
@@ -387,35 +430,38 @@
           fields.push('#node-input-environmentname');
           break;
         case 'createCollection':
-          fields.push('#node-input-environment_id'
-                          + ', #node-input-configuration_id'
+          fields.push('#node-input-environmentId'
+                          + ', #node-input-configurationId'
                           + ', #node-input-language_code'
                           + ', #node-input-collection_name'
                           + ', #node-input-description');
           break;
-        case 'createConfiguration':
+        case 'listConfigurations':
         case 'getEnvironmentDetails':
         case 'listCollections':
         case 'deleteEnvironment':
-          fields.push('#node-input-environment_id');
+          fields.push('#node-input-environmentId');
           break;
         case 'getCollectionDetails':
         case 'deleteCollection':
-          fields.push('#node-input-environment_id'
-                          + ', #node-input-collection_id');
+        case 'listExpansions':
+        case 'listTrainingData':
+          fields.push('#node-input-environmentId'
+                          + ', #node-input-collectionId');
           break;
-        case 'listConfigurations':
-          fields.push('#node-input-environment_id'
+        case 'createConfiguration':
+          fields.push('#node-input-environmentId'
                           + ', #node-input-configurationname');
           break;
         case 'getConfigurationDetails':
-          fields.push('#node-input-environment_id'
-                         + ', #node-input-configuration_id');
+        case 'deleteConfiguration':
+          fields.push('#node-input-environmentId'
+                         + ', #node-input-configurationId');
           break;
         case 'query':
-        case 'queryNotices':        
-          fields.push('#node-input-environment_id'
-                         + ', #node-input-collection_id'
+        case 'queryNotices':
+          fields.push('#node-input-environmentId'
+                         + ', #node-input-collectionId'
                          + ', #node-input-count'
                          + ', #node-input-passages'
                          + ', #node-input-nlp_query'
@@ -433,15 +479,6 @@
         var method = $('#node-input-discovery-method').val();
         disV1.processSelectedMethod(method);
       });
-
-      $('input#node-input-default-endpoint').change(function () {
-          var checked = $('input#node-input-default-endpoint').prop('checked')
-          if (checked) {
-              $('#node-input-service-endpoint').parent().hide();
-          } else {
-              $('#node-input-service-endpoint').parent().show();
-          }
-      });
     }
 
     disV1.checkForPrepare = function () {
@@ -469,10 +506,10 @@
             defaults: {
                 name: {value: ''},
                 environmentname: {value: ''},
-                environment_id: {value: ''},
-                collection_id: {value: ''},
+                environmentId: {value: ''},
+                collectionId: {value: ''},
                 configurationname: {value: ''},
-                configuration_id: {value: ''},
+                configurationId: {value: ''},
                 language_code: {value: 'en'},
                 collection_name: {value: ''},
                 count: {value: '1'},
@@ -485,8 +522,7 @@
                 description: {value: ''},
                 size: {value: 'LT'},
                 'discovery-method': {value:'query'},
-                'default-endpoint' :{value: true},
-                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/discovery/api'}
+                'service-endpoint' :{value: ''}
             },
             credentials: {
               username: {type:'text'},
diff --git a/services/discovery/v1.js b/services/discovery/v1.js
index 86fdc0d9..0232bcc6 100644
--- a/services/discovery/v1.js
+++ b/services/discovery/v1.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 20016 IBM Corp.
+ * Copyright 2016, 2020 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the 'License');
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ module.exports = function (RED) {
   var discoveryutils = require('./discovery-utils'),
     serviceutils = require('../../utilities/service-utils'),
     payloadutils = require('../../utilities/payload-utils'),
+    responseutils = require('../../utilities/response-utils'),
     dservice = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
     username = null,
     password = null,
@@ -30,6 +31,25 @@ module.exports = function (RED) {
     endpoint = '',
     sEndpoint = 'https://gateway.watsonplatform.net/discovery/api';
 
+const ExecutionList = {
+  'createEnvrionment': executeCreateEnvrionment,
+  'listEnvrionments': executeListEnvrionments,
+  'getEnvironmentDetails': executeEnvrionmentDetails,
+  'createCollection': executeCreateCollection,
+  'listCollections': executeListCollections,
+  'getCollectionDetails': executeGetCollectionDetails,
+  'deleteCollection': executeDeleteCollection,
+  'createConfiguration': executeCreateConfiguration,
+  'listConfigurations': executeListConfigurations,
+  'getConfigurationDetails': executeGetConfigurationDetails,
+  'deleteConfiguration': executeDeleteConfiguration,
+  'deleteEnvironment': executeDeleteEnvironment,
+  'listExpansions': executeListExpansions,
+  'listTrainingData': executeListTrainingData,
+  'query': executeQuery,
+  'queryNotices': executeQueryNotices
+};
+
 
   function checkParams(method, params){
     var response = '';
@@ -39,7 +59,8 @@ module.exports = function (RED) {
             discoveryutils.paramDescriptionCheck(params);
       break;
     case 'createConfiguration':
-      response = discoveryutils.paramEnvCheck(params) +
+      response = discoveryutils.paramNameCheck(params) +
+          discoveryutils.paramEnvCheck(params) +
           discoveryutils.paramJSONCheck(params);
       break;
     case 'getEnvironmentDetails':
@@ -49,6 +70,8 @@ module.exports = function (RED) {
     case 'getCollectionDetails':
     case 'query':
     case 'queryNotices':
+    case 'listExpansions':
+    case 'listTrainingData':
       response = discoveryutils.paramEnvCheck(params) +
              discoveryutils.paramCollectionCheck(params);
       break;
@@ -69,42 +92,45 @@ module.exports = function (RED) {
 
   function executeCreateEnvrionment(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.createEnvironment(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.environment = response.environment ? response.environment : response;
+      discovery.createEnvironment(params)
+        .then((response) => {
+          msg.environment = response.result ? response.result : response;
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
     return p;
   }
 
   function executeListEnvrionments(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.listEnvironments(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.environments = response.environments ? response.environments : [];
+      discovery.listEnvironments(params)
+        .then((response) => {
+          responseutils.parseResponseFor(msg, response, 'environments');
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
     return p;
   }
 
   function executeEnvrionmentDetails(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.getEnvironment(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
+      discovery.getEnvironment(params)
+        .then((response) => {
           msg.environment_details = response;
+          if (response && response.result) {
+            msg.environment_details = response.result;
+          }
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
     return p;
   }
@@ -119,13 +145,13 @@ module.exports = function (RED) {
       //  //delete params[f];
       //});
 
-      discovery.createCollection(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.collection = response.collection ? response.collection : response;
-          resolve();
-        }
+      discovery.createCollection(params)
+      .then((response) => {
+        msg.collection = response.result ? response.result : response;
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
@@ -133,27 +159,42 @@ module.exports = function (RED) {
 
   function executeDeleteCollection(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.deleteCollection(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.collection = response.collection ? response.collection : response;
-          resolve();
-        }
+      discovery.deleteCollection(params)
+      .then((response) => {
+        msg.collection = response.result ? response.result : response;
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
   }
 
+  function executeDeleteConfiguration(node, discovery, params, msg) {
+    var p = new Promise(function resolver(resolve, reject){
+      discovery.deleteConfiguration(params)
+      .then((response) => {
+        msg.configuration = response.result ? response.result : response;
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
+      });
+    });
+    return p;
+  }
+
+
   function executeDeleteEnvironment(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.deleteEnvironment(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.environment = response.environment ? response.environment : response;
-          resolve();
-        }
+      discovery.deleteEnvironment(params)
+      .then((response) => {
+        msg.environment = response.result ? response.result : response;
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
@@ -161,13 +202,13 @@ module.exports = function (RED) {
 
   function executeListCollections(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.listCollections(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.collections = response.collections ? response.collections : [];
-          resolve();
-        }
+      discovery.listCollections(params)
+      .then((response) => {
+        responseutils.parseResponseFor(msg, response, 'collections');
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
@@ -175,27 +216,56 @@ module.exports = function (RED) {
 
   function executeGetCollectionDetails(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.getCollection(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.collection_details = response;
-          resolve();
-        }
+      discovery.getCollection(params)
+      .then((response) => {
+        msg.collection_details = response.result ? response.result : response;
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
+      });
+    });
+    return p;
+  }
+
+  function executeListExpansions(node, discovery, params, msg) {
+    var p = new Promise(function resolver(resolve, reject){
+      discovery.listExpansions(params)
+      .then((response) => {
+        responseutils.parseResponseFor(msg, response, 'expansions');
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
   }
 
+  function executeListTrainingData(node, discovery, params, msg) {
+    var p = new Promise(function resolver(resolve, reject){
+      discovery.listTrainingData(params)
+      .then((response) => {
+        msg.trainingData = response.result ? response.result : response;
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
+      });
+    });
+    return p;
+  }
+
+
   function executeCreateConfiguration(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.createConfiguration(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.configuration = response.configuration ? response.configuration : response;
-          resolve();
-        }
+      discovery.createConfiguration(params)
+      .then((response) => {
+        msg.configuration = response.result ? response.result : response;
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
@@ -203,13 +273,13 @@ module.exports = function (RED) {
 
   function executeListConfigurations(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.listConfigurations(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.configurations = response.configurations ? response.configurations : [];
-          resolve();
-        }
+      discovery.listConfigurations(params)
+      .then((response) => {
+        responseutils.parseResponseFor(msg, response, 'configurations');
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
@@ -217,13 +287,13 @@ module.exports = function (RED) {
 
   function executeGetConfigurationDetails(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.getConfiguration(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.configuration_details = response;
-          resolve();
-        }
+      discovery.getConfiguration(params)
+      .then((response) => {
+        msg.configuration_details = response.result ? response.result : response;
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
@@ -231,27 +301,33 @@ module.exports = function (RED) {
 
   function executeQuery(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.query(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
+      discovery.query(params)
+        .then((response) => {
           msg.search_results = response;
+          if (response && response.result) {
+            msg.search_results = response.result;
+          }
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
     });
     return p;
   }
 
   function executeQueryNotices(node, discovery, params, msg) {
     var p = new Promise(function resolver(resolve, reject){
-      discovery.queryNotices(params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.search_results = response;
-          resolve();
+      discovery.queryNotices(params)
+      .then((response) => {
+        msg.search_results = response;
+        if (response && response.result) {
+          msg.search_results = response.result;
         }
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
       });
     });
     return p;
@@ -263,53 +339,13 @@ module.exports = function (RED) {
 
   function executeMethod(node, method, params, msg) {
     let discovery = discoveryutils.buildService(username, password, apikey, endpoint);
-    var p = null;
 
-    switch (method) {
-    case 'createEnvrionment':
-      p = executeCreateEnvrionment(node, discovery, params, msg);
-      break;
-    case 'listEnvrionments':
-      p = executeListEnvrionments(node, discovery, params, msg);
-      break;
-    case 'getEnvironmentDetails':
-      p = executeEnvrionmentDetails(node, discovery, params, msg);
-      break;
-    case 'createCollection':
-      p = executeCreateCollection(node, discovery, params, msg);
-      break;
-    case 'listCollections':
-      p = executeListCollections(node, discovery, params, msg);
-      break;
-    case 'getCollectionDetails':
-      p = executeGetCollectionDetails(node, discovery, params, msg);
-      break;
-    case 'deleteCollection':
-      p = executeDeleteCollection(node, discovery, params, msg);
-      break;
-    case 'createConfiguration':
-      p = executeCreateConfiguration(node, discovery, params, msg);
-      break;
-    case 'listConfigurations':
-      p = executeListConfigurations(node, discovery, params, msg);
-      break;
-    case 'getConfigurationDetails':
-      p = executeGetConfigurationDetails(node, discovery, params, msg);
-      break;
-    case 'deleteEnvironment':
-      p = executeDeleteEnvironment(node, discovery, params, msg);
-      break;
-    case 'query':
-      p = executeQuery(node, discovery, params, msg);
-      break;
-    case 'queryNotices':
-      p = executeQueryNotices(node, discovery, params, msg);
-      break;
-    default :
-      p = unknownMethod(node, discovery, params, msg);
-      break;
+    let exe = ExecutionList[method];
+    if (!exe) {
+      exe = unknownMethod
     }
-    return p;
+
+    return exe(node, discovery, params, msg);
   }
 
   function initialCheck(u, p, k, m) {
@@ -341,7 +377,7 @@ module.exports = function (RED) {
     var node = this;
     RED.nodes.createNode(this, config);
 
-    this.on('input', function (msg) {
+    this.on('input', function(msg, send, done) {
       var method = config['discovery-method'],
         message = '',
         params = {};
@@ -351,7 +387,7 @@ module.exports = function (RED) {
       apikey = sApikey || this.credentials.apikey;
 
       endpoint = sEndpoint;
-      if ((!config['default-endpoint']) && config['service-endpoint']) {
+      if (config['service-endpoint']) {
         endpoint = config['service-endpoint'];
       }
 
@@ -367,12 +403,12 @@ module.exports = function (RED) {
         })
         .then(function(){
           node.status({});
-          node.send(msg);
+          send(msg);
+          done();
         })
         .catch(function(err){
-          //discoveryutils.reportError(node,msg,err);
-          payloadutils.reportError(node,msg,err);
-          node.send(msg);
+          let errMsg = payloadutils.reportError(node, msg, err);
+          done(errMsg);
         });
     });
   }
diff --git a/services/language_translator/v3-doc.html b/services/language_translator/v3-doc.html
index 1b74bcca..f96d9abc 100644
--- a/services/language_translator/v3-doc.html
+++ b/services/language_translator/v3-doc.html
@@ -47,11 +47,6 @@
     </div>
 
     <div class="form-row credentials">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
-    </div>
-    <div class="form-row">
         <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
         <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/language-translator/api">
     </div>
@@ -335,15 +330,6 @@
         doctor.checkActionSelected();
       });
 
-      $('#node-input-default-endpoint').change(() => {
-        var checked = $('#node-input-default-endpoint').prop('checked')
-        if (checked) {
-          $('#node-input-service-endpoint').parent().hide();
-        } else {
-          $('#node-input-service-endpoint').parent().show();
-        }
-      });
-
       $('#node-input-srclang').change(function () {
         doctor.srclang_selected = $('#node-input-srclang').val();
         if (doctor.models) {
@@ -400,9 +386,7 @@
           var e = $('#node-input-service-endpoint').val();
           var creds = {un: u, pwd: p, key: k};
 
-          if (! $('#node-input-default-endpoint').prop('checked')) {
-            creds.e = e;
-          }
+          creds.e = e;
 
           $.getJSON('watson-doc-translator/models/', creds)
           .done(function (data) {
@@ -541,8 +525,7 @@
                 destlanghidden: {value: ''},
                 filename: {value: ''},
                 'document-id': {value: ''},
-                'default-endpoint' :{value: true},
-                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/language-translator/api'}
+                'service-endpoint' :{value: ''}
             },
             credentials: {
                 username: {type: 'text'}
diff --git a/services/language_translator/v3-doc.js b/services/language_translator/v3-doc.js
index 4679a525..20aa2ed3 100644
--- a/services/language_translator/v3-doc.js
+++ b/services/language_translator/v3-doc.js
@@ -17,10 +17,11 @@
 module.exports = function (RED) {
   const request = require('request'),
     SERVICE_IDENTIFIER = 'language-translator',
-    SERVICE_VERSION = '2018-05-01';
+    SERVICE_VERSION = '2018-05-01',
+    LanguageTranslatorV3 = require('ibm-watson/language-translator/v3'),
+    { IamAuthenticator } = require('ibm-watson/auth');
 
   var pkg = require('../../package.json'),
-    LanguageTranslatorV3 = require('watson-developer-cloud/language-translator/v3'),
     fs = require('fs'),
     fileType = require('file-type'),
     temp = require('temp'),
@@ -54,6 +55,7 @@ module.exports = function (RED) {
   RED.httpAdmin.get('/watson-doc-translator/models', function (req, res) {
     endpoint = req.query.e ? req.query.e : sEndpoint;
     var lt = null,
+      authSettings = {},
       serviceSettings = {
         version: SERVICE_VERSION,
         url: endpoint,
@@ -63,24 +65,28 @@ module.exports = function (RED) {
       };
 
     if (sApikey || req.query.key) {
-      serviceSettings.iam_apikey = sApikey ? sApikey : req.query.key;
+      authSettings.apikey = sApikey ? sApikey : req.query.key;
     } else {
-      serviceSettings.username = sUsername ? sUsername : req.query.un;
-      serviceSettings.password = sPassword ? sPassword : req.query.pwd;
+      authSettings.username = sUsername ? sUsername : req.query.un;
+      authSettings.password = sPassword ? sPassword : req.query.pwd;
     }
+    serviceSettings.authenticator = new IamAuthenticator(authSettings);
 
     lt = new LanguageTranslatorV3(serviceSettings);
 
-    lt.listModels({}, function (err, models) {
-      if (err) {
-        res.json(err);
-      } else {
+    lt.listModels({})
+      .then((response) => {
+        let models = [];
+        if (response && response.result && response.result.models) {
+          models = response.result;
+        }
         res.json(models);
-      }
-    });
+      })
+      .catch((err) => {
+        res.json(err);
+      });
   });
 
-
   function Node (config) {
     var node = this;
     RED.nodes.createNode(this, config);
@@ -144,6 +150,30 @@ module.exports = function (RED) {
       return Promise.resolve();
     }
 
+    function getService() {
+      let authSettings = {},
+        serviceSettings = {
+          version: '2018-05-01',
+          headers: {
+            'User-Agent': pkg.name + '-' + pkg.version
+          }
+        };
+
+      if (apikey) {
+        authSettings.apikey = apikey;
+      } else {
+        authSettings.username = username;
+        authSettings.password = password;
+      }
+      serviceSettings.authenticator = new IamAuthenticator(authSettings);
+
+      if (endpoint) {
+        serviceSettings.url = endpoint;
+      }
+
+      return new LanguageTranslatorV3(serviceSettings);
+    }
+
 
     function buildAuthSettings () {
       var authSettings = {};
@@ -186,7 +216,6 @@ module.exports = function (RED) {
               reject('Document not found ' + response.statusCode);
               break;
             default:
-              console.log(body);
               reject('Error Invoking API ' + response.statusCode);
               break;
             }
@@ -324,10 +353,25 @@ module.exports = function (RED) {
     }
 
     function executeGetDocument(msg) {
-      var docid = docID(msg);
-      let uriAddress = `${endpoint}/v3/documents/${docid}/translated_document?version=${SERVICE_VERSION}`;
-
-      return executeGetRequest(uriAddress);
+      return new Promise(function resolver(resolve, reject){
+        let lt = getService(),
+          docid = docID(msg);
+
+        lt.getTranslatedDocument({documentId : docid})
+          .then((response) => {
+            msg.payload = response;
+            if (response && response.result) {
+              msg.payload = response.result;
+            }
+            return payloadutils.checkForStream(msg);
+          })
+          .then(() => {
+            resolve(msg.payload);
+          })
+          .catch((err) => {
+            reject(err);
+          });
+      });
     }
 
     function executeDeleteDocument(msg) {
@@ -416,7 +460,7 @@ module.exports = function (RED) {
       return Promise.resolve();
     }
 
-    function doit(msg) {
+    function doit(msg, send) {
       let action = msg.action || config.action;
 
       translatorutils.credentialCheck(username, password, apikey)
@@ -440,16 +484,16 @@ module.exports = function (RED) {
         .then(function(){
           temp.cleanup();
           node.status({});
-          node.send(msg);
+          send(msg);
         })
         .catch(function(err){
           temp.cleanup();
           payloadutils.reportError(node, msg, err);
-          node.send(msg);
+          send(msg);
         });
     }
 
-    this.on('input', function (msg) {
+    this.on('input', function(msg, send, done) {
       // The dynamic nature of this node has caused problems with the password field. it is
       // hidden but not a credential. If it is treated as a credential, it gets lost when there
       // is a request to refresh the model list.
@@ -459,7 +503,7 @@ module.exports = function (RED) {
       apikey = sApikey || this.credentials.apikey || config.apikey;
 
       endpoint = sEndpoint;
-      if ((!config['default-endpoint']) && config['service-endpoint']) {
+      if (config['service-endpoint']) {
         endpoint = config['service-endpoint'];
       }
 
@@ -476,12 +520,13 @@ module.exports = function (RED) {
             pos = i+1;
           node.status({ fill: 'blue', shape: 'dot', text: `Processing document ${pos} of ${len}` });
           msgClone.payload = e;
-          doit(msgClone);
+          doit(msgClone, send);
         });
 
       } else {
-        doit(msg);
+        doit(msg, send);
       }
+      done();
     });
   }
 
diff --git a/services/natural_language_classifier/v1.js b/services/natural_language_classifier/v1.js
index 495df2d7..4af2155c 100644
--- a/services/natural_language_classifier/v1.js
+++ b/services/natural_language_classifier/v1.js
@@ -192,7 +192,8 @@ module.exports = function(RED) {
           language : config.language
         };
 
-        params.trainingMetadata = JSON.stringify(meta);
+        params.trainingMetadata = Buffer.from(JSON.stringify(meta));
+
         //params.trainingMetadata = meta;
 
         if ('string' === typeof msg.payload) {
diff --git a/utilities/response-utils.js b/utilities/response-utils.js
index aeb81731..0085d319 100644
--- a/utilities/response-utils.js
+++ b/utilities/response-utils.js
@@ -37,6 +37,15 @@ class ResponseUtils {
     }
   }
 
+  static assignResultToField(msg, response, field) {
+    if (response && response.result) {
+        msg[field] = response.result;
+    } else {
+      msg[field] = response;
+    }
+  }
+
+
 }
 
 module.exports = ResponseUtils;