Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r72bc0d5f33dbb07afc8a7cd9015e4861c6c371a1 -r23c4d2660e921a7ea285b0117fed3f04fee9f2d6
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 72bc0d5f33dbb07afc8a7cd9015e4861c6c371a1)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 23c4d2660e921a7ea285b0117fed3f04fee9f2d6)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Jashwant Gantyada
-* @date    (last)      22-Mar-2026
+* @author  (last)      Arpita Srivastava
+* @date    (last)      18-May-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -39,8 +39,11 @@
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
 #include "Switches.h"
+#include "SyringePump.h"
 #include "SystemCommTD.h"
 #include "Temperatures.h"
+#include "TubeSetAutoEject.h"
+#include "TubeSetInstall.h"
 #include "TxParams.h"
 #include "Utilities.h"
 #include "Valve3Way.h"
@@ -106,16 +109,17 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                       &handleVersionRequestMessage },
     { MSG_ID_UI_CHECK_IN,                                               &handleUICheckIn },
     { MSG_ID_DD_OP_MODE_DATA,                                           &setDDOpMode },
+    { MSG_ID_DD_GEN_DIALYSATE_MODE_DATA,                                &setDialysateData },
     { MSG_ID_DD_PRESSURES_DATA,                                         &setDialysatePressure },
     { MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,                           &validateAndSetTreatmentParameters },
-    { MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE,                     &validateAndSetUFVolume },
-    { MSG_ID_UI_TREATMENT_PARAMS_CONFIRMED,                             &signalUserConfirmationOfTreatmentParameters },
     { MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW,                            &signalUserInitiateTreatment },
     { MSG_ID_UI_UF_PAUSE_RESUME_REQUEST,                                &signalPauseResumeUF },
     { MSG_ID_TESTER_LOGIN_REQUEST,                                      &handleTesterLogInRequest },
     { MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST,                           &pressureLimitHandleWidenRequest },
     { MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST,                                &bloodPrimeHandleCmdRequest },
     { MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST,          &bloodPrimeHandleBloodFlowChangeRequest },
+    { MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST,                     &handleAutoLoadRequest },
+    { MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST,             &handleAutoEjectRequest },
     { MSG_ID_TD_SOFTWARE_RESET_REQUEST,                                 &testTDSoftwareResetRequest },
     { MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,                                &testBubbleDetectOverride },
     { MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testBubblesDataPublishIntervalOverride },
@@ -185,6 +189,19 @@
     { MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE,                            &testBloodPrimeVolumeOverride },
     { MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,          &testBloodPrimePublishIntervalOverride },
     { MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM,                             &testEnableVenousBubbleAlarm },
+    { MSG_ID_TD_SYRINGE_PUMP_OPERATION_REQUEST,                         &testSyringePumpOperationRequest },
+    { MSG_ID_HD_SYRINGE_PUMP_PUBLISH_INTERVAL_OVERRIDE,                 &testSyringePumpDataPublishIntervalOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_RATE_OVERRIDE_REQUEST,                     &testSyringePumpMeasuredRateOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_FORCE_OVERRIDE_REQUEST,                    &testSyringePumpMeasuredForceOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_HOME_OVERRIDE_REQUEST,                     &testSyringePumpMeasuredHomeOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_POSITION_OVERRIDE_REQUEST,                 &testSyringePumpMeasuredPositionOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_VOLUME_OVERRIDE_REQUEST,                   &testSyringePumpMeasuredVolumeOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_STATUS_OVERRIDE_REQUEST,                   &testSyringePumpStatusOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE_REQUEST,           &testSyringePumpEncoderStatusOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE_REQUEST,           &testSyringePumpADCandDACStatusOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST,         &testSyringePumpADCReadCounterOverride },
+    { MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST,             &testHeparinBolusTargetRateOverride },
+    { MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST,          &testCalibrateForceSensor },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))