diff --git a/ogstools/materiallib/data/bentonite.yml b/ogstools/materiallib/data/bentonite.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fb7a37e928538f100332bffe43ebd130640197b7
--- /dev/null
+++ b/ogstools/materiallib/data/bentonite.yml
@@ -0,0 +1,50 @@
+name: bentonite
+group: medium
+solid_properties:
+  density:
+    - type: Constant
+      value: 2500
+      unit: kg/m³
+  specific_heat_capacity:
+    - type: Constant
+      value: 900
+      unit: J/(kg·K)
+  thermal_conductivity:
+    - type: Constant
+      value: 0.6
+      unit: W/(m·K)
+  thermal_expansivity:
+    - type: Constant
+      value: 2.0e-5
+      unit: 1/K
+medium_properties:
+  porosity:
+    - type: Constant
+      value: 0.4
+      unit: 1
+  permeability:
+    - type: Constant
+      value: 1.0e-20
+      unit: m²
+  saturation:
+    - type: VanGenuchten
+      residual_liquid_saturation: 0.05
+      residual_gas_saturation: 1e-15
+      exponent: 0.6
+      p_b: 2.0e6
+  bishops_effective_stress:
+    - type: function
+      value: 1.0
+      unit: 1
+  biot_coefficient:
+    - type: Constant
+      value: 1.0
+      unit: 1
+  youngs_modulus:
+    - type: Constant
+      value: 1.0e9
+      unit: Pa
+  poisson_ratio:
+    - type: Constant
+      value: 0.35
+      unit: 1
\ No newline at end of file
diff --git a/ogstools/materiallib/data/concrete.yml b/ogstools/materiallib/data/concrete.yml
new file mode 100644
index 0000000000000000000000000000000000000000..534f988b29df345b1b3ca120009f1d28b5508d10
--- /dev/null
+++ b/ogstools/materiallib/data/concrete.yml
@@ -0,0 +1,50 @@
+name: concrete
+group: medium
+solid_properties:
+  density:
+    - type: Constant
+      value: 2400
+      unit: kg/m³
+  specific_heat_capacity:
+    - type: Constant
+      value: 880
+      unit: J/(kg·K)
+  thermal_conductivity:
+    - type: Constant
+      value: 1.4
+      unit: W/(m·K)
+  thermal_expansivity:
+    - type: Constant
+      value: 1.0e-5
+      unit: 1/K
+medium_properties:
+  porosity:
+    - type: Constant
+      value: 0.12
+      unit: 1
+  permeability:
+    - type: Constant
+      value: 1.0e-18
+      unit: m²
+  saturation:
+    - type: VanGenuchten
+      residual_liquid_saturation: 0.05
+      residual_gas_saturation: 1e-15
+      exponent: 0.6
+      p_b: 2.0e6
+  bishops_effective_stress:
+    - type: function
+      value: 1.0
+      unit: 1
+  biot_coefficient:
+    - type: Constant
+      value: 0.6
+      unit: 1
+  youngs_modulus:
+    - type: Constant
+      value: 3.e10
+      unit: Pa
+  poisson_ratio:
+    - type: Constant
+      value: 0.2
+      unit: 1
\ No newline at end of file
diff --git a/ogstools/materiallib/data/opalinus.yml b/ogstools/materiallib/data/opalinus.yml
index 0716b63c6d21db9998d9f86571bd10fe4aed2a47..160e2dcf1a83a422785c89e5120d0646467d69dc 100644
--- a/ogstools/materiallib/data/opalinus.yml
+++ b/ogstools/materiallib/data/opalinus.yml
@@ -1,32 +1,30 @@
-name: Opalinuston
+name: opalinus_clay
 group: medium
-#type: Solid
 solid_properties:
   density:
-    value: 2500
-    unit: kg/m³
-  specific_heat_capacity:
-    value: 800
-    unit: J/(kg·K)
+    - type: Constant
+      value: 2500
+      unit: kg/m³
   thermal_conductivity:
-    value: 2.0
-    unit: W/(m·K)
-  thermal_expansivity:
-    value: 3.0e-6
-    unit: 1/K
+    - type: Constant
+      value: 2.0
+      unit: W/(m·K)
 medium_properties:
   porosity:
-    value: 0.15
-    unit: 1
-  permeability:
-    value: 1.0e-18
-    unit: m²
-  tortuosity:
-    value: 1.0
-    unit: 1
+    - type: Constant
+      value: 0.15
+      unit: 1
   saturation:
-    type: VanGenuchten
-    residual_liquid_saturation: 0.01
-    residual_gas_saturation: 1e-15
-    exponent: 0.45
-    p_b: 1.8e6
+    - type: VanGenuchten
+      residual_liquid_saturation: 0.01
+      residual_gas_saturation: 1e-15
+      exponent: 0.45
+      p_b: 1.8e6
+  youngs_modulus:
+    - type: Constant
+      value: 6.5e9
+      unit: Pa
+  poisson_ratio:
+    - type: Constant
+      value: 0.23
+      unit: 1
\ No newline at end of file
diff --git a/ogstools/materiallib/data/steel.yml b/ogstools/materiallib/data/steel.yml
index b3078011c5d6a73afc942cdbffaf05a1667a100f..5177cded7386e7457e9603187655a679db30108c 100644
--- a/ogstools/materiallib/data/steel.yml
+++ b/ogstools/materiallib/data/steel.yml
@@ -3,47 +3,47 @@ group: solid
 type: phase
 properties:
   molar_mass:
-    - type: constant
+    - type: Constant
       value: 0.055845
       unit: kg/mol
       source:
   specific_heat_capacity:
-    - type: constant
+    - type: Constant
       value: 500
       unit: J/(kg·K)
       source:
   thermal_conductivity:
-    - type: constant
+    - type: Constant
       value: 45
       unit: W/(m·K)
       source:
   density:
-    - type: constant
+    - type: Constant
       value: 7850
       unit: kg/m³
       source:
   diffusion:
-    - type: constant
+    - type: Constant
       value: 1.0e-11
       unit: m²/s
       source:
   youngs_modulus:
-    - type: constant
+    - type: Constant
       value: 2.0e11
       unit: Pa
       source:
   poisson_ratio:
-    - type: constant
+    - type: Constant
       value: 0.3
       unit: 1
       source:
   yield_strength:
-    - type: constant
+    - type: Constant
       value: 250e6
       unit: Pa
       source:
   thermal_expansion:
-    - type: constant
+    - type: Constant
       value: 1.2e-5
       unit: 1/K
       source: