Index: TDDefs.h
===================================================================
diff -u -r36ee59a069768e02031d4e0777a0faf74a7d751b -rec3513b4b94dc88a677fd42667dcca3491a5e54d
--- TDDefs.h	(.../TDDefs.h)	(revision 36ee59a069768e02031d4e0777a0faf74a7d751b)
+++ TDDefs.h	(.../TDDefs.h)	(revision ec3513b4b94dc88a677fd42667dcca3491a5e54d)
@@ -8,7 +8,7 @@
 * @file    TDDefs.h
 *
 * @author  (last)      Praneeth Bunne
-* @date    (last)      04-Jun-2026
+* @date    (last)      26-Jun-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -413,8 +413,7 @@
 {
     FLUID_BOLUS_IDLE_STATE = 0,                        ///< No fluid bolus delivery is in progress
     FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE,             ///< Wait for pumps to stop before starting bolus
-    FLUID_BOLUS_SALINE_IN_PROGRESS_STATE,              ///< A saline bolus delivery is in progress
-    FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE,           ///< A substitute bolus delivery is in progress
+    FLUID_BOLUS_IN_PROGRESS_STATE,                     ///< A fluid bolus delivery is in progress
     NUM_OF_FLUID_BOLUS_STATES                          ///< Number of fluid bolus states
 };
 typedef enum Fluid_Bolus_States FLUID_BOLUS_STATE_T;   ///< Type for fluid bolus state enumeration
@@ -702,8 +701,9 @@
 /// Enumeration of treatment modality type
 enum Treatment_Modality_Types
 {
-    TREATMENT_MODALITY_HD = 0,                                          ///< Treatment modality Hemodialysis
-    TREATMENT_MODALITY_HDF,                                             ///< Treatment modality Hemodiafiltration
+    TREATMENT_MODALITY_HD_SALINE_FLUID = 0,                             ///< Treatment modality Hemodialysis with saline fluid
+    TREATMENT_MODALITY_HDF_ONLINE_FLUID,                                ///< Treatment modality Hemodiafiltration online fluid
+    TREATMENT_MODALITY_HD_ONLINE_FLUID,                                 ///< Treatment modality Hemodialysis with online fluid
 //    TREATMENT_MODALITY_ISOLATED_UF,                                     ///< Treatment modality Isolated UF  // TODO uncomment in phase 3 when ISO UF feature is required
     NUM_OF_TREATMENT_MODALITY_TYPES                                     ///< Total number of treatment modality types
 };
@@ -881,6 +881,28 @@
 };
 typedef enum Confirmation_Status CONFIRMATION_REQUEST_STATUS_T;
 
+///< Enumeration of tube set types.
+enum Tube_Set_Types
+{
+    TUBE_SET_TYPE_UNKNOWN = 0,                                          ///< Unknown tube set type
+    TUBE_SET_TYPE_HD,                                                   ///< HD tubing set
+    TUBE_SET_TYPE_HDF,                                                  ///< HDF tubing set
+    NUM_OF_TUBE_SET_TYPES                                               ///< Number of tube set types
+};
+///< Type for tube set types enumeration
+typedef enum Tube_Set_Types TUBE_SET_TYPE_T;
+
+///< Enumeration of fluid types
+enum Fluid_Types
+{
+    FLUID_TYPE_UNKNOWN = 0,                                             ///< Unknown fluid type
+    FLUID_TYPE_SALINE,                                                  ///< Saline fluid type
+    FLUID_TYPE_SUBSTITUTE,                                              ///< Substitution fluid type
+    NUM_OF_FLUID_TYPES
+};
+///< Type for fluid types enumeration
+typedef enum Fluid_Types FLUID_TYPE_T;
+
 /**@}*/
 
 #endif