diff --git a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
index 736649dd3..e46ed99af 100644
--- a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
@@ -97,7 +97,6 @@ function newSessionFunctions() {
 
         /* Raise event to run the session */
         let event = {
-            appSchema: JSON.stringify(APP_SCHEMA_ARRAY),
             session: JSON.stringify(session),
             tradingSystem: JSON.stringify(tradingSystem),
             tradingEngine: JSON.stringify(tradingEngine),
diff --git a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
index 2548a0135..2eb918bdc 100644
--- a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
@@ -37,7 +37,10 @@ function newTaskFunctions() {
             'Market Base Asset->Market Quoted Asset->Asset->' +
             'Backtesting Session->Live Trading Session->Paper Trading Session->Fordward Testing Session->' +
             'Process Definition->' +
-            'Process Output->Output Dataset->Dataset Definition->Product Definition->' +
+            'Process Output->' +
+            'Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->' +
+            'Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->' +
+            'Output Dataset->Dataset Definition->Product Definition->' +
             'Process Dependencies->' +
             'Status Dependency->Status Report->Process Definition->' +
             'Data Dependency->Dataset Definition->Product Definition->' +
@@ -73,6 +76,7 @@ function newTaskFunctions() {
         let networkDefinition = functionLibraryProtocolNode.getProtocolNode(networkNode.payload.parentNode, false, true, true, false, false, networkLightingPath)
 
         let event = {
+            appSchema: JSON.stringify(APP_SCHEMA_ARRAY),
             taskId: node.id,
             taskName: node.name,
             taskDefinition: JSON.stringify(taskDefinition),
diff --git a/Panels/Layer.js b/Panels/Layer.js
index edb0ccba7..fc2b57572 100644
--- a/Panels/Layer.js
+++ b/Panels/Layer.js
@@ -164,6 +164,8 @@ function newLayer() {
                 'Product Definition->' +
                 'Sensor Bot->Indicator Bot->Trading Bot->' +
                 'Data Mine->' +
+                'Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->' +
+                'Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->' +                
                 'Dataset Definition->' +
                 'Record Definition->Record Property->Formula->' +
                 'Data Building Procedure->Procedure Loop->Javascript Code->Procedure Initialization->Javascript Code->' +