Index: firmware/App/Services/NVRecordsDD.h
===================================================================
diff -u -r1fa38184526c2b0c072eb8745c653f772156a824 -r2e65cae607c3ee68326f82d6134b0de3777559f9
--- firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision 1fa38184526c2b0c072eb8745c653f772156a824)
+++ firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision 2e65cae607c3ee68326f82d6134b0de3777559f9)
@@ -68,6 +68,51 @@
     DD_EVENT_ID_T nvEvent;                                                      ///< Jobs non-volatile DD event (i.e calibration, system).
 } PROCESS_RECORD_SPECS_T;
 
+/// Enum for all the subcomponents for the DD calibration record
+typedef enum DD_Cal_Records_components
+{
+    DD_CAL_RECORD_PRESSURE_SENSOR = 0,                                          ///< Index for pressure sensors calibration data.
+    DD_CAL_RECORD_TEMPERATURE_SENSOR,                                           ///< Index for temperature sensors calibration data.
+    DD_CAL_RECORD_CONCENTRATE_PUMP,                                             ///< Index for concentrate pumps calibration record.
+    DD_CAL_RECORD_D12_PUMP,                                                     ///< Index for D12 dialysate pump calibration record.
+    DD_CAL_RECORD_D48_PUMP,                                                     ///< Index for D48 dialysate pump calibration record.
+    DD_CAL_RECORD_ACID_CONCENTRATE,                                             ///< Index for acid concentrates calibration data.
+    DD_CAL_RECORD_BICARB_CONCENTRATE,                                           ///< Index for bicarb concentrates calibration data.
+    DD_CAL_RECORD_ACCELEROMETER_SENSOR,                                         ///< Index for accelerometers calibration data.
+    DD_CAL_RECORD_BLLOD_LEAK_SENSOR,                                            ///< Index for blood leak sensor calibration data.
+    NUM_OF_CAL_RECORD_COMPONENTS                                                ///< Total number of components in calibration record
+}DD_CAL_REC_COMPONENTS;
+
+/// Enum for all the subcomponents for the DD institutional record
+typedef enum DD_Instit_Records_components
+{
+    DD_INSTIT_MIN_DIALYSATE_FLOW_MLPM = 0,                                      ///< Index for Min dialysate flow in mL/min.
+    DD_INSTIT_MAX_DIALYSATE_FLOW_MLPM,                                          ///< Index for Max dialysate flow in mL/min.
+    DD_INSTIT_MIN_DIALYSATE_TEMP_C,                                             ///< Index for Min dialysate temperature in C.
+    DD_INSTIT_MAX_DIALYSATE_TEMP_C,                                             ///< Index for Max dialysate temperature in C.
+    DD_INSTIT_MIN_ACID_CONCENTRATE,                                             ///< Index for Min acid concentrate
+    DD_INSTIT_MAX_ACID_CONCENTRATE,                                             ///< Index for Max acid concentrate
+    DD_INSTIT_MIN_BICARB_CARTRIDGE_SIZE_G,                                      ///< Index for Min bicarbonate cartridge size in grams.
+    DD_INSTIT_MAX_BICARB_CARTRIDGE_SIZE_G,                                      ///< Index for Max bicarbonate cartridge size in grams.
+    DD_INSTIT_MIN_SODIUM_MEQL,                                                  ///< Index for Min sodium in mEq/L
+    DD_INSTIT_MAX_SODIUM_MEQL,                                                  ///< Index for Max sodium in mEq/L
+    DD_INSTIT_MIN_BICARBONATE_MEQL,                                             ///< Index for Min bicarbonate in mEq/L
+    DD_INSTIT_MAX_BICARBONATE_MEQL,                                             ///< Index for Max bicarbonate in mEq/L
+    DD_INSTIT_MIN_RO_REJECTION_RATIO_PCT,                                       ///< Index for Min RO rejection ratio in percent.
+    DD_INSTIT_DISINFECTION_FREQUENCY,                                           ///< Index for Disinfection days between cycles.
+    DD_INSTIT_DISINFECTION_CYCLE_TIME,                                          ///< Index for Disinfection Cycle Time
+    DD_INSTIT_MIN_INLET_WATER_COND_ALARM_LIMIT_USPCM,                           ///< Index for Min inlet water conductivity alarm limit in uS/cm.
+    DD_INSTIT_MAX_INLET_WATER_COND_ALARM_LIMIT_USPCM,                           ///< Index for Max inlet water conductivity alarm limit in uS/cm.
+    DD_INSTIT_ACID_CONCENTRATE_JUG_SIZE_L,                                      ///< Index for acid concentrate jug size in Liters
+    DD_INSTIT_MIN_ACID_ALARM_LIMIT_PCT,                                         ///< Index for Min acid alarm limit in percent.
+    DD_INSTIT_MIN_BICARB_ALARM_LIMIT_PCT,                                       ///< Index for Min bicarbonate alarm limit in percent.
+    DD_INSTIT_POST_TREAT_DRAIN_OPTION,                                          ///< Index for Dialysate Post Treatment Drain Option 
+    DD_INSTIT_POST_TREAT_DRY_BICARB_OPTION,                                     ///< Index for Dry Bicarbonate Post Treatment Option 
+    DD_INSTIT_CALIBRATION_TIME,                                                 ///< Index for Calibration time in epoch.
+    DD_INSTIT_CRC,                                                              ///< Index for CRC of the institutional record.
+    NUM_OF_DD_INSTIT_RECORD_COMPONENTS                                          ///< Total number of components in institutional record
+}DD_INSTIT_REC_COMPONENTS;
+
 /// DD available NV data to get
 typedef enum DD_nv_commands
 {
@@ -76,11 +121,10 @@
     GET_CAL_CONCENTRATE_PUMPS_RECORD,                                           ///< Get concentrate pumps calibration record.
     GET_CAL_D12_PUMP_RECORD,                                                    ///< Get D12 dialysate pump calibration record.
     GET_CAL_D48_PUMP_RECORD,                                                    ///< Get D48 dialysate pump calibration record.
-    GET_CAL_DIALYSATE_PUMPS_RECORD,                                             ///< Get dialysate pumps calibration record.
     GET_CAL_ACID_CONCENTREATES,                                                 ///< Get acid concentrates calibration data.
     GET_CAL_BICARB_CONCENTRATES,                                                ///< Get bicarb concentrates calibration data.
     GET_CAL_ACCEL_SENSORS,                                                      ///< Get accelerometers calibration data.
-    GET_CAL_BLOOD_LEAK_SENSOR,
+    GET_CAL_BLOOD_LEAK_SENSOR,                                                  ///< Get blood leak sensor calibration data.
     GET_SYSTEM_RECORD,                                                          ///< Get system record.
     GET_SERVICE_RECORD,                                                         ///< Get service record.
     GET_INSTITUTIONAL_RECORD,                                                   ///< Get institutional record.
@@ -230,7 +274,7 @@
 typedef struct
 {
     BOOL isROFeatured;                                                          ///< True : RO featured. False : RO de-featured.
-    BOOL isR0FeaturedBoostPump;                                                 ///< True : RO featured with boost pump. False : RO featured without the boost pump.
+    BOOL isROFeaturedBoostPump;                                                 ///< True : RO featured with boost pump. False : RO featured without the boost pump.
     char topLevelPN[ MAX_TOP_LEVEL_PN_CHARS ];                                  ///< DD top level part number.
     char topLevelSN[ MAX_TOP_LEVEL_SN_CHARS ];                                  ///< DD top level serial number.
     U08 mfgLocation;                                                            ///< DD manufacturing location.