diff --git a/.vs/AAMariam-Trading-Bot/v15/.suo b/.vs/AAMariam-Trading-Bot/v15/.suo
new file mode 100644
index 000000000..28859c201
Binary files /dev/null and b/.vs/AAMariam-Trading-Bot/v15/.suo differ
diff --git a/AAMariam.sln b/AAMariam-Trading-Bot.sln
similarity index 88%
rename from AAMariam.sln
rename to AAMariam-Trading-Bot.sln
index 189494848..da30e179e 100644
--- a/AAMariam.sln
+++ b/AAMariam-Trading-Bot.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "AAMariam", "AAMariam.njsproj", "{AA2901BC-8F81-40F0-A402-5CA79A3F22AD}"
+Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "Project", "Project.njsproj", "{AA2901BC-8F81-40F0-A402-5CA79A3F22AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/AAMariam.njsproj b/Project.njsproj
similarity index 99%
rename from AAMariam.njsproj
rename to Project.njsproj
index 98f10ab3f..f853a519c 100644
--- a/AAMariam.njsproj
+++ b/Project.njsproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <Name>AAMariam</Name>
+    <Name>Project</Name>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
   <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
diff --git a/Trading-Process/Interval.js b/Trading-Process/Interval.js
index 55966fa87..8072dd9c0 100644
--- a/Trading-Process/Interval.js
+++ b/Trading-Process/Interval.js
@@ -1362,7 +1362,7 @@
                         if (err || exchangeResponse.error !== undefined) {
                             try {
 
-                                if (err.message.indexOf("ETIMEDOUT") > 0) {
+                                if (err.message.indexOf("ETIMEDOUT") > 0 || err.message.indexOf("Order execution timed out") > 0) {
 
                                     const logText = "[WARN] movePositionAtExchange - onExchangeCallReturned - Timeout reached while trying to access the Exchange API. Requesting new execution later. : ERROR = " + err.message;
                                     logger.write(logText);
diff --git a/this.bot.config.json b/this.bot.config.json
index 061f71795..9344e28cd 100644
--- a/this.bot.config.json
+++ b/this.bot.config.json
@@ -1,9 +1,10 @@
 {
   "bot": {
-    "name": "Mariam",
+    "displayName": "Mariam",
+    "codeName": "AAMariam",
     "type": "Trading",
     "version": "1.0.0",
-    "devTeam": "AA Masters",
+    "devTeam": "AAMasters",
     "dataSetVersion": "dataSet.V1"
   },
   "processes": [
@@ -28,7 +29,37 @@
       "intervalLapse": 60000,
       "intervalMaxLoops": -1
     }
-  ]
+  ],
+  "products": [
+    {
+      "codeName": "Trading History",
+      "displayName": "Mariam Trading History",
+      "description": "General information about Mariam trading history.",
+      "storageAccount": "aamariam",
+      "sets": [
+        {
+          "type": "Single File",
+          "validPeriods": [ "24-hs", "12-hs", "08-hs", "06-hs", "04-hs", "03-hs", "02-hs", "01-hs", "45-min", "40-min", "30-min", "20-min", "15-min", "10-min", "05-min", "04-min", "03-min", "02-min", "01-min" ],
+          "filePath": "@Exchange/Mariam/dataSet.V1/Output/Trading-Process",
+          "fileName": "Execution.History.json"
+        }
+      ],
+      "exchangeList": [
+        {
+          "name": "Poloniex"
+        }
+      ],
+      "plotter": {
+        "devTeam": "AAMasters",
+        "repo": "Plotters-Trading",
+        "moduleName": "History"
+      }
+    }
+  ],
+  "storage": {
+    "sas": "?sv=2017-07-29&ss=f&srt=sco&sp=r&se=2018-12-30T23:44:52Z&st=2018-02-25T15:44:52Z&spr=https&sig=0pzOTcVAAOkgH7C4KmA1Rbs15kyjvVC1XFCsLQYjXKU%3D",
+    "fileUri": "https://aamariam.file.core.windows.net"
+  }
 }