Index: sources/model/hd/data/MTreatmentStatesData.h
===================================================================
diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67
--- sources/model/hd/data/MTreatmentStatesData.h	(.../MTreatmentStatesData.h)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
+++ sources/model/hd/data/MTreatmentStatesData.h	(.../MTreatmentStatesData.h)	(revision 30f83b2813e68ae3c2806399bf808b642c215b67)
@@ -17,43 +17,43 @@
 #include <QString>
 
 // Project
+#include "MAbstract.h"
 #include "types.h"
 
 // forward declarations
 class tst_models;
 
 namespace Model {
 
-class MTreatmentState {
+class MTreatmentStates : public MAbstract {
 
     // friends
     friend class ::tst_models;
 
-public:
-    QString  stringPrefix = "Treatment State";
-    struct Data {
-        quint32    mSubMode     = 0;  /*!< Sub-Mode     value of type quint32  extracted out */
-        quint32    mUFState     = 0;  /*!< UF State     value of type quint32  extracted out */
-        quint32    mSalineState = 0;  /*!< Saline State value of type quint32  extracted out */
-    };
+    Type_Enum    typeText  () const override { return Type_Enum::eDatum; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eHD   ; }
+    QString      infoText  () const override { return QString("TreatmentStates"); }
+    QVariantList parameters() const override;
 
-private:
     struct {
         Types::U32 mSubMode        ;
         Types::U32 mUFState        ;
         Types::U32 mSalineState    ;
     } _data;
 
 public:
-    MTreatmentState() { }
+    struct Data {
+        quint32    mSubMode     = 0;  /*!< Sub-Mode     value of type quint32  extracted out */
+        quint32    mUFState     = 0;  /*!< UF State     value of type quint32  extracted out */
+        quint32    mSalineState = 0;  /*!< Saline State value of type quint32  extracted out */
+    };
 
-    QString toString        (                               ) const ;
-    void    toVariantList   (      QVariantList &vData      ) const ;
-    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr);
+    MTreatmentStates() { }
 
-    Data    data() const;
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
 };
 
 }
 
-typedef Model::MTreatmentState::Data TreatmentStateData;
+typedef Model::MTreatmentStates::Data TreatmentStateData;