diff --git a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingProcess.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingProcess.js
index 3e86e4c9a..7c3170064 100644
--- a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingProcess.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingProcess.js
@@ -340,7 +340,11 @@
                         continue
                     }
 
-                    if (dataDependenciesModule.isItAChartDepenency('atAnyTimeFrame', datasetModule.node.parentNode.config.singularVariableName) !== true) {
+                    if (dataDependenciesModule.filters.timeFrames.get(datasetModule.exchange, datasetModule.market, datasetModule.product, 'atAnyTimeFrame') !== true) {
+                        /*
+                        If we can not find the current data set is used at the current time 
+                        frame we will skip this file.
+                        */
                         continue
                     }
 
@@ -515,10 +519,12 @@
                             continue
                         }
 
-                        /*
-                        If it is not a dependency then we pass..
-                        */
-                        if (dataDependenciesModule.isItAChartDepenency(timeFrameLabel, datasetModule.node.parentNode.config.singularVariableName) !== true) {
+                        if (dataDependenciesModule.filters.timeFrames.get(datasetModule.exchange, datasetModule.market, datasetModule.product, timeFrameLabel) !== true) {
+                            /*
+                            If we can not find the current data set is used at the current time 
+                            frame we will skip this file, unless we are in the only special 
+                            case that we are retrieving candles.
+                            */
                             if (!(TS.projects.superalgos.globals.processConstants.CONSTANTS_BY_PROCESS_INDEX_MAP.get(processIndex).SESSION_NODE.tradingParameters.timeFrame.config.label === timeFrameLabel && datasetModule.node.parentNode.config.pluralVariableName === 'candles')) {
                                 continue
                             }
diff --git a/Projects/Superalgos/TS/Process-Modules/DataDependencies.js b/Projects/Superalgos/TS/Process-Modules/DataDependencies.js
index aff88fdc1..66ab8552e 100644
--- a/Projects/Superalgos/TS/Process-Modules/DataDependencies.js
+++ b/Projects/Superalgos/TS/Process-Modules/DataDependencies.js
@@ -23,7 +23,6 @@
         filters: undefined,
         curatedDependencyNodeArray: undefined,
         dataSetsModulesArray: [],
-        isItAChartDepenency: isItAChartDepenency,
         initialize: initialize,
         finalize: finalize
     }
@@ -246,10 +245,4 @@
         thisObject.filters = undefined
         bot = undefined
     }
-
-    function isItAChartDepenency(timeFrame, product) {
-        let key = timeFrame + '-' + product
-
-        return thisObject.filters.chart.products.get(key)
-    }
 }