diff --git a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
index 54af3c9c7..e364f9303 100644
--- a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
@@ -64,8 +64,9 @@ function newTaskFunctions () {
    'Data Mining->Testing Environment->Production Environment->' +
    'Exchange Tasks->Crypto Exchange->' +
    'Task Manager->Task->' +
-   'Indicator Bot Instance->Sensor Bot Instance->' +
-   'Indicator Process Instance->Sensor Process Instance->' +
+   'Indicator Bot Instance->Sensor Bot Instance->Trading Bot Instance->' +
+   'Indicator Process Instance->Sensor Process Instance->Trading Process Instance->' +
+   'Paper Trading Session->Forward Testing Session->Backtesting Session->Live Trading Session->' +
    'Market Reference->Market->' +
    'Process Definition->'
 
diff --git a/EventsServerClient.js b/EventsServerClient.js
index 1c5301e37..bdbe7f37b 100644
--- a/EventsServerClient.js
+++ b/EventsServerClient.js
@@ -8,6 +8,9 @@ function newEventsServerClient (host, port, hostName) {
   const logger = newWebDebugLog()
   logger.fileName = MODULE_NAME
 
+  if (host === '' || host === undefined) { host = 'localhost' }
+  if (port === '' || port === undefined) { port = '8080' }
+
   const WEB_SOCKETS_URL = 'ws://' + host + ':' + port + ''
   let WEB_SOCKETS_CONNECTION