diff --git a/AABrowserAPI/CopySimulator.js b/AABrowserAPI/CopySimulator.js
index c9d06c6ca..6479cf136 100644
--- a/AABrowserAPI/CopySimulator.js
+++ b/AABrowserAPI/CopySimulator.js
@@ -72,8 +72,7 @@ exports.newCopySimulator = function newCopySimulator() {
                     "minor": 0
                 },
                 process: "Multi-Period-Market",
-                dataSetVersion: "dataSet.V1",
-                type: "Indicator"
+                dataSetVersion: "dataSet.V1"
             }
             parsedConfig.processes[0].statusDependencies.push(statusDependencyMarket)
 
@@ -85,36 +84,9 @@ exports.newCopySimulator = function newCopySimulator() {
                     "minor": 0
                 },
                 process: "Multi-Period-Daily",
-                dataSetVersion: "dataSet.V1",
-                type: "Indicator"
+                dataSetVersion: "dataSet.V1"
             }
-            parsedConfig.processes[0].statusDependencies.push(statusDependencyDaily)
-
-            let dataDependencyMarket = {
-                devTeam: pTeamCodeName,
-                bot: botCodeName,
-                botVersion: {
-                    "major": 1,
-                    "minor": 0
-                },
-                process: "Trading-Simulation",
-                dataSetVersion: "dataSet.V1",
-                dataSet: "Multi-Period-Market"
-            }
-            parsedConfig.processes[0].dataDependencies.push(dataDependencyMarket)
-
-            let dataDependencyDaily = {
-                devTeam: pTeamCodeName,
-                bot: botCodeName,
-                botVersion: {
-                    "major": 1,
-                    "minor": 0
-                },
-                process: "Trading-Simulation",
-                dataSetVersion: "dataSet.V1",
-                dataSet: "Multi-Period-Daily"
-            }
-            parsedConfig.processes[0].dataDependencies.push(dataDependencyDaily)
+            parsedConfig.processes[1].statusDependencies.push(statusDependencyDaily)
 
             //Changing Indicator Output
             parsedConfig.products[0].storageAccount = pTeamCodeName
diff --git a/AABrowserAPI/TeamSetup.js b/AABrowserAPI/TeamSetup.js
index fde2170d9..cc88a5814 100644
--- a/AABrowserAPI/TeamSetup.js
+++ b/AABrowserAPI/TeamSetup.js
@@ -204,38 +204,61 @@
                                     botConfig.processes[0].statusDependencies[i].devTeam = pTeamCodeName;
                                     botConfig.processes[0].statusDependencies[i].bot = pBotCodeName;
                                 }
-
-                                // Add a copy of the simulator indicator in the configuration
-                                if ( botConfig.processes[0].statusDependencies[i].devTeam === "AAMasters" &&
-                                     botConfig.processes[0].statusDependencies[i].bot === "AAJason" ) {
-
-                                    botConfig.processes[0].statusDependencies[i].devTeam = pTeamCodeName;
-                                    botConfig.processes[0].statusDependencies[i].bot = "simulator-" + pBotCodeName;
-                                }
                             }
 
-                            // Market Files
-                            for (let i = 0; i < botConfig.processes[0].dataDependencies.length; i++) {
-
-                                // Add a copy of the simulator indicator in the configuration
-                                if ( botConfig.processes[0].dataDependencies[i].devTeam === "AAMasters" &&
-                                     botConfig.processes[0].dataDependencies[i].bot === "AAJason" ) {
-
-                                    botConfig.processes[0].dataDependencies[i].devTeam = pTeamCodeName;
-                                    botConfig.processes[0].dataDependencies[i].bot = "simulator-" + pBotCodeName;
-                                }
+                            // Add simulator dependency
+                            let statusDependencyMarket = {
+                                devTeam: pTeamCodeName,
+                                bot: botCodeName,
+                                botVersion: {
+                                    "major": 1,
+                                    "minor": 0
+                                },
+                                process: "Multi-Period-Market",
+                                dataSetVersion: "dataSet.V1",
+                                type: "Indicator"
                             }
+                            botConfig.processes[0].statusDependencies.push(statusDependencyMarket)
 
-                            for (let i = 0; i < botConfig.processes[1].dataDependencies.length; i++) {
-
-                                // Add a copy of the simulator indicator in the configuration
-                                if ( botConfig.processes[1].dataDependencies[i].devTeam === "AAMasters" &&
-                                     botConfig.processes[1].dataDependencies[i].bot === "AAJason" ) {
-
-                                    botConfig.processes[1].dataDependencies[i].devTeam = pTeamCodeName;
-                                    botConfig.processes[1].dataDependencies[i].bot = "simulator-" + pBotCodeName;
-                                }
+                            let statusDependencyDaily = {
+                                devTeam: pTeamCodeName,
+                                bot: botCodeName,
+                                botVersion: {
+                                    "major": 1,
+                                    "minor": 0
+                                },
+                                process: "Multi-Period-Daily",
+                                dataSetVersion: "dataSet.V1",
+                                type: "Indicator"
                             }
+                            botConfig.processes[0].statusDependencies.push(statusDependencyDaily)
+
+                            let simulatorBotCodeName = "simulator-" + pBotCodeName
+                            let dataDependencyMarket = {
+                                devTeam: pTeamCodeName,
+                                bot: simulatorBotCodeName,
+                                botVersion: {
+                                    "major": 1,
+                                    "minor": 0
+                                },
+                                process: "Trading-Simulation",
+                                dataSetVersion: "dataSet.V1",
+                                dataSet: "Multi-Period-Market"
+                            }
+                            botConfig.processes[0].dataDependencies.push(dataDependencyMarket)
+
+                            let dataDependencyDaily = {
+                                devTeam: pTeamCodeName,
+                                bot: simulatorBotCodeName,
+                                botVersion: {
+                                    "major": 1,
+                                    "minor": 0
+                                },
+                                process: "Trading-Simulation",
+                                dataSetVersion: "dataSet.V1",
+                                dataSet: "Multi-Period-Daily"
+                            }
+                            botConfig.processes[0].dataDependencies.push(dataDependencyDaily)
 
                             botConfig.displayName = pBotDisplayName;
                             botConfig.codeName = pBotCodeName;