diff --git a/Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml b/Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml
new file mode 100644
index 0000000000000..5f4fc77bcd23b
--- /dev/null
+++ b/Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0, 0, ([DiamondZ]-[Bcm1fZ])
+
+ 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg,
+ 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg,
+ 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml b/Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml
new file mode 100644
index 0000000000000..854092b78aabe
--- /dev/null
+++ b/Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -[ActiveAreaColumnWidth]/2.+[PixelColumnWidth]/2.,0.*mm,0.*mm
+
+
+
+
+
+
+
+
+
+
+
+ 0.*mm,-[ROCWidthY]/2.+[ActiveAreaRowWidth]-([PixelRowWidth]/2.),0.*mm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0, 0, 0
+ 0.*deg, 0.*deg, -90.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg
+
+
+
+
+
diff --git a/Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml b/Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml
new file mode 100644
index 0000000000000..3b3d9b8a29646
--- /dev/null
+++ b/Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py
index 20e3b5d31e6a0..36080e4238431 100644
--- a/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py
@@ -27,7 +27,7 @@
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',
- 'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml',
+ 'Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml',
@@ -253,8 +253,11 @@
'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',
- 'Geometry/ForwardCommonData/data/brmrotations.xml',
- 'Geometry/ForwardCommonData/data/brm/2021/v1/brm.xml',
+ 'Geometry/ForwardCommonData/data/bhm.xml',
+ 'Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml',
+ 'Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml',
+ 'Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml',
+ 'Geometry/ForwardSimData/data/bcm1fsens.xml',
'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
@@ -364,13 +367,15 @@
'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
- 'Geometry/ForwardCommonData/data/brmsens.xml',
+ 'Geometry/ForwardSimData/data/pltsens.xml',
+ 'Geometry/ForwardSimData/data/bcm1fsens.xml',
'Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml',
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/EcalSimData/data/ESProdCuts.xml',
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
+ 'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml',
diff --git a/Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml b/Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml
new file mode 100644
index 0000000000000..3a20f66d5365a
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+