diff --git a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
index 477ba1cb6..bea56cf46 100644
--- a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
@@ -28,7 +28,7 @@ function newSessionFunctions() {
             'Trigger Stage->Trigger On Event->Trigger Off Event->Take Position Event->' +
             'Announcement->Announcement Formula->' +
             'Open Stage->Initial Definition->Open Execution->' +
-            'Position Size->Position Rate->Formula->' +
+            'Position Size In Base Asset->Position Size In Quoted Asset->Position Rate->Formula->' +
             'Initial Stop->Initial Take Profit->' +
             'Manage Stage->' +
             'Managed Stop Loss->Managed Take Profit->' +
@@ -38,7 +38,7 @@ function newSessionFunctions() {
             'Announcement->Announcement Formula->' +
             'Execution Algorithm->Market Buy Order->Market Sell Order->Limit Buy Order->Limit Sell Order->' +
             'Create Order Event->Cancel Order Event->' +
-            'Position Size->Position Rate->Formula->' +
+            'Size In Base Asset->Size In Quoted Asset->Position Rate->Formula->' +
             'Situation->Condition->Javascript Code->' +
             'Market Order->Limit Order->' +
             'Simulated Exchange Events->Simulated Partial Fill->Simulated Actual Rate->Simulated Fees Paid->Formula->'
@@ -49,9 +49,9 @@ function newSessionFunctions() {
             'Trading Engine->' +
             'Dynamic Indicators->Indicator Function->Formula->' +
             'Episode->Current->Last->Previous->' +
-            'Episode Counters->Episode Statistics->' +
+            'Episode Base Asset->Episode Quoted Asset->Episode Counters->Episode Statistics->' +
             'Periods->Strategies->Positions->Orders->Hits->Fails->' +
-            'Profit Loss->Hit Ratio->Days->ROI->Anualized Rate Of Return->User Defined Statistic->' +
+            'Profit Loss->Hit Ratio->Hit Fail->Days->ROI->Anualized Rate Of Return->User Defined Statistic->' +
             'Formula->' +
             'Candle->' +
             'Begin->End->Open->Close->Min->Max->Index->' +
@@ -59,20 +59,23 @@ function newSessionFunctions() {
             'Distance To Event->' +
             'Trigger On->Trigger Off->Take Position->Close Position->Next Phase->Move To Phase->Create Order->Cancel Order->Close Order->' +
             'Strategy->' +
-            'Serial Number->Identifier->Begin->End->Strategy Name->Index->Trigger Stage Status->Open Stage Status->Manage Stage Status->Close Stage Status->Status->Begin Rate->End Rate->Situation Name->' +
+            'Serial Number->Identifier->Begin->End->Strategy Name->Index->Status->Begin Rate->End Rate->Situation Name->' +
             'Strategy Counters->Periods->' +
             'Position->' +
-            'Serial Number->Identifier->Begin->End->Rate->Size->Open Stage Orders Size->Open Stage Filled Size->Close Stage Orders Size->Close Stage Filled Size->Exit Type->Status->Begin Rate->End Rate->Situation Name->' +
+            'Serial Number->Identifier->Begin->End->Rate->Exit Type->Status->Begin Rate->End Rate->Situation Name->' +
             'Stop Loss->Stop Loss Stage->Stop Loss Phase->' +
             'Take Profit->Take Profit Stage->Take Profit Phase->' +
             'Position Counters->Periods->' +
-            'Position Statistics->Profit Loss->Days->ROI->Hit Fail->User Defined Statistic->' +
+            'Position Statistics->Days->User Defined Statistic->' +
+            'Position Base Asset->Position Quoted Asset->Size->Profit Loss->ROI->Hit Fail->' +
             'Formula->' +
             'Exchange Orders->Market Buy Orders->Market Sell Orders->Limit Buy Orders->Limit Sell Orders->' +
             'Market Order->Limit Order->' +
-            'Serial Number->Identifier->Exchange Id->Begin->End->Rate->Size->Exit Type->Status->Order Name->Algorithm Name->Situation Name->Lock->' +
+            'Serial Number->Identifier->Exchange Id->Begin->End->Rate->Exit Type->Status->Order Name->Algorithm Name->Situation Name->Lock->' +
             'Order Counters->Periods->' +
-            'Order Statistics->Size Filled->Percentage Filled->Amount Received->Actual Rate->Fees Paid->Days->User Defined Statistic->'
+            'Order Base Asset->Order Quoted Asset->' +
+            'Size->Size Filled->Amount Received->Fees Paid->' +
+            'Order Statistics->Percentage Filled->Actual Rate->Days->User Defined Statistic->'
 
         let tradingEngine = functionLibraryProtocolNode.getProtocolNode(node.tradingEngineReference.payload.referenceParent, false, true, true, false, false, lightingPath)
 
diff --git a/Spaces/DesignSpace.js b/Spaces/DesignSpace.js
index b67ffa44b..c745e4fb9 100644
--- a/Spaces/DesignSpace.js
+++ b/Spaces/DesignSpace.js
@@ -291,7 +291,12 @@ function newDesignSpace() {
             'market-order',
             'limit-order',
             'execution-algorithm',
-            'cancel-order'
+            'cancel-order',
+            'limit-sell-order',
+            'close-execution',
+            'market-sell-order',
+            'limit-buy-order',
+            'market-buy-order'
         ]
 
         for (let i = 0; i < iconsNames.length; i++) {