diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
index c6bcfbdc11b072802c3940d6a978620ceda09d4e..a9f1b61bfaa40c846b909fe08816907746e41019 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
+++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
@@ -121,21 +121,27 @@ Foam::Ar::Ar
 
 Foam::Ar::Ar(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    Ar()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::Ar::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const Ar& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
index f5710401d849a46e6933f71de7f5c10c7748a0b1..a84320b96dd412fa4400fc00b83a8c44c0201113 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
+++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
@@ -79,6 +79,8 @@ class Ar
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("Ar");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const Ar& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const Ar& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const Ar& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
index 5d82ef6da102fd8f37c5b4f2a0d3b0616fe8dfe2..14937565f914ca3cd7b968be68390ddd86111093 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
@@ -129,21 +129,27 @@ Foam::C10H22::C10H22
 
 Foam::C10H22::C10H22(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C10H22()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C10H22::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C10H22& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
index 2f747a27bdfcdfa8de14a0632ac43d5891e34289..216acbf1581655e882d78b569622e7683170d820 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
@@ -79,6 +79,8 @@ class C10H22
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C10H22");
 
@@ -165,34 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
-
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C10H22& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C10H22& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C10H22& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
index 3f5271210f2a84cac858d0cd4afc784d75788d24..9dbc1dcee9a7ac155f11bfe71f116446cfa6e141 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
@@ -121,21 +121,27 @@ Foam::C12H26::C12H26
 
 Foam::C12H26::C12H26(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C12H26()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C12H26::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C12H26& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
index 23c1ad9077c00319e05f7b60c15bc6ccf465d756..e50af5035fc5c854d1bc29c7fdc967702cd9ab58 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
@@ -79,6 +79,8 @@ class C12H26
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C12H26");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C12H26& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C12H26& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C12H26& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
index a4011182ab43c9469bd8bd612d9905f8f7a9fb3b..8c046e73e50cab018357c0460047102ffd3497e4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
@@ -129,21 +129,27 @@ Foam::C13H28::C13H28
 
 Foam::C13H28::C13H28(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C13H28()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C13H28::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C13H28& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
index 4ed22aafebd027e6cf3242956035b722079699a9..c8ebfdfdb0a2c0ef92d74e1b1b8233104197e033 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
@@ -79,6 +79,8 @@ class C13H28
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C13H28");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C13H28& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C13H28& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C13H28& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
index 98fbbc8f7fbcade263413eccdf1935bfab3a3cd7..63533f8ae2ee88c6720b687e5a3467811877c657 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
@@ -129,21 +129,27 @@ Foam::C14H30::C14H30
 
 Foam::C14H30::C14H30(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C14H30()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C14H30::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C14H30& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
index bfa65436d5fa83a01d7855fd2ab60b7f8d631f51..68351c2d4111d725c985a8804571d56cc12549e8 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
@@ -79,6 +79,8 @@ class C14H30
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C14H30");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C14H30& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C14H30& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C14H30& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
index 12a00555b5b54819a2b0fffadd6ebe7742e22d24..bb9c5355d2131156b318295aa8228c94f4e5aad6 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
@@ -129,21 +129,27 @@ Foam::C16H34::C16H34
 
 Foam::C16H34::C16H34(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C16H34()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C16H34::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C16H34& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
index 36085db54b33642bab940ea9770c93c87042d382..a42139cc5aed0e0be5085c344a3d88e2ee952e35 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
@@ -79,6 +79,8 @@ class C16H34
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C16H34");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C16H34& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C16H34& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C16H34& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
index a9d441a9422e5b88ed92058f012e802aaf3efaad..8f80b13a480f140cfd77c32ee4f9b1db3ab8914a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
@@ -129,21 +129,27 @@ Foam::C2H5OH::C2H5OH
 
 Foam::C2H5OH::C2H5OH(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C2H5OH()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C2H5OH::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H5OH& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
index 7296b4e343ac29a6890e1708682a4aa3cfe9261b..4d06bdb04219881403934adb075461ec676d24a8 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
@@ -79,6 +79,8 @@ class C2H5OH
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C2H5OH");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H5OH& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C2H5OH& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H5OH& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
index 9cab052a77c57144ffecbfca8a56da97597cd7a9..bfa922171b8c41c4cecd7b0d8498a1c10fa3c563 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
@@ -120,21 +120,27 @@ Foam::C2H6::C2H6
 
 Foam::C2H6::C2H6(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C2H6()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C2H6::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H6& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
index ebed8aa44c69649feb56286945ed8c8116ba27f7..9f69f702988b6d500a5895ef6f2ce1e776f70acc 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
@@ -79,6 +79,8 @@ class C2H6
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C2H6");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H6& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C2H6& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H6& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
index bf0528dc0dc4b83b6706aaa8917256b7860eff2d..94c46d94c107ecf4bedb9c0425691cf41a4f8c04 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
@@ -130,21 +130,27 @@ Foam::C2H6O::C2H6O
 
 Foam::C2H6O::C2H6O(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C2H6O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C2H6O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H6O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
index 0477b7993e4accb5b2e2a2af9020a97728b897f8..ec54cee6c30e715c167e005c0fee6769be808ba4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
@@ -79,6 +79,8 @@ class C2H6O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C2H6O");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H6O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C2H6O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H6O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
index f617fd592f07869fe92ffa3e0ad9cd0b5ee01ad9..8495142bfb88756f75bffd539027d0a1f5fa7440 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
@@ -129,21 +129,27 @@ Foam::C3H6O::C3H6O
 
 Foam::C3H6O::C3H6O(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C3H6O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C3H6O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C3H6O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
index 9cafa3431377e8eb065813df3a582b35bf3f853f..f1f770a5244f1ada723d0034b26860d66234e9d9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
@@ -79,6 +79,8 @@ class C3H6O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C3H6O");
 
@@ -165,34 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-
-        friend Ostream& operator<<(Ostream& os, const C3H6O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C3H6O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C3H6O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
index 58abb7117e4ee43e180a0b44c86b616c391cf711..6c827993e12d6f0e882702482f9cb17fe0e22d76 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
@@ -119,21 +119,27 @@ Foam::C3H8::C3H8
 
 Foam::C3H8::C3H8(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C3H8()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C3H8::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C3H8& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
index 9d451dcd62ec1702727239c22ae8a770ec98a9e6..950b6e6085c08f1af5770d65bc697c62e7ab7ce1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
@@ -79,6 +79,8 @@ class C3H8
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C3H8");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C3H8& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C3H8& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C3H8& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
index 1012d7bcf1c7cea07fd19f49a1a7de2086434e59..581e38fc3348f7708dbdb156ae243d1989d570c9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
@@ -129,21 +129,27 @@ Foam::C4H10O::C4H10O
 
 Foam::C4H10O::C4H10O(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C4H10O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C4H10O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C4H10O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
index 16072f1c86f831c649eb26937bea2732d256ab8b..1049d3692fa27dc4216383d7b507e555f030a275 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
@@ -79,6 +79,8 @@ class C4H10O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C4H10O");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C4H10O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C4H10O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C4H10O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
index dfd50d0e3ad1b6c32b6c8c5c5f7772fac028478c..91cfa8f91dfe248c395c2b35729b19c0b7e8912c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
@@ -129,21 +129,27 @@ Foam::C6H14::C6H14
 
 Foam::C6H14::C6H14(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C6H14()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C6H14::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C6H14& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
index 9769fc41dddc90376119fa0b2f354c3146520b5d..da6301802ffbfa5a10234c97d39267241f3f1a52 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
@@ -79,6 +79,8 @@ class C6H14
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C6H14");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C6H14& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C6H14& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C6H14& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
index a4c10bea045a0e94825b8c4978efe6b0745df0ad..fcce3cb513f7a331fa4a6abe8a31999e37d15fde 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
@@ -129,21 +129,27 @@ Foam::C6H6::C6H6
 
 Foam::C6H6::C6H6(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C6H6()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C6H6::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C6H6& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
index 260f228e8ccbb9f19cb32f61be98407ce8ebae81..da7a6f32bea6ace32473f868d2c7528adb5d0778 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
@@ -79,6 +79,8 @@ class C6H6
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C6H6");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C6H6& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C6H6& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C6H6& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
index c2032f5479964a7e38e9ba8ffcf62d3ec6833d74..d8e1101f1b8a7df3ab02a16e6770eb8eeae0688e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
@@ -128,21 +128,27 @@ Foam::C7H16::C7H16
 
 Foam::C7H16::C7H16(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C7H16()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C7H16::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C7H16& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
index f18c7bf38985dafac88f10542bbbf02156fbd8b9..c30a0d4cdceb6dc4a24157a962216735856e2c62 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
@@ -79,6 +79,8 @@ class C7H16
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C7H16");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C7H16& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C7H16& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C7H16& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
index 8b070065b1ca1087e02bfd7b3ee678b66390c53b..142a20a09d8e5d92378cab6cf7a99a0196c9b359 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
@@ -129,21 +129,27 @@ Foam::C7H8::C7H8
 
 Foam::C7H8::C7H8(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C7H8()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C7H8::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C7H8& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
index 28e018d7f2b6677cfa0510fa3f291ee3443bb5ef..16bbb8364a34ef2e0a34863b56a201ce622855c5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
@@ -79,6 +79,8 @@ class C7H8
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C7H8");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C7H8& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C7H8& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C7H8& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
index 95822a69fd113aaa68bef21a606fc8b415737703..99f021fa030cf3156f55b29a7fa106e73e169b36 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
@@ -129,21 +129,27 @@ Foam::C8H10::C8H10
 
 Foam::C8H10::C8H10(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C8H10()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C8H10::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C8H10& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
index d53a9dc7612a381d37dc236b2b8384cb752d6cb2..856071437efc6e3b62288db6cc696f5f626c0bf4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
@@ -78,6 +78,8 @@ class C8H10
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C8H10");
 
@@ -164,33 +166,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C8H10& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C8H10& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C8H10& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
index 0bd8dad72114a8b22d14895ed1ad1afdafc4a643..290984601adaa11058520d27cc2182b8257db100 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
@@ -129,21 +129,27 @@ Foam::C8H18::C8H18
 
 Foam::C8H18::C8H18(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C8H18()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C8H18::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C8H18& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
index 3146c7f788508a43afee5ff478457b5e36f3620f..caf1ad885a65cea5c1370b3407203fbc1e7b01a1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
@@ -79,6 +79,8 @@ class C8H18
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C8H18");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C8H18& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C8H18& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C8H18& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
index 803ec867f9c1b24e200ae4538e277fe4afa39652..2062ef8edab51bea6ef193e450af27eb0712e3d8 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
@@ -129,21 +129,27 @@ Foam::C9H20::C9H20
 
 Foam::C9H20::C9H20(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C9H20()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C9H20::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C9H20& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
index 61ea898d96fd30399c08cc17a1d688090da20d65..72d2d6f9378afe02c66f9628f0b83bb7779ed334 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
@@ -79,6 +79,8 @@ class C9H20
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C9H20");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C9H20& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C9H20& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C9H20& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
index 7e3918fc71b645596126a68b0ab21d1e0382b841..3e21b663364cdd29b6e9b3446d91279d5d6b13ec 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
@@ -129,21 +129,27 @@ Foam::CH3OH::CH3OH
 
 Foam::CH3OH::CH3OH(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    CH3OH()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::CH3OH::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const CH3OH& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
index 705493ab0256a9adb3b9a33221b523e80637f8ab..0d359ed8311e1bb8c378469b5de68d25f9ded2cb 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
@@ -79,6 +79,8 @@ class CH3OH
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("CH3OH");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const CH3OH& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const CH3OH& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const CH3OH& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
index 7c218a20b7d3d55bd77ac4bdf07208de302cbe09..b7120cbed033a65d88fbdefd8bc4e40ede4dbe84 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
@@ -113,21 +113,27 @@ Foam::CH4N2O::CH4N2O
 
 Foam::CH4N2O::CH4N2O(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    CH4N2O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::CH4N2O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const CH4N2O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
index 3a459e2a95281315092b7a7d3ed530eea2fede9f..2e8be163aced519b04bb393ca0b7c2d88e25d616 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
@@ -79,6 +79,8 @@ class CH4N2O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("CH4N2O");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const CH4N2O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const CH4N2O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const CH4N2O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
index 5f705a706765a43ba9dc82a8f79cc886209978cb..eb211a946f2e8730593ec61062577a326de9a30c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
@@ -138,25 +138,24 @@ Foam::H2O::H2O(const dictionary& dict)
 :
     H2O()
 {
-//     liquidProperties(dict),
-//     rho_(dict.subDict("rho")),
-    InfoInFunction;
-    if (dict.found("rho"))
-    {
-        rho_ = NSRDSfunc5(dict.subDict("rho"));
-    }
-//     pv_(dict.subDict("pv")),
-//     hl_(dict.subDict("hl")),
-//     Cp_(dict.subDict("Cp")),
-//     h_(dict.subDict("h")),
-//     Cpg_(dict.subDict("Cpg")),
-//     B_(dict.subDict("B")),
-//     mu_(dict.subDict("mu")),
-//     mug_(dict.subDict("mug")),
-//     kappa_(dict.subDict("K")),
-//     kappag_(dict.subDict("kappag")),
-//     sigma_(dict.subDict("sigma")),
-//     D_(dict.subDict("D"))
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::H2O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const H2O& l)
+{
+    l.writeData(os);
+    return os;
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
index 542dfd66c430aaa59d70a0c514debc4086acb3cb..dfa48fd32c4551f255ba91595e7fb97d147221e7 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
@@ -78,6 +78,8 @@ class H2O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("H2O");
 
@@ -164,33 +166,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const H2O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const H2O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const H2O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
index 77ba4be1d1e3f488544873e9368c535273511676..7f6bd4a9230df3cd3c565a24cd200125aa44795b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
@@ -129,21 +129,27 @@ Foam::IC8H18::IC8H18
 
 Foam::IC8H18::IC8H18(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    IC8H18()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::IC8H18::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const IC8H18& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
index 9a2e06fdf6fb420d00d337eb9420d4b04d4ad628..9be7f5885cd0d0d6d8eb64e057be591902dbc161 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
@@ -79,6 +79,8 @@ class IC8H18
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("IC8H18");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const IC8H18& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const IC8H18& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const IC8H18& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
index 01777a26ce66b6a10d301dc6124618510ba89dac..99bf130a16a6760ccb7858cfc6b682791b4f5f30 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
+++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
@@ -149,21 +149,27 @@ Foam::IDEA::IDEA
 
 Foam::IDEA::IDEA(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    IDEA()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::IDEA::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const IDEA& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
index b34a7db9e9901f41ad51761a85354a0ed318831f..dccf97c4fcc06a3a345d8a9afbc32d4cf6633e4d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
+++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
@@ -101,6 +101,8 @@ class IDEA
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("IDEA");
 
@@ -187,32 +189,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const IDEA& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const IDEA& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const IDEA& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
index d98ef565b1968152d4ff15ea9b239dd7c5b598bd..d101add34efe70bcaf972a0b2fca70bfbdcedb53 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
+++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
@@ -113,21 +113,27 @@ Foam::MB::MB
 
 Foam::MB::MB(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    MB()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::MB::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const MB& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
index 4f7e5a5db75a94c0f07d7f743513695c1fe2cd86..9b0c7fd430891accdbd2c15b84a8e0b02b382a8a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
+++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
@@ -79,6 +79,8 @@ class MB
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("MB");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const MB& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const MB& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const MB& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
index f22e3b068835435a4a70f45dfcf833f11c2125b1..67e7f4b89aa0a8287bddc32825ea8d65c34196e9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
+++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
@@ -129,21 +129,27 @@ Foam::N2::N2
 
 Foam::N2::N2(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    N2()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::N2::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const N2& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
index 9bcc0cb67a2283aae5bd41cc48a4909315e78e94..db637e421f4e77693a4147d996bb1e4b3d9f40d6 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
+++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
@@ -79,6 +79,8 @@ class N2
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("N2");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const N2& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const N2& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const N2& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
index 562a59198b8e41de4f97ce7ca39efda821114563..09a765204a1bccbc24af96ad3a72dee0d9c83eaa 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
@@ -121,21 +121,27 @@ Foam::aC10H7CH3::aC10H7CH3
 
 Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    aC10H7CH3()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::aC10H7CH3::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const aC10H7CH3& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
index 04bdf872003a9158ce77eb7dc57dc663f9a969df..370609e2f6f6cffe8f4c956a3f20fcc7e82b881f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
@@ -79,6 +79,8 @@ class aC10H7CH3
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("aC11H10");
 
@@ -165,34 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
-
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const aC10H7CH3& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const aC10H7CH3& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const aC10H7CH3& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
index d2c2fd82d5b86a6ce73b13187b812c68d94315f4..5392da1737e3da7c9dc3981e65c377e1d5354ee5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
@@ -122,21 +122,27 @@ Foam::bC10H7CH3::bC10H7CH3
 
 Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    bC10H7CH3()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::bC10H7CH3::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const bC10H7CH3& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
index 6f8966edf9ef9ba15c68d56b16d59a4e7de4f085..07e700773d07a841b0fb6a9cd96207cbc4a899bb 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
@@ -79,6 +79,8 @@ class bC10H7CH3
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("bC11H10");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const bC10H7CH3& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const bC10H7CH3& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const bC10H7CH3& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
index c77141a9b11ed95e18b521607324e0f74e0be889..bcb9b432548ea945eb9c33746e73f8e231101b30 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
@@ -129,21 +129,27 @@ Foam::iC3H8O::iC3H8O
 
 Foam::iC3H8O::iC3H8O(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    iC3H8O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::iC3H8O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const iC3H8O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
index bac19d8d72e6ab29981fbde6780be4105cbecf53..4f616f79d3404285123a04bbaca8c11415648e2b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
@@ -77,6 +77,8 @@ class iC3H8O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("iC3H8O");
 
@@ -164,33 +166,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const iC3H8O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const iC3H8O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const iC3H8O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index c5db6942fcab66140316bb47a33c69ff19d75637..fa98b40945c031489570fa37f44880f862ab6aa2 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
@@ -275,6 +275,22 @@ Foam::scalar Foam::liquidProperties::pvInvert(scalar p) const
 }
 
 
+void Foam::liquidProperties::readIfPresent(const dictionary &dict)
+{
+    dict.readIfPresent("W", W_);
+    dict.readIfPresent("Tc", Tc_);
+    dict.readIfPresent("Pc", Pc_);
+    dict.readIfPresent("Vc", Vc_);
+    dict.readIfPresent("Zc", Zc_);
+    dict.readIfPresent("Tt", Tt_);
+    dict.readIfPresent("Pt", Pt_);
+    dict.readIfPresent("Tb", Tb_);
+    dict.readIfPresent("dipm", dipm_);
+    dict.readIfPresent("omega", omega_);
+    dict.readIfPresent("delta", delta_);
+}
+
+
 void Foam::liquidProperties::writeData(Ostream& os) const
 {
     os  << W_ << token::SPACE
@@ -291,4 +307,13 @@ void Foam::liquidProperties::writeData(Ostream& os) const
 }
 
 
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const liquidProperties& l)
+{
+    l.writeData(os);
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
index 54eb237b1aebd0d594de83a7072d20fdccf369ef..987f81a30e015bae5e41aebd01ea61da21980e51 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
@@ -284,18 +284,47 @@ public:
 
     // I-O
 
+        //- Read and set the properties present it the given dictionary
+        void readIfPresent(const dictionary& dict);
+
+        //- Read and set the function coefficients
+        //  if present it the given dictionary
+        template<class Func>
+        inline void readIfPresent
+        (
+            Func& f,
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Read and set the function coefficients
+        //  if present it the given dictionary
+        template<class Liquid>
+        inline void readIfPresent
+        (
+            Liquid& l,
+            const dictionary& dict
+        );
+
         //- Write the function coefficients
         virtual void writeData(Ostream& os) const;
 
+        //- Write the data for each of the property functions
+        template<class Liquid>
+        inline void writeData
+        (
+            const Liquid& l,
+            Ostream& os
+        ) const;
+
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const liquidProperties& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const liquidProperties& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const liquidProperties& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
index 61a0b8d5f94af7ac9926e42e9b63a1100c701fa2..fb53db8c44f56db127d535b3e9784d3c2ec6fcc4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
@@ -137,4 +137,67 @@ inline Foam::scalar Foam::liquidProperties::alphah(scalar p, scalar T) const
 }
 
 
+template<class Func>
+inline void Foam::liquidProperties::readIfPresent
+(
+    Func& f,
+    const word& name,
+    const dictionary& dict
+)
+{
+    if (dict.found(name))
+    {
+        f = Func(dict.subDict(name));
+    }
+}
+
+
+template<class Liquid>
+inline void Foam::liquidProperties::readIfPresent
+(
+    Liquid& l,
+    const dictionary& dict
+)
+{
+    l.liquidProperties::readIfPresent(dict);
+    readIfPresent(l.rho_, "rho", dict);
+    readIfPresent(l.pv_, "pv", dict);
+    readIfPresent(l.hl_, "hl", dict);
+    readIfPresent(l.Cp_, "Cp", dict);
+    readIfPresent(l.h_, "h", dict);
+    readIfPresent(l.Cpg_, "Cpg", dict);
+    readIfPresent(l.B_, "B", dict);
+    readIfPresent(l.mu_, "mu", dict);
+    readIfPresent(l.mug_, "mug", dict);
+    readIfPresent(l.kappa_, "K", dict);
+    readIfPresent(l.kappag_, "kappag", dict);
+    readIfPresent(l.sigma_, "sigma", dict);
+    readIfPresent(l.D_, "D", dict);
+}
+
+
+template<class Liquid>
+inline void Foam::liquidProperties::writeData
+(
+    const Liquid& l,
+    Ostream& os
+) const
+{
+    l.liquidProperties::writeData(os); os << nl;
+    l.rho_.writeData(os); os << nl;
+    l.pv_.writeData(os); os << nl;
+    l.hl_.writeData(os); os << nl;
+    l.Cp_.writeData(os); os << nl;
+    l.h_.writeData(os); os << nl;
+    l.Cpg_.writeData(os); os << nl;
+    l.B_.writeData(os); os << nl;
+    l.mu_.writeData(os); os << nl;
+    l.mug_.writeData(os); os << nl;
+    l.kappa_.writeData(os); os << nl;
+    l.kappag_.writeData(os); os << nl;
+    l.sigma_.writeData(os); os << nl;
+    l.D_.writeData(os); os << endl;
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
index 419c0c19205933a539e003e070b74275b2249e7e..dc2fac5b9b66eae92a6502e4c7653e510612ff0e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
@@ -129,21 +129,27 @@ Foam::nC3H8O::nC3H8O
 
 Foam::nC3H8O::nC3H8O(const dictionary& dict)
 :
-    liquidProperties(dict),
-    rho_(dict.subDict("rho")),
-    pv_(dict.subDict("pv")),
-    hl_(dict.subDict("hl")),
-    Cp_(dict.subDict("Cp")),
-    h_(dict.subDict("h")),
-    Cpg_(dict.subDict("Cpg")),
-    B_(dict.subDict("B")),
-    mu_(dict.subDict("mu")),
-    mug_(dict.subDict("mug")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    nC3H8O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::nC3H8O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const nC3H8O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
index d5dec6a855b8839dec55b9d1d4c7c36e6c2c47be..578e57bb2243ec8681ac6450d772ee383028998d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
@@ -77,6 +77,8 @@ class nC3H8O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("nC3H8O");
 
@@ -164,33 +166,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const nC3H8O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const nC3H8O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const nC3H8O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam