diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip2D_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip2D_v1.h
index 525ff94a215fb4caec97858527cca6f215040d05..2cf6e5237e0bfea09f931e41c876d12d96194ab1 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip2D_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip2D_v1.h
@@ -27,5 +27,5 @@ class RpcStrip2D_v1 : public RpcMeasurement_v1 {
 }  // namespace xAOD
 
 #include "AthContainers/DataVector.h"
-DATAVECTOR_BASE_FIN(xAOD::RpcStrip2D_v1, xAOD::RpcMeasurement_v1);
+DATAVECTOR_BASE(xAOD::RpcStrip2D_v1, xAOD::RpcMeasurement_v1);
 #endif
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip_v1.h
index 2cb27440df83efbe4935efe424db5a351dffbaaf..de070fdc0001c2d5ef15224daf27c51ba94a4ef0 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip_v1.h
@@ -28,5 +28,5 @@ class RpcStrip_v1 : public RpcMeasurement_v1 {
 }  // namespace xAOD
 
 #include "AthContainers/DataVector.h"
-DATAVECTOR_BASE_FIN(xAOD::RpcStrip_v1, xAOD::RpcMeasurement_v1);
+DATAVECTOR_BASE(xAOD::RpcStrip_v1, xAOD::RpcMeasurement_v1);
 #endif
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcPadHit_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcPadHit_v1.h
index 8372ea40e7a2e79e5c76ebf3e689e8c139df7eda..b4d7e7593edc0f7a603e6111638373d70dcd352c 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcPadHit_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcPadHit_v1.h
@@ -25,6 +25,6 @@ class sTgcPadHit_v1 : public sTgcMeasurement_v1 {
 }  // namespace xAOD
 
 #include "AthContainers/DataVector.h"
-DATAVECTOR_BASE_FIN(xAOD::sTgcPadHit_v1, xAOD::sTgcMeasurement_v1);
+DATAVECTOR_BASE(xAOD::sTgcPadHit_v1, xAOD::sTgcMeasurement_v1);
 
 #endif
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcStripCluster_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcStripCluster_v1.h
index 936325ea534b4be501b02e9346a2574c0becf17a..c5c558bc223f2f186722b125ad53837e7f54828c 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcStripCluster_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcStripCluster_v1.h
@@ -49,6 +49,6 @@ class sTgcStripCluster_v1 : public sTgcMeasurement_v1 {
 }  // namespace xAOD
 
 #include "AthContainers/DataVector.h"
-DATAVECTOR_BASE_FIN(xAOD::sTgcStripCluster_v1, xAOD::sTgcMeasurement_v1);
+DATAVECTOR_BASE(xAOD::sTgcStripCluster_v1, xAOD::sTgcMeasurement_v1);
 
 #endif
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcWireHit_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcWireHit_v1.h
index 54b1663e9b0b7c08de9b1b4bfe660d3da24539e1..a2a0cda2d3e9e814820038c8a51c86c86c51ec86 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcWireHit_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/sTgcWireHit_v1.h
@@ -24,6 +24,6 @@ class sTgcWireHit_v1 : public sTgcMeasurement_v1 {
 }  // namespace xAOD
 
 #include "AthContainers/DataVector.h"
-DATAVECTOR_BASE_FIN(xAOD::sTgcWireHit_v1, xAOD::sTgcMeasurement_v1);
+DATAVECTOR_BASE(xAOD::sTgcWireHit_v1, xAOD::sTgcMeasurement_v1);
 
 #endif
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepDataAthenaPool/CMakeLists.txt b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepDataAthenaPool/CMakeLists.txt
index c7e3b592b9f94a69cb76fb70f27d04d5ecd8d16e..2f2a9b23e06275c6956fb1c26b12eb05f567937e 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepDataAthenaPool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepDataAthenaPool/CMakeLists.txt
@@ -10,13 +10,15 @@ find_package( ROOT COMPONENTS Core )
 atlas_add_poolcnv_library( xAODMuonPrepDataAthenaPoolCnv
    FILES xAODMuonPrepData/MdtDriftCircleContainer.h xAODMuonPrepData/MdtDriftCircleAuxContainer.h 
          xAODMuonPrepData/RpcStripContainer.h xAODMuonPrepData/RpcStripAuxContainer.h 
+         xAODMuonPrepData/RpcStrip2DContainer.h xAODMuonPrepData/RpcStrip2DAuxContainer.h 
          xAODMuonPrepData/TgcStripContainer.h xAODMuonPrepData/TgcStripAuxContainer.h 
          xAODMuonPrepData/sTgcStripContainer.h xAODMuonPrepData/sTgcStripAuxContainer.h 
          xAODMuonPrepData/sTgcPadContainer.h xAODMuonPrepData/sTgcPadAuxContainer.h 
          xAODMuonPrepData/sTgcWireContainer.h xAODMuonPrepData/sTgcWireAuxContainer.h 
          xAODMuonPrepData/MMClusterContainer.h xAODMuonPrepData/MMClusterAuxContainer.h         
    TYPES_WITH_NAMESPACE xAOD::MdtDriftCircleContainer xAOD::MdtDriftCircleAuxContainer 
-                        xAOD::RpcStripContainer xAOD::RpcStripAuxContainer 
+                        xAOD::RpcStripContainer xAOD::RpcStripAuxContainer
+                        xAOD::RpcStrip2DContainer xAOD::RpcStrip2DAuxContainer 
                         xAOD::TgcStripContainer xAOD::TgcStripAuxContainer 
                         xAOD::sTgcStripContainer xAOD::sTgcStripAuxContainer 
                         xAOD::MMClusterContainer xAOD::MMClusterAuxContainer