diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
index 820dc02a9bf1c52d0a022def1be79b2b2ea4a8b7..4cd2dd6f0a0c8107a5515811ae4c133660e71a3b 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
@@ -21,42 +21,69 @@ stoichiometricAirFuelMassRatio  stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 1
 
 fuel
 {
-    nMoles          1;
-    molWeight       44.0962;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 );
-    lowCpCoeffs     ( 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017  );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       44.0962;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 );
+        lowCpCoeffs     ( 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017  );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
 oxidant
 {
-    nMoles          1;
-    molWeight       28.8504;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
-    lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.8504;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
+        lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 burntProducts
 {
-    nMoles         1;
-    molWeight      28.3233;
-    Tlow           200;
-    Thigh          6000;
-    Tcommon        1000;
-    highCpCoeffs   ( 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 );
-    lowCpCoeffs    ( 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 );
-    As             1.67212e-06;
-    Ts             170.672;
+    specie
+    {
+        nMoles         1;
+        molWeight      28.3233;
+    }
+    thermodynamics
+    {
+        Tlow           200;
+        Thigh          6000;
+        Tcommon        1000;
+        highCpCoeffs   ( 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 );
+        lowCpCoeffs    ( 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 );
+    }
+    transport
+    {
+        As             1.67212e-06;
+        Ts             170.672;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
index c6fe1f8df513858c773365b05a917726e6c3c4c8..7858ca8c29df990a531733eaf356e140df7df3be 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -21,28 +21,46 @@ stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ]
 
 reactants
 {
-    nMoles          1;
-    molWeight       29.2068;
-    Tlow            100;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 );
-    lowCpCoeffs     ( 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       29.2068;
+    }
+    thermodynamics
+    {
+        Tlow            100;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 );
+        lowCpCoeffs     ( 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 products
 {
-    nMoles          1;
-    molWeight       28.5396;
-    Tlow            100;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 );
-    lowCpCoeffs     ( 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.5396;
+    }
+    thermodynamics
+    {
+        Tlow            100;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 );
+        lowCpCoeffs     ( 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
index c6fe1f8df513858c773365b05a917726e6c3c4c8..7858ca8c29df990a531733eaf356e140df7df3be 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
@@ -21,28 +21,46 @@ stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ]
 
 reactants
 {
-    nMoles          1;
-    molWeight       29.2068;
-    Tlow            100;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 );
-    lowCpCoeffs     ( 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       29.2068;
+    }
+    thermodynamics
+    {
+        Tlow            100;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 );
+        lowCpCoeffs     ( 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 products
 {
-    nMoles          1;
-    molWeight       28.5396;
-    Tlow            100;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 );
-    lowCpCoeffs     ( 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.5396;
+    }
+    thermodynamics
+    {
+        Tlow            100;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 );
+        lowCpCoeffs     ( 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
index 87599e72f0db25ce09b0e3ef0ac5fcdbd011ba94..c00479033301712664d152f9795abe68681df948 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -21,28 +21,46 @@ stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ]
 
 reactants
 {
-    nMoles          24.8095;
-    molWeight       29.4649;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 );
-    lowCpCoeffs     ( 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          24.8095;
+        molWeight       29.4649;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 );
+        lowCpCoeffs     ( 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 products
 {
-    nMoles          1;
-    molWeight       28.3233;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 );
-    lowCpCoeffs     ( 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.3233;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 );
+        lowCpCoeffs     ( 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index c36b507a1e68edcf0885777b80e411a45593526f..2b04e9b62f6024e6d3c4ed19006ef086e07d1d03 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -21,41 +21,68 @@ stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ]
 
 fuel
 {
-    nMoles          1;
-    molWeight       114.23;
-    Tlow            298.15;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 19.3963 0.0488137 -1.55798e-05 2.17831e-09 -1.08391e-13 -37133.9 -78.8531 );
-    lowCpCoeffs     ( 0.429357 0.0765769 8.41306e-06 -5.86603e-08 2.79414e-11 -30446.4 25.6735 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       114.23;
+    }
+    thermodynamics
+    {
+        Tlow            298.15;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 19.3963 0.0488137 -1.55798e-05 2.17831e-09 -1.08391e-13 -37133.9 -78.8531 );
+        lowCpCoeffs     ( 0.429357 0.0765769 8.41306e-06 -5.86603e-08 2.79414e-11 -30446.4 25.6735 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 oxidant
 {
-    nMoles          1;
-    molWeight       28.8504;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 );
-    lowCpCoeffs     ( 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.8504;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 );
+        lowCpCoeffs     ( 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 burntProducts
 {
-    nMoles          1;
-    molWeight       28.6068;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.12468 0.00178578 -5.94695e-07 9.09801e-11 -5.1246e-15 -11005.8 5.03593 );
-    lowCpCoeffs     ( 3.47612 0.000758205 -3.68739e-07 1.3449e-09 -8.08868e-13 -11071.5 3.3058 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.6068;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.12468 0.00178578 -5.94695e-07 9.09801e-11 -5.1246e-15 -11005.8 5.03593 );
+        lowCpCoeffs     ( 3.47612 0.000758205 -3.68739e-07 1.3449e-09 -8.08868e-13 -11071.5 3.3058 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index 8692562e9e362e9352c3061190f4157e04fd713b..021d55435533c1b0946c50504e9f63b1d864a44a 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
@@ -25,42 +25,69 @@ qFuel           qFuel [ 0 2 -2 0 0 0 0 ] 5.00264e+07;
 
 fuel
 {
-    nMoles          1;
-    molWeight       16.0428;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
-    lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       16.0428;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
+        lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 oxidant
 {
-    nMoles          1;
-    molWeight       28.8504;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
-    lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.8504;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
+        lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 burntProducts
+{
+specie
 {
     nMoles          1;
     molWeight       27.6334;
+}
+thermodynamics
+{
     Tlow            200;
     Thigh           6000;
     Tcommon         1000;
     highCpCoeffs    ( 3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209 );
     lowCpCoeffs     ( 3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098 );
+}
+transport
+{
     As              1.67212e-06;
     Ts              170.672;
 }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
index 8692562e9e362e9352c3061190f4157e04fd713b..9060c18a70884fe51828e299fff28f54435f5828 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
@@ -25,41 +25,68 @@ qFuel           qFuel [ 0 2 -2 0 0 0 0 ] 5.00264e+07;
 
 fuel
 {
-    nMoles          1;
-    molWeight       16.0428;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
-    lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       16.0428;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
+        lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 oxidant
 {
-    nMoles          1;
-    molWeight       28.8504;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
-    lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.8504;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
+        lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 burntProducts
 {
-    nMoles          1;
-    molWeight       27.6334;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209 );
-    lowCpCoeffs     ( 3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       27.6334;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209 );
+        lowCpCoeffs     ( 3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
index 67f8e677a4cc7d3e40dded816aa8aca5bfc9a641..c1dd7198713352b704e9f6885d2f06d9c9176c76 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
@@ -17,67 +17,112 @@ FoamFile
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
-    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+        lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
-    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+        lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 CH4
 {
-    nMoles          1;
-    molWeight       16.0428;
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
-    lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       16.0428;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
+        lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 CO2
 {
-    nMoles          1;
-    molWeight       44.01;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396 );
-    lowCpCoeffs     ( 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       44.01;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396 );
+        lowCpCoeffs     ( 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
-    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+        lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index 9e271d5129b9c3f9b49414dc784b26a2a33488c7..039bbd8741fb8b1b84c33342d6dee148e27241c8 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstTh
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.96;
-    Cp              1004.5;
-    Hf              0;
-    As              1.458e-06;
-    Ts              110.4;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.96;
+    }
+    thermodynamics
+    {
+        Cp              1004.5;
+        Hf              0;
+    }
+    transport
+    {
+        As              1.458e-06;
+        Ts              110.4;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index 29cc46bb60289dc6529475d50e82a4e0b1f35139..cfd01cf55a4c36613eb8ff03d43af211c5d5373e 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -21,15 +21,24 @@ thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThe
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.01348;
-    Tlow            100;
-    Thigh           10000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 );
-    lowCpCoeffs     ( 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 );
-    As              1.458e-06;
-    Ts              110;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.01348;
+    }
+    thermodynamics
+    {
+        Tlow            100;
+        Thigh           10000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 );
+        lowCpCoeffs     ( 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 );
+    }
+    transport
+    {
+        As              1.458e-06;
+        Ts              110;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
index cb6bd7a7d6343abdd4af1e019c7eff461d7e1133..43f2a8eccbb74c2b0c30193d7de16f18924d330d 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -22,12 +22,21 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 //       and gamma = 7/5
 mixture
 {
-    nMoles          1;
-    molWeight       11640.3;
-    Cp              2.5;
-    Hf              0;
-    mu              0;
-    Pr              1;
+    specie
+    {
+        nMoles          1;
+        molWeight       11640.3;
+    }
+    thermodynamics
+    {
+        Cp              2.5;
+        Hf              0;
+    }
+    transport
+    {
+        mu              0;
+        Pr              1;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
index a3fd8e1b4ffb14794321a9cb4ee8db57f70a385c..e7f09558c3a658bf1198e4bdf0115c103aaf2a65 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -20,12 +20,21 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 mixture
 {
     // normalised gas
-    nMoles          1;
-    molWeight       11640.3;
-    Cp              2.5;
-    Hf              0;
-    mu              0;
-    Pr              1;
+    specie
+    {
+        nMoles          1;
+        molWeight       11640.3;
+    }
+    thermodynamics
+    {
+        Cp              2.5;
+        Hf              0;
+    }
+    transport
+    {
+        mu              0;
+        Pr              1;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index 81103c8d494cb631f05991accc2bcb868550d2e1..4ef114d9895d5b9d5373f6e1053314b235e46ef8 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.96;
-    Cp              1004.5;
-    Hf              2.544e+06;
-    mu              0;
-    Pr              1;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.96;
+    }
+    thermodynamics
+    {
+        Cp              1004.5;
+        Hf              2.544e+06;
+    }
+    transport
+    {
+        mu              0;
+        Pr              1;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
index a3fd8e1b4ffb14794321a9cb4ee8db57f70a385c..e7f09558c3a658bf1198e4bdf0115c103aaf2a65 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -20,12 +20,21 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 mixture
 {
     // normalised gas
-    nMoles          1;
-    molWeight       11640.3;
-    Cp              2.5;
-    Hf              0;
-    mu              0;
-    Pr              1;
+    specie
+    {
+        nMoles          1;
+        molWeight       11640.3;
+    }
+    thermodynamics
+    {
+        Cp              2.5;
+        Hf              0;
+    }
+    transport
+    {
+        mu              0;
+        Pr              1;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
index 697d53b1931c36c13e9e06382d7190dbe7c0b226..199a79480ad13a27c015dd97a61ebf8a1ecc36a9 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles      1;
-    molWeight   28.9;
-    Cp          1000;
-    Hf          0;
-    mu          1.8e-05;
-    Pr          0.7;
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1000;
+        Hf          0;
+    }
+    transport
+    {
+        mu          1.8e-05;
+        Pr          0.7;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
index 686497a1c7dd90b9709462e28e8cbff7a23befe1..9316e1b6d5b7d8138788b7e2da0b162e1ae35860 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstTh
 
 mixture
 {
-    nMoles      1;
-    molWeight   28.9;
-    Cp          1007;
-    Hf          0;
-    As          1.4792e-06;
-    Ts          116;
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    transport
+    {
+        As          1.4792e-06;
+        Ts          116;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
index c482d50e2a855cfb77f82b962cf7b7252a49d4ea..dbc09a0a0387b6c8486ab2c71e50cd4cea9e6aa3 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles      1;
-    molWeight   28.9;
-    Cp          1007;
-    Hf          0;
-    mu          1.84e-05;
-    Pr          0.7;
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    transport
+    {
+        mu          1.84e-05;
+        Pr          0.7;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
index 686497a1c7dd90b9709462e28e8cbff7a23befe1..9316e1b6d5b7d8138788b7e2da0b162e1ae35860 100644
--- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstTh
 
 mixture
 {
-    nMoles      1;
-    molWeight   28.9;
-    Cp          1007;
-    Hf          0;
-    As          1.4792e-06;
-    Ts          116;
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    transport
+    {
+        As          1.4792e-06;
+        Ts          116;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
index d5f758b90bb9fd05d3420e2dfe76bc56cc1adf4e..ec0fc8f25274ed21d905d94f50db845cc4fc8887 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstTh
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1007;
-    Hf              0;
-    As              1.4792e-06;
-    Ts              116;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1007;
+        Hf              0;
+    }
+    transport
+    {
+        As              1.4792e-06;
+        Ts              116;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index 686497a1c7dd90b9709462e28e8cbff7a23befe1..9316e1b6d5b7d8138788b7e2da0b162e1ae35860 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstTh
 
 mixture
 {
-    nMoles      1;
-    molWeight   28.9;
-    Cp          1007;
-    Hf          0;
-    As          1.4792e-06;
-    Ts          116;
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    transport
+    {
+        As          1.4792e-06;
+        Ts          116;
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
index 686497a1c7dd90b9709462e28e8cbff7a23befe1..9316e1b6d5b7d8138788b7e2da0b162e1ae35860 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstTh
 
 mixture
 {
-    nMoles      1;
-    molWeight   28.9;
-    Cp          1007;
-    Hf          0;
-    As          1.4792e-06;
-    Ts          116;
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    transport
+    {
+        As          1.4792e-06;
+        Ts          116;
+    }
 }
 
 
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
index cb6bd7a7d6343abdd4af1e019c7eff461d7e1133..43f2a8eccbb74c2b0c30193d7de16f18924d330d 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
@@ -22,12 +22,21 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 //       and gamma = 7/5
 mixture
 {
-    nMoles          1;
-    molWeight       11640.3;
-    Cp              2.5;
-    Hf              0;
-    mu              0;
-    Pr              1;
+    specie
+    {
+        nMoles          1;
+        molWeight       11640.3;
+    }
+    thermodynamics
+    {
+        Cp              2.5;
+        Hf              0;
+    }
+    transport
+    {
+        mu              0;
+        Pr              1;
+    }
 }
 
 
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index 841587595fd7daeda933cdd60b1f60ef7a4e8e06..b3f429f7c2a04ef377ff458317379bc780bbc91d 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cv              717.5;
-    Hf              0;
-    mu              0;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cv              717.5;
+        Hf              0;
+    }
+    transport
+    {
+        mu              0;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
index a1476497e6737ff5081ebd1fb94380170446d8db..d7a5cd403b11728e0fa1000806463b4c0183e4a5 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cv              717.5;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cv              717.5;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index a1476497e6737ff5081ebd1fb94380170446d8db..d7a5cd403b11728e0fa1000806463b4c0183e4a5 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cv              717.5;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cv              717.5;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
index 6e296ae69968cad6109fa91693368d34a38c6574..ee38e71e8daa291b6938d8fe86b276c9237fa078 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -21,12 +21,21 @@ pRef            100000;
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index 324a33ea6f3551daf2e843b1673f29e707860156..83df353395ec7a0b203364f44d9e7a530cd4dac5 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.96;
-    Cp              1004.4;
-    Hf              0;
-    mu              1.831e-05;
-    Pr              0.705;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.96;
+    }
+    thermodynamics
+    {
+        Cp              1004.4;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.831e-05;
+        Pr              0.705;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
index b400070d981befeebb772c20f696be61ab3e606a..4038a468726df0f89fb69395c28f3888ad1595a1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -21,12 +21,21 @@ pRef            100000;
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
index b400070d981befeebb772c20f696be61ab3e606a..4038a468726df0f89fb69395c28f3888ad1595a1 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -21,12 +21,21 @@ pRef            100000;
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
index b400070d981befeebb772c20f696be61ab3e606a..4038a468726df0f89fb69395c28f3888ad1595a1 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
@@ -21,12 +21,21 @@ pRef            100000;
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 1c4488eb5e030a7cb28293290fff08fd2e85ec38..21a24b03f066cdf17de2f63c154f1e12ce06ccd8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 7f67791ae58ab8bd27e9dcb06a5dd7e7528cc8c0..1f5767f4799a191942edc2ae74f972cf26a1abe6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
index 42988f79767257a36ec46ff37593b0b0719c6a2b..0c5de9b67c28472ab8a2bf77f3c28f0269099a00 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
@@ -19,13 +19,25 @@ hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<incompressible>>
 
 mixture
 {
-    nMoles          1;
-    molWeight       18;
-    rho             1000;
-    Cp              4181;
-    Hf              0;
-    mu              959e-6;
-    Pr              6.62;
+    specie
+    {
+        nMoles          1;
+        molWeight       18;
+    }
+    equationOfState
+    {
+        rho             1000;
+    }
+    thermodynamics
+    {
+        Cp              4181;
+        Hf              0;
+    }
+    transport
+    {
+        mu              959e-6;
+        Pr              6.62;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
index 7f67791ae58ab8bd27e9dcb06a5dd7e7528cc8c0..1f5767f4799a191942edc2ae74f972cf26a1abe6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index 1c4488eb5e030a7cb28293290fff08fd2e85ec38..21a24b03f066cdf17de2f63c154f1e12ce06ccd8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index 7f67791ae58ab8bd27e9dcb06a5dd7e7528cc8c0..1f5767f4799a191942edc2ae74f972cf26a1abe6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 1c4488eb5e030a7cb28293290fff08fd2e85ec38..21a24b03f066cdf17de2f63c154f1e12ce06ccd8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 7f67791ae58ab8bd27e9dcb06a5dd7e7528cc8c0..1f5767f4799a191942edc2ae74f972cf26a1abe6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
index 1c4488eb5e030a7cb28293290fff08fd2e85ec38..21a24b03f066cdf17de2f63c154f1e12ce06ccd8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
index 7f67791ae58ab8bd27e9dcb06a5dd7e7528cc8c0..1f5767f4799a191942edc2ae74f972cf26a1abe6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
@@ -19,12 +19,21 @@ thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 
 mixture
 {
-    nMoles          1;
-    molWeight       28.9;
-    Cp              1000;
-    Hf              0;
-    mu              1.8e-05;
-    Pr              0.7;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8
index bd3212dda06e1fd338409fde3fbe2f5997d0abc2..8aec29529c4129c22d71cec11340cd47fcd3bbd6 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8
@@ -17,62 +17,122 @@ FoamFile
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Hf              0;
-    Sf              6407.93;
-    rhoCoeffs<8>    ( 4.1388 -0.016603 3.3039e-05 -3.6455e-08 2.3302e-11 -8.5664e-15 1.6783e-18 -1.356e-22 );
-    CpCoeffs<8>     ( 904.2 -0.35136 0.0019339 -2.6639e-06 1.8222e-09 -6.75e-13 1.2962e-16 -1.0131e-20 );
-    muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
-    kappaCoeffs<8>  ( -0.0017889 9.5996e-05 -3.129e-08 7.9407e-12 -8.1996e-16 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 4.1388 -0.016603 3.3039e-05 -3.6455e-08 2.3302e-11 -8.5664e-15 1.6783e-18 -1.356e-22 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              6407.93;
+        CpCoeffs<8>     ( 904.2 -0.35136 0.0019339 -2.6639e-06 1.8222e-09 -6.75e-13 1.2962e-16 -1.0131e-20 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
+        kappaCoeffs<8>  ( -0.0017889 9.5996e-05 -3.129e-08 7.9407e-12 -8.1996e-16 0 0 0 );
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Hf              -13424600;
-    Sf              10475.4;
-    rhoCoeffs<8>    ( 2.3302 -0.0093477 1.8601e-05 -2.0524e-08 1.3119e-11 -4.8229e-15 9.4489e-19 -7.6342e-23 );
-    CpCoeffs<8>     ( 1570.5 1.6886 -0.0039382 6.2482e-06 -4.9342e-09 2.0513e-12 -4.3361e-16 3.6812e-20 );
-    muCoeffs<8> ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
-    kappaCoeffs<8>  ( 0.0069975 0.00013726 8.6579e-09 -7.1514e-12 8.441e-16 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 2.3302 -0.0093477 1.8601e-05 -2.0524e-08 1.3119e-11 -4.8229e-15 9.4489e-19 -7.6342e-23 );
+    }
+    thermodynamics
+    {
+        Hf              -13424600;
+        Sf              10475.4;
+        CpCoeffs<8>     ( 1570.5 1.6886 -0.0039382 6.2482e-06 -4.9342e-09 2.0513e-12 -4.3361e-16 3.6812e-20 );
+    }
+    transport
+    {
+        muCoeffs<8> ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
+        kappaCoeffs<8>  ( 0.0069975 0.00013726 8.6579e-09 -7.1514e-12 8.441e-16 0 0 0 );
+    }
 }
 
 CH4
 {
-    nMoles          1;
-    molWeight       16.043;
-    Hf              -4.66836e+06;
-    Sf              11597.7;
-    rhoCoeffs<8>    ( 2.0751 -0.0083243 1.6564e-05 -1.8277e-08 1.1683e-11 -4.2949e-15 8.4144e-19 -6.7984e-23 );
-    CpCoeffs<8>     ( 996.92 4.0854 -0.00092999 1.957e-06 -2.9777e-09 1.7459e-12 -4.5594e-16 4.4774e-20 );
-    muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
-    kappaCoeffs<8>  ( -0.018501 0.00021332 1.4678e-07 -7.7129e-11 1.0936e-14 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       16.043;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 2.0751 -0.0083243 1.6564e-05 -1.8277e-08 1.1683e-11 -4.2949e-15 8.4144e-19 -6.7984e-23 );
+    }
+    thermodynamics
+    {
+        Hf              -4.66836e+06;
+        Sf              11597.7;
+        CpCoeffs<8>     ( 996.92 4.0854 -0.00092999 1.957e-06 -2.9777e-09 1.7459e-12 -4.5594e-16 4.4774e-20 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
+        kappaCoeffs<8>  ( -0.018501 0.00021332 1.4678e-07 -7.7129e-11 1.0936e-14 0 0 0 );
+    }
 }
 
 CO2
 {
-    nMoles          1;
-    molWeight       44.01;
-    Hf              -8.9423e+06;
-    Sf              4856.6;
-    rhoCoeffs<8>    ( 5.6924 -0.022836 4.544e-05 -5.014e-08 3.2048e-11 -1.1782e-14 2.3083e-18 -1.865e-22 );
-    CpCoeffs<8>     ( 462.23 1.5803 -0.0010515 7.4618e-08 3.216e-10 -1.9646e-13 4.7679e-17 -4.3027e-21 );
-    muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
-    kappaCoeffs<8>  ( -0.0076857 0.00010773 -2.7043e-08 4.4967e-12 -3.0218e-16 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       44.01;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 5.6924 -0.022836 4.544e-05 -5.014e-08 3.2048e-11 -1.1782e-14 2.3083e-18 -1.865e-22 );
+    }
+    thermodynamics
+    {
+        Hf              -8.9423e+06;
+        Sf              4856.6;
+        CpCoeffs<8>     ( 462.23 1.5803 -0.0010515 7.4618e-08 3.216e-10 -1.9646e-13 4.7679e-17 -4.3027e-21 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
+        kappaCoeffs<8>  ( -0.0076857 0.00010773 -2.7043e-08 4.4967e-12 -3.0218e-16 0 0 0 );
+    }
 }
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Hf              51.2816;
-    Sf              6836.49;
-    rhoCoeffs<8>    ( 3.6234 -0.014535 2.8924e-05 -3.1915e-08 2.0399e-11 -7.4994e-15 1.4693e-18 -1.1871e-22 );
-    CpCoeffs<8>     ( 1049.8 -0.16537 0.00036105 2.0824e-07 -5.3568e-10 3.2274e-13 -8.3335e-17 8.054e-21 );
-    muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
-    kappaCoeffs<8>  ( 0.0028213 8.6668e-05 -1.5148e-08 1.2499e-12 3.1675e-17 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 3.6234 -0.014535 2.8924e-05 -3.1915e-08 2.0399e-11 -7.4994e-15 1.4693e-18 -1.1871e-22 );
+    }
+    thermodynamics
+    {
+        Hf              51.2816;
+        Sf              6836.49;
+        CpCoeffs<8>     ( 1049.8 -0.16537 0.00036105 2.0824e-07 -5.3568e-10 3.2274e-13 -8.3335e-17 8.054e-21 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.2346e-06 6.5097e-08 -2.8362e-11 8.301e-15 -9.7467e-19 0 0 0 );
+        kappaCoeffs<8>  ( 0.0028213 8.6668e-05 -1.5148e-08 1.2499e-12 3.1675e-17 0 0 0 );
+    }
 }
 
 
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index d87c99af188240218ee9ed679375ed423f5f518a..02997b7a34ef6d8f6335369513e2153a3a63c8a9 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -17,38 +17,74 @@ FoamFile
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Hf              -13423000;
-    Sf              10482;
-    rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              -13423000;
+        Sf              10482;
+        CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    }
 }
 
 air
 {
-    nMoles          1;
-    molWeight       28.85;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-    kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
+        kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    }
 }
 
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
index 27bec3ad2f309ddf1ae1882fe19d9a3ed8eba0e0..84aa4f57dd3fd227d153c7a7342dfe275ef3c8f6 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
@@ -17,80 +17,134 @@ FoamFile
 
 CO2
 {
-    nMoles          1;
-    molWeight       44.01;
-    Tlow            0;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.85746 0.00441437 -2.21481e-06 5.2349e-10 -4.72084e-14 -48759.2 2.27164 );
-    lowCpCoeffs     ( 2.35677 0.0089846 -7.12356e-06 2.45919e-09 -1.437e-13 -48372 9.90105 );
-    As              1.67212e-06;
-    Ts              170.6;
+    specie
+    {
+        nMoles          1;
+        molWeight       44.01;
+    }
+    thermodynamics
+    {
+        Tlow            0;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.85746 0.00441437 -2.21481e-06 5.2349e-10 -4.72084e-14 -48759.2 2.27164 );
+        lowCpCoeffs     ( 2.35677 0.0089846 -7.12356e-06 2.45919e-09 -1.437e-13 -48372 9.90105 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.6;
+    }
 }
 
 CH4
 {
-    nMoles          1;
-    molWeight       16.043;
-    Tlow            0;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 0.0748515 0.0133909 -5.73286e-06 1.22293e-09 -1.01815e-13 -9468.34 18.4373 );
-    lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84743e-08 1.66694e-11 -10246.6 -4.6413 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       16.043;
+    }
+    thermodynamics
+    {
+        Tlow            0;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 0.0748515 0.0133909 -5.73286e-06 1.22293e-09 -1.01815e-13 -9468.34 18.4373 );
+        lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84743e-08 1.66694e-11 -10246.6 -4.6413 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 H2
 {
-    nMoles          1;
-    molWeight       2.01594;
-    Tlow            0;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.33728 -4.94025e-05 4.99457e-07 -1.79566e-10 2.00255e-14 -950.159 -3.20502 );
-    lowCpCoeffs     ( 2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       2.01594;
+    }
+    thermodynamics
+    {
+        Tlow            0;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.33728 -4.94025e-05 4.99457e-07 -1.79566e-10 2.00255e-14 -950.159 -3.20502 );
+        lowCpCoeffs     ( 2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Tlow            0;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.03399 0.00217692 -1.64073e-07 -9.7042e-11 1.68201e-14 -30004.3 4.96677 );
-    lowCpCoeffs     ( 4.19864 -0.00203643 6.5204e-06 -5.48797e-09 1.77198e-12 -30293.7 -0.849032 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            0;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.03399 0.00217692 -1.64073e-07 -9.7042e-11 1.68201e-14 -30004.3 4.96677 );
+        lowCpCoeffs     ( 4.19864 -0.00203643 6.5204e-06 -5.48797e-09 1.77198e-12 -30293.7 -0.849032 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Tlow            0;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.28254 0.00148309 -7.57967e-07 2.09471e-10 -2.16718e-14 -1088.46 5.45323 );
-    lowCpCoeffs     ( 3.78246 -0.00299673 9.8473e-06 -9.6813e-09 3.24373e-12 -1063.94 3.65768 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        Tlow            0;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.28254 0.00148309 -7.57967e-07 2.09471e-10 -2.16718e-14 -1088.46 5.45323 );
+        lowCpCoeffs     ( 3.78246 -0.00299673 9.8473e-06 -9.6813e-09 3.24373e-12 -1063.94 3.65768 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Tlow            0;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
-    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44485e-12 -1020.9 3.95037 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        Tlow            0;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+        lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44485e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
index 934bc094e63968a3ed44efae36abf997f12d07f0..754ea7d35aaf3fb7b84854e5f638746d6716a580 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
@@ -17,50 +17,98 @@ FoamFile
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    }
 }
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
-    CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
-    muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Hf              -13423000;
-    Sf              10482;
-    rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              -13423000;
+        Sf              10482;
+        CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    }
 }
 
 air
 {
-    nMoles          1;
-    molWeight       28.85;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-    kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    }
 }
 
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
index 934bc094e63968a3ed44efae36abf997f12d07f0..754ea7d35aaf3fb7b84854e5f638746d6716a580 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
@@ -17,50 +17,98 @@ FoamFile
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    }
 }
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
-    CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
-    muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Hf              -13423000;
-    Sf              10482;
-    rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              -13423000;
+        Sf              10482;
+        CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    }
 }
 
 air
 {
-    nMoles          1;
-    molWeight       28.85;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-    kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    }
 }
 
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index d87c99af188240218ee9ed679375ed423f5f518a..02997b7a34ef6d8f6335369513e2153a3a63c8a9 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -17,38 +17,74 @@ FoamFile
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Hf              -13423000;
-    Sf              10482;
-    rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-    kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              -13423000;
+        Sf              10482;
+        CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    }
 }
 
 air
 {
-    nMoles          1;
-    molWeight       28.85;
-    Hf              0;
-    Sf              0;
-    rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-    kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    specie
+    {
+        nMoles          1;
+        molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
+        kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    }
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
index 27c95adb95dbd74ea3ae2fee325f6a150eca5928..2514799c87caefc7ef6d1397bc7a072ed6a47969 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
@@ -17,41 +17,68 @@ FoamFile
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
-    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+        lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
-    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+        lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
-    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+        lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
index 27c95adb95dbd74ea3ae2fee325f6a150eca5928..2514799c87caefc7ef6d1397bc7a072ed6a47969 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
@@ -17,41 +17,68 @@ FoamFile
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
-    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+        lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
-    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+        lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
-    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+        lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
index 27c95adb95dbd74ea3ae2fee325f6a150eca5928..2514799c87caefc7ef6d1397bc7a072ed6a47969 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
@@ -17,41 +17,68 @@ FoamFile
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
-    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+        lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
-    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+        lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
-    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+        lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.dat
index 27c95adb95dbd74ea3ae2fee325f6a150eca5928..2514799c87caefc7ef6d1397bc7a072ed6a47969 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/foam.dat
@@ -17,41 +17,68 @@ FoamFile
 
 O2
 {
-    nMoles          1;
-    molWeight       31.9988;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
-    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+        lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 H2O
 {
-    nMoles          1;
-    molWeight       18.0153;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
-    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+        lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }
 
 N2
 {
-    nMoles          1;
-    molWeight       28.0134;
-    Tlow            200;
-    Thigh           5000;
-    Tcommon         1000;
-    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
-    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
-    As              1.67212e-06;
-    Ts              170.672;
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           5000;
+        Tcommon         1000;
+        highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+        lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
 }