diff --git a/v1/src/config/apiConfig.json b/v1/src/config/apiConfig.json
index 24d9080..92c2c18 100644
--- a/v1/src/config/apiConfig.json
+++ b/v1/src/config/apiConfig.json
@@ -16,7 +16,7 @@
         }
     },
     "version" : {
-        "version" : "1.5.7",
+        "version" : "1.5.8",
         "name": "ETA Beta",
         "date":"22/07/2025"
     },
diff --git a/v1/src/lib/Handlers/Events/Loads/index.js b/v1/src/lib/Handlers/Events/Loads/index.js
index d1c8ecf..e2f1482 100644
--- a/v1/src/lib/Handlers/Events/Loads/index.js
+++ b/v1/src/lib/Handlers/Events/Loads/index.js
@@ -8,6 +8,7 @@ const proposalsModel = getModel('proposals');
 const productsModel = getModel('products');
 const companiesModel = getModel('companies');
 const usersModel = getModel('users');
+const branchesModel = getModel('branches');
 
 /**
  * When a load is delivered, notify all involved parties
@@ -151,13 +152,13 @@ async function onLoadingDateChanged( userId, elementId ){
     if( origin_warehouse ){
         await ObserversEvents.onLoadLoadDateChanged(
             ObserversEvents.NOTIFICATION_TYPE.WAREHOUSE,
-            { origin_warehouse, load, carrier, product, vehicle, driver }
+            { warehouse: origin_warehouse, load, carrier, product, vehicle, driver }
         );
     }
     if( destination_warehouse ){
         await ObserversEvents.onLoadLoadDateChanged(
             ObserversEvents.NOTIFICATION_TYPE.WAREHOUSE,
-            { destination_warehouse, load, carrier, product, vehicle, driver }
+            { warehouse: destination_warehouse, load, carrier, product, vehicle, driver }
         );
     }
 
@@ -185,13 +186,13 @@ async function onDownloadDateChanged( userId, elementId ){
     if( origin_warehouse ){
         await ObserversEvents.onLoadDownloadDateChanged(
             ObserversEvents.NOTIFICATION_TYPE.WAREHOUSE,
-            { origin_warehouse, load, carrier, product, vehicle, driver }
+            { warehouse: origin_warehouse, load, carrier, product, vehicle, driver }
         );
     }
     if( destination_warehouse ){
         await ObserversEvents.onLoadDownloadDateChanged(
             ObserversEvents.NOTIFICATION_TYPE.WAREHOUSE,
-            { destination_warehouse, load, carrier, product, vehicle, driver }
+            { warehouse: destination_warehouse, load, carrier, product, vehicle, driver }
         );
     }
 
diff --git a/v1/src/lib/Handlers/Events/Observers/Client/index.js b/v1/src/lib/Handlers/Events/Observers/Client/index.js
index 5f682bf..2551a21 100644
--- a/v1/src/lib/Handlers/Events/Observers/Client/index.js
+++ b/v1/src/lib/Handlers/Events/Observers/Client/index.js
@@ -37,27 +37,27 @@ async function onProposalVehicleChanged( load, carrier, product, vehicle, driver
     await sendEmailEvent( EMAIL_EVENTS.CLIENT_PROPOSAL_VEHICLE_CHANGED, load, carrier, product, vehicle, driver );
 }
 
-async function onLoadLoading(){
+async function onLoadLoading( load, carrier, product, vehicle, driver ){
     await sendEmailEvent( EMAIL_EVENTS.CLIENT_LOAD_ON_LOADING, load, carrier, product, vehicle, driver );
 }
 
-async function onLoadInTransit(){
+async function onLoadInTransit( load, carrier, product, vehicle, driver ){
     await sendEmailEvent( EMAIL_EVENTS.CLIENT_LOAD_IN_TRANSIT, load, carrier, product, vehicle, driver );
 }
 
-async function onLoadDownload(){
+async function onLoadDownload( load, carrier, product, vehicle, driver ){
     await sendEmailEvent( EMAIL_EVENTS.CLIENT_LOAD_ON_DOWNLOAD, load, carrier, product, vehicle, driver );
 }
 
-async function onLoadDelivered(){
+async function onLoadDelivered( load, carrier, product, vehicle, driver ){
     await sendEmailEvent( EMAIL_EVENTS.CLIENT_LOAD_DELIVERED, load, carrier, product, vehicle, driver );
 }
 
-async function onLoadLoadDateChanged(){
+async function onLoadLoadDateChanged( load, carrier, product, vehicle, driver ){
     await sendEmailEvent( EMAIL_EVENTS.CLIENT_LOAD_LOADING_DATE_CHANGED, load, carrier, product, vehicle, driver );
 }
 
-async function onLoadDownloadDateChanged(){
+async function onLoadDownloadDateChanged( load, carrier, product, vehicle, driver ){
     await sendEmailEvent( EMAIL_EVENTS.CLIENT_LOAD_DOWNLOADING_DATE_CHANGED, load, carrier, product, vehicle, driver );
 }
 
diff --git a/v1/src/lib/Handlers/Events/Observers/Warehouse/index.js b/v1/src/lib/Handlers/Events/Observers/Warehouse/index.js
index 8b2d824..2533ade 100644
--- a/v1/src/lib/Handlers/Events/Observers/Warehouse/index.js
+++ b/v1/src/lib/Handlers/Events/Observers/Warehouse/index.js
@@ -37,12 +37,12 @@ async function onProposalVehicleChanged( warehouse, load, carrier, product, vehi
     await sendEmailEvent( EMAIL_EVENTS.WAREHOUSE_PROPOSAL_VEHICLE_CHANGED, warehouse, load, carrier, product, vehicle, driver );
 }
 
-async function onLoadLoadDateChanged(){
-    await sendEmailEvent( EMAIL_EVENTS.WAREHOUSE_LOAD_LOADING_DATE_CHANGED, load, carrier, product, vehicle, driver );
+async function onLoadLoadDateChanged( warehouse, load, carrier, product, vehicle, driver ){
+    await sendEmailEvent( EMAIL_EVENTS.WAREHOUSE_LOAD_LOADING_DATE_CHANGED, warehouse, load, carrier, product, vehicle, driver );
 }
 
-async function onLoadDownloadDateChanged(){
-    await sendEmailEvent( EMAIL_EVENTS.WAREHOUSE_LOAD_DOWNLOADING_DATE_CHANGED, load, carrier, product, vehicle, driver );
+async function onLoadDownloadDateChanged( warehouse, load, carrier, product, vehicle, driver ){
+    await sendEmailEvent( EMAIL_EVENTS.WAREHOUSE_LOAD_DOWNLOADING_DATE_CHANGED, warehouse, load, carrier, product, vehicle, driver );
 }
 
 module.exports = {