Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h
===================================================================
diff -u -r6d843984ed0b24bc188f96020cd9cc9e18e09906 -r56381aae237db191956aff493907cd1f0801216b
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h	(.../MPreTreatmentAdjustRequests.h)	(revision 6d843984ed0b24bc188f96020cd9cc9e18e09906)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h	(.../MPreTreatmentAdjustRequests.h)	(revision 56381aae237db191956aff493907cd1f0801216b)
@@ -72,70 +72,82 @@
  *
  * | Payload   ||
  * |           ||
- * | #01:(U32) | \ref mBloodFlowRate                      |
- * | #02:(U32) | \ref mDialysateFlowRate                  |
- * | #03:(U32) | \ref mTreatmentDuration                  |
- * | #04:(U32) | \ref mSalineBolusVolume                  |
- * | #05:(U32) | \ref mHeparinStopTime                    |
- * | #06:(U32) | \ref mHeparinType                        |
- * | #07:(U32) | \ref mAcidConcentrate                    |
- * | #08:(U32) | \ref mBicarbonateConcentrate             |
- * | #09:(U32) | \ref mDialyzerType                       |
- * | #10:(U32) | \ref mBloodPressureMeasureInterval       |
- * | #11:(U32) | \ref mRinsebackFlowRate                  |
- * | #12:(U32) | \ref mRinsebackVolume                    |
- * | #13:(S32) | \ref mArterialPressureLimitWindow        |
- * | #14:(S32) | \ref mVenousPressureLimitWindow          |
- * | #15:(S32) | \ref mVenousPressureLimitAsymtrc         |
- * | #16:(S32) | \ref mTransmembranePressureLimitWindow   |
- * | #17:(F32) | \ref mDialysateTemp                      |
- * | #18:(F32) | \ref mHeparinDispensingRate              |
- * | #19:(F32) | \ref mHeparinBolusVolume                 |
+ * | #01:(U32) | \ref mTreatmentModality                    |
+ * | #02:(U32) | \ref mHDFTreatmentMode                     |
+ * | #03:(U32) | \ref mBloodFlowRate                        |
+ * | #04:(U32) | \ref mDialysateFlowRate                    |
+ * | #05:(U32) | \ref mTreatmentDuration                    |
+ * | #06:(U32) | \ref mHeparinDeliveryDuration              |
+ * | #07:(U32) | \ref mHeparinType                          |
+ * | #08:(U32) | \ref mDryBicarbCartSize                    |
+ * | #09:(U32) | \ref mSodium                               |
+ * | #10:(U32) | \ref mBicarbonate                          |
+ * | #11:(U32) | \ref mDialyzerType                         |
+ * | #12:(U32) | \ref mFluidBolusVolume                     |
+ * | #13:(U32) | \ref mBloodPressureMeasureInterval         |
+ * | #14:(U32) | \ref mPrimeDiscardVolume                   |
+ * | #15:(U32) | \ref mRinsebackVolume                      |
+ * | #16:(U32) | \ref mHepatitusBStatus                     |
+ * | #17:(F32) | \ref mSubstitutionFluidVolume              |
+ * | #18:(F32) | \ref mHeparinBolusVolume                   |
+ * | #19:(F32) | \ref mHeparinDispensingRate                |
+ * | #20:(F32) | \ref mDialysateTemp                        |
+ * | #21:(F32) | \ref mAcidConcentrateConversionFactor      |
+ * | #22:(F32) | \ref mUFVolume                             |
+ * | #23:(U32) | \ref mUFPreWeight                          |
+ * | #24:(U32) | \ref mUFEstimatedTargetWeight              |
+
  *
  */
 class MAdjustParametersValidationReq : public MModel {
 public:
+    quint32 mTreatmentModality                  = 0; // <options>
+    quint32 mHDFTreatmentMode                   = 0; // <options>
     quint32 mBloodFlowRate                      = 0; // mL/min
     quint32 mDialysateFlowRate                  = 0; // mL/min
-    quint32 mTreatmentDuration                  = 0; // minutes
-    quint32 mSalineBolusVolume                  = 0; // mL
-    quint32 mHeparinStopTime                    = 0; // min
+    quint32 mTreatmentDuration                  = 0; // min
+    quint32 mHeparinDeliveryDuration            = 0; // min
     quint32 mHeparinType                        = 0; // <options>
-    quint32 mAcidConcentrate                    = 0; // <options>
-    quint32 mBicarbonateConcentrate             = 0; // <options>
+    quint32 mDryBicarbCartSize                  = 0; // <options>
+    quint32 mSodium                             = 0; // mEq/L
+    quint32 mBicarbonate                        = 0; // mEq/L
     quint32 mDialyzerType                       = 0; // <options>
-    quint32 mBloodPressureMeasureInterval       = 0; // minutes
-    quint32 mRinsebackFlowRate                  = 0; // mL/min
+    quint32 mFluidBolusVolume                   = 0; // mL
+    quint32 mBloodPressureMeasureInterval       = 0; // min
+    quint32 mPrimeDiscardVolume                 = 0; // mL
     quint32 mRinsebackVolume                    = 0; // mL
-    qint32  mArterialPressureLimitWindow        = 0; // mmHg
-    qint32  mVenousPressureLimitWindow          = 0; // mmHg
-    qint32  mVenousPressureLimitAsymtrc         = 0; // mmHg
-    qint32  mTransmembranePressureLimitWindow   = 0; // mmHg
-    float   mDialysateTemp                      = 0; // Celsius
-    float   mHeparinDispensingRate              = 0; // mL/hr
+    quint32 mHepatitusBStatus                   = 0; // <options>
+    float   mSubstitutionFluidVolume            = 0; // L
     float   mHeparinBolusVolume                 = 0; // mL
+    float   mHeparinDispensingRate              = 0; // mL/hr
+    float   mDialysateTemp                      = 0; // Celsius
+    float   mPotassium                          = 0; // mEq/L
+    float   mCalcium                            = 0; // mEq/L
 
     QString toString() {
         return toString({
-            mBloodFlowRate                      ,
-            mDialysateFlowRate                  ,
-            mTreatmentDuration                  ,
-            mSalineBolusVolume                  ,
-            mHeparinStopTime                    ,
-            mHeparinType                        ,
-            mAcidConcentrate                    ,
-            mBicarbonateConcentrate             ,
-            mDialyzerType                       ,
-            mBloodPressureMeasureInterval       ,
-            mRinsebackFlowRate                  ,
-            mRinsebackVolume                    ,
-            mArterialPressureLimitWindow        ,
-            mVenousPressureLimitWindow          ,
-            mVenousPressureLimitAsymtrc         ,
-            mTransmembranePressureLimitWindow   ,
-            mDialysateTemp                      ,
-            mHeparinDispensingRate              ,
-            mHeparinBolusVolume                 ,
+            mTreatmentModality              ,
+            mHDFTreatmentMode               ,
+            mBloodFlowRate                  ,
+            mDialysateFlowRate              ,
+            mTreatmentDuration              ,
+            mHeparinDeliveryDuration        ,
+            mHeparinType                    ,
+            mDryBicarbCartSize              ,
+            mSodium                         ,
+            mBicarbonate                    ,
+            mDialyzerType                   ,
+            mFluidBolusVolume               ,
+            mBloodPressureMeasureInterval   ,
+            mPrimeDiscardVolume             ,
+            mRinsebackVolume                ,
+            mHepatitusBStatus               ,
+            mSubstitutionFluidVolume        ,
+            mHeparinBolusVolume             ,
+            mHeparinDispensingRate          ,
+            mDialysateTemp                  ,
+            mPotassium                      ,
+            mCalcium                        ,
         });
     }
     static QString toString(const QVariantList &vParameters) {