Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r9c4cdc42d3bcef089a9627b206496cb23bc3f643 -r12fa9b72d8e338b624879c284488a04b17115762
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9c4cdc42d3bcef089a9627b206496cb23bc3f643)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 12fa9b72d8e338b624879c284488a04b17115762)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      27-May-2026
+* @author  (last)      Praneeth Bunne
+* @date    (last)      04-Jun-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -28,10 +28,12 @@
 #include "CpldInterface.h"
 #include "DDInterface.h"
 #include "Ejector.h"
+#include "FluidBolus.h"
 #include "FpgaTD.h"
 #include "LevelSensors.h"
 #include "Messaging.h"
 #include "ModeStandby.h"
+#include "ModeTreatment.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressures.h"
@@ -113,16 +115,27 @@
     { 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_TREATMENT_UF_VOLUME_VALIDATE_REQUEST,                   &validateAndSetUFVolume },
+    { MSG_ID_UI_ULTRAFILTRATION_CHANGE_CONFIRM_REQUEST,                 &signalUserConfirmationOfUFVolume },
+    { MSG_ID_UI_DURATION_VALIDATE_REQUEST,                              &validateAndSetTreatmentDuration },
+    { MSG_ID_UI_DURATION_CONFIRM_REQUEST,                               &signalUserConfirmationOfTreatmentDuration },
+    { MSG_ID_UI_BOLUS_VOLUME_CHANGE_REQUEST,                            &validateAndSetBolusVolume },
     { 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_PRESSURE_LIMITS_CHANGE_REQUEST,                         &pressureLimitHandleChangeRequest },
+    { MSG_ID_UI_TREATMENT_SET_POINTS_CHANGE_REQUEST,                    &validateAndSetTreatmentSetPoints },
+    { MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST,          &validateAndSetBloodFlowRate },
+    { MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_REQUEST,      &validateAndSetDialysateFlowRate },
+    { MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_REQUEST,      &validateAndSetDialysateTemperature },
     { 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_UI_BLOOD_PRESSURE_REQUEST,                                 &bpModuleHandleVitalsRequest },
     { MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE,                            &handleUpdateAvailable },
+    { MSG_ID_UI_FLUID_BOLUS_REQUEST,                                    &handleFluidBolusRequest },
     { MSG_ID_TD_SOFTWARE_RESET_REQUEST,                                 &testTDSoftwareResetRequest },
     { MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,                                &testBubbleDetectOverride },
     { MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testBubblesDataPublishIntervalOverride },
@@ -207,6 +220,7 @@
     { MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST,          &testCalibrateForceSensor },
 };
 
+/// Number of entries in the message handling function lookup table.
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
 
 // ********** private data **********