diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/MuonRecHelperTools/MuonEDMPrinterTool.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/MuonRecHelperTools/MuonEDMPrinterTool.h
index 4f07283be0f35ce92d201d0d49c3fc078527c881..d8dfd771fb53545c8bb3b046ff6ee1ae4ee2fdf9 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/MuonRecHelperTools/MuonEDMPrinterTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/MuonRecHelperTools/MuonEDMPrinterTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONRECHELPERTOOLS_H
@@ -22,6 +22,8 @@
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
 #include "TrkToolInterfaces/ITrackSummaryHelperTool.h"
 
+#include "MuonPrepRawData/MdtPrepDataContainer.h"
+
 #include <string>
 
 static const InterfaceID IID_MuonEDMPrinterTool("Muon::MuonEDMPrinterTool",1,0);
@@ -139,6 +141,9 @@ namespace Muon{
     SG::ReadCondHandleKey<MuonGM::MuonDetectorManager> m_DetectorManagerKey {this, "DetectorManagerKey", 
 	"MuonDetectorManager", 
 	"Key of input MuonDetectorManager condition data"};    
+    SG::ReadHandleKey<MdtPrepDataContainer>          m_mdtKey{this,"MdtPrdCollection","MDT_DriftCircles","MDT PRD Container"};
+    SG::ReadHandleKey<RpcPrepDataContainer>          m_rpcKey{this,"RpcPrdCollection","RPC_Measurements","RPC PRD Container"};
+    SG::ReadHandleKey<TgcPrepDataContainer>          m_tgcKey{this,"TgcPrdCollection","TGC_Measurements","TGC PRD Container"};
 
   };
 
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/MuonEDMPrinterTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/MuonEDMPrinterTool.cxx
index 0958d989025687b2c1c6df924d317716ca50103a..a1040f68da9497ca33414a118700efdfc0fff9cc 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/MuonEDMPrinterTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/MuonEDMPrinterTool.cxx
@@ -55,6 +55,9 @@ namespace Muon {
     ATH_CHECK(m_summaryHelper.retrieve());
 
     ATH_CHECK(m_DetectorManagerKey.initialize());
+    ATH_CHECK(m_mdtKey.initialize());
+    ATH_CHECK(m_rpcKey.initialize());
+    ATH_CHECK(m_tgcKey.initialize());
   
     return StatusCode::SUCCESS;
   }
@@ -718,11 +721,12 @@ namespace Muon {
 
 
     if( isMdt ){
+      SG::ReadHandle<MdtPrepDataContainer> rh_mdt(m_mdtKey);
       const MdtPrepDataContainer* mdtPrdContainer = 0;
-      std::string key = "MDT_DriftCircles";
-      if(evtStore()->retrieve(mdtPrdContainer,key).isFailure()) {
-        ATH_MSG_DEBUG("Cannot retrieve " << key);
+      if(!rh_mdt.isValid()) {
+        ATH_MSG_DEBUG("Cannot retrieve " << m_mdtKey.key());
       }else{
+	mdtPrdContainer = rh_mdt.cptr();
         IdentifierHash hash_id;
         m_idHelperSvc->mdtIdHelper().get_module_hash(chId,hash_id );
         MdtPrepDataContainer::const_iterator colIt = mdtPrdContainer->indexFind(hash_id);
@@ -730,11 +734,12 @@ namespace Muon {
         else 	  ATH_MSG_DEBUG("Collection not found: hash " << hash_id);
       }
     }else if( m_idHelperSvc->isRpc(chId) ){
+      SG::ReadHandle<RpcPrepDataContainer> rh_rpc(m_rpcKey);
       const RpcPrepDataContainer* rpcPrdContainer = 0;
-      std::string key = "RPC_Measurements";
-      if(evtStore()->retrieve(rpcPrdContainer,key).isFailure()) {
-        ATH_MSG_DEBUG("Cannot retrieve " << key);
+      if(!rh_rpc.isValid()) {
+        ATH_MSG_DEBUG("Cannot retrieve " << m_rpcKey.key());
       }else{
+	rpcPrdContainer = rh_rpc.cptr();
         IdentifierHash hash_id;
         m_idHelperSvc->rpcIdHelper().get_module_hash(chId,hash_id );
         RpcPrepDataContainer::const_iterator colIt = rpcPrdContainer->indexFind(hash_id);
@@ -748,11 +753,12 @@ namespace Muon {
         }else ATH_MSG_DEBUG("Collection not found: hash " << hash_id);
       }
     }else if( m_idHelperSvc->isTgc(chId) ){
+      SG::ReadHandle<TgcPrepDataContainer> rh_tgc(m_tgcKey);
       const TgcPrepDataContainer* tgcPrdContainer = 0;
-      std::string key = "TGC_Measurements";
-      if(evtStore()->retrieve(tgcPrdContainer,key).isFailure()) {
-        ATH_MSG_DEBUG("Cannot retrieve " << key);
+      if(!rh_tgc.isValid()) {
+        ATH_MSG_DEBUG("Cannot retrieve " << m_tgcKey.key());
       }else{
+	tgcPrdContainer = rh_tgc.cptr();
         IdentifierHash hash_id;
         m_idHelperSvc->tgcIdHelper().get_module_hash(chId,hash_id );
         TgcPrepDataContainer::const_iterator colIt = tgcPrdContainer->indexFind(hash_id);
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index e54dce3205b41ea4d687fe9a2fe4615e5c53353a..290626a42f0b9cd61afe0ea0b25c3eb3e7239dee 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaCommon.Logging import logging
@@ -482,6 +482,8 @@ def muEFCBRecoSequence( RoIs, name ):
   ViewVerifyMS = CfgMgr.AthViews__ViewDataVerifier("muonCBViewDataVerifier")
   ViewVerifyMS.DataObjects = [( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ),  
                               ( 'Muon::MdtPrepDataContainer' , 'StoreGateSvc+MDT_DriftCircles' ),  
+                              ( 'Muon::TgcPrepDataContainer'      , 'StoreGateSvc+TGC_Measurements' ),
+                              ( 'Muon::RpcPrepDataContainer'      , 'StoreGateSvc+RPC_Measurements' ),
                               ( 'MuonCandidateCollection' , 'StoreGateSvc+MuonCandidates') ]
   muEFCBRecoSequence += ViewVerifyMS
   if "FS" in name: