diff --git a/FaserGeometryCommon/TrenchGeoModel/data/Trench.gdml b/FaserGeometryCommon/TrenchGeoModel/data/Trench.gdml
index 5249b55d6630eb96ff07e11904677133945bf397..476363b731343f73f515a5f207714252772571df 100644
--- a/FaserGeometryCommon/TrenchGeoModel/data/Trench.gdml
+++ b/FaserGeometryCommon/TrenchGeoModel/data/Trench.gdml
@@ -106,6 +106,55 @@
         <element name="Al0x11684f90">
             <fraction n="1.000000000000000e+00" ref="Al270x116850d0"/>
         </element>
+        <isotope N="1.200000000000000e+01" Z="6.000000000000000e+00" name="C120x8147220">
+          <atom unit="g/mole" value="1.200000000000000e+01"/>
+        </isotope>
+        <isotope N="1.300000000000000e+01" Z="6.000000000000000e+00" name="C130x8147270">
+          <atom unit="g/mole" value="1.300340000000000e+01"/>
+        </isotope>
+        <element name="C0x81470c0">
+        <fraction n="9.893000000000001e-01" ref="C120x8147220"/>
+        <fraction n="1.070000000000000e-02" ref="C130x8147270"/>
+        </element>
+        <isotope N="3.900000000000000e+01" Z="1.900000000000000e+01" name="K390x89fe1c0">
+            <atom unit="g/mole" value="3.896370000000000e+01"/>
+        </isotope>
+        <isotope N="4.000000000000000e+01" Z="1.900000000000000e+01" name="K400x89fe210">
+            <atom unit="g/mole" value="3.996400000000000e+01"/>
+        </isotope>
+        <isotope N="4.100000000000000e+01" Z="1.900000000000000e+01" name="K410x89fe260">
+            <atom unit="g/mole" value="4.096180000000000e+01"/>
+        </isotope>
+        <element name="K0x89fe020">
+            <fraction n="9.325810000000000e-01" ref="K390x89fe1c0"/>
+            <fraction n="1.170000000000000e-04" ref="K400x89fe210"/>
+            <fraction n="6.730200000000000e-02" ref="K410x89fe260"/>
+        </element>
+        <isotope N="1.000000000000000e+00" Z="1.000000000000000e+00" name="H10x8e31ab0">
+            <atom unit="g/mole" value="1.007825030813723e+00"/>
+        </isotope>
+        <isotope N="2.000000000000000e+00" Z="1.000000000000000e+00" name="H20x8e31b00">
+            <atom unit="g/mole" value="2.014101999666174e+00"/>
+        </isotope>
+        <element name="H0x8e31950">
+            <fraction n="9.998850000000000e-01" ref="H10x8e31ab0"/>
+            <fraction n="1.150000000000000e-04" ref="H20x8e31b00"/>
+        </element>
+        <isotope N="36" Z="18" name="Ar36Faser">
+            <atom unit="g/mole" value="35.967545105"/>
+        </isotope>
+        <isotope N="38" Z="18" name="Ar38Faser">
+            <atom unit="g/mole" value="37.96273210"/>
+        </isotope>
+        <isotope N="40" Z="18" name="Ar40Faser">
+            <atom unit="g/mole" value="39.9623831238"/>
+        </isotope>
+        <element name="ArgonFaser">
+            <fraction n="0.996035" ref="Ar40Faser"/>
+            <fraction n="0.000629" ref="Ar38Faser"/>
+            <fraction n="0.003336" ref="Ar36Faser"/>
+        </element>
+        <!--
         <material name="Concrete" state="solid">
             <MEE unit="eV" value="1.271741855079048e+02"/>
             <D unit="g/cm3" value="2.499998684602534e+00"/>
@@ -116,12 +165,29 @@
             <fraction n="2.040816326530612e-02" ref="Fe0x116859d0"/>
             <fraction n="4.081632653061224e-02" ref="Al0x11684f90"/>
         </material>
+        -->
+        <!-- Concrete and Air composition taken from ATLAS; elements/isotopes taken from LHCb -->
+        <material name="Concrete" state="solid">
+            <MEE unit="eV" value="1.271741855079048e+02"/>
+            <D unit="g/cm3" value="2.4e+00"/>
+            <fraction n="0.5" ref="O0x1167b4f0"/>
+            <fraction n="0.2" ref="Si0x8147580"/>
+            <fraction n="0.2" ref="Ca0xee154a0"/>
+            <fraction n="0.01" ref="Na0x90954f0"/>
+            <fraction n="0.014" ref="Fe0x116859d0"/>
+            <fraction n="0.03" ref="Al0x11684f90"/>
+            <fraction n="0.03" ref="C0x81470c0"/>
+            <fraction n="0.01" ref="K0x89fe020"/>
+            <fraction n="0.006" ref="H0x8e31950"/>
+        </material>
         <material name="Air" state="gas">
             <T unit="K" value="2.930000000000000e+02"/>
             <MEE unit="eV" value="8.570323231865051e+01"/>
-            <D unit="g/cm3" value="1.204999365978422e-03"/>
-            <fraction n="7.000000000000000e-01" ref="N0x8e48c30"/>
-            <fraction n="3.000000000000000e-01" ref="O0x1167b4f0"/>
+            <D unit="g/cm3" value="1.214e-03"/>
+            <fraction n="0.7494" ref="N0x8e48c30"/>
+            <fraction n="0.2369" ref="O0x1167b4f0"/>
+            <fraction n="0.0129" ref="ArgonFaser"/>
+            <fraction n="0.0008" ref="H0x8e31950"/>
         </material>
     </materials>
     <solids>