diff --git a/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
index b0fdb0edc0128291be7ac0f759eb565fb05d67d8..8d23ac6a8b5cb947a4a41b961e1bbed75cc7b83c 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -63,7 +63,7 @@ StatusCode EMVertexBuilder::execute(const EventContext& ctx) const
   }
 
   std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> verticesPair =
-    m_vertexFinderTool->findVertex(TPCol.cptr());
+    m_vertexFinderTool->findVertex(ctx,TPCol.cptr());
 
   if (!verticesPair.first || !verticesPair.second){
     ATH_MSG_ERROR("Null pointer to conversion container");
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
index c9b19ab18a16d09dbe1462356d439f5d62bab007..75011f7d99cefdae4ef6f98bb5e5f68b8a996e9a 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "egammaRecBuilder.h"
@@ -104,7 +104,7 @@ egammaRecBuilder::execute(const EventContext& ctx) const
   const size_t nTopo = topoclusters->size();
   egammaRecs->reserve(nTopo);
   for (size_t i(0); i < nTopo; i++) {
-    const ElementLink<xAOD::CaloClusterContainer> clusterLink(*topoclusters, i);
+    const ElementLink<xAOD::CaloClusterContainer> clusterLink(*topoclusters, i, ctx);
     const std::vector<ElementLink<xAOD::CaloClusterContainer>> ClusterLink{
       clusterLink
     };
diff --git a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
index d523fdb0e56b0701325c59104b98c3e129402dd3..8b0fdb2f16f4c1a6f5bd1b3e27cd570b82f9c557 100644
--- a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "EMClusterTool.h"
@@ -192,7 +192,7 @@ EMClusterTool::setNewCluster(const EventContext& ctx,
   outputClusterContainer->push_back(cluster);
 
   // Set the link to the new cluster
-  ClusterLink_t clusterLink(cluster, *outputClusterContainer);
+  ClusterLink_t clusterLink(cluster, *outputClusterContainer, ctx);
   const std::vector<ClusterLink_t> clusterLinks{ clusterLink };
   eg->setCaloClusterLinks(clusterLinks);
 }
diff --git a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
index 1b719045ede47c8f0cd761eb55f394cd87f02ea8..89a5c2360bdec6b9281dc926d670711ef2756496 100644
--- a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+   Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
  */
 
 // INCLUDE HEADER FILES:
@@ -137,7 +137,7 @@ EMTrackMatchBuilder::trackExecute(
     using EL = ElementLink<xAOD::TrackParticleContainer>;
     std::vector<EL> trackParticleLinks;
     trackParticleLinks.reserve(trkMatches.size());
-    const std::string key = EL(*trackPC, 0).dataID();
+    const std::string key = EL(*trackPC, 0, ctx).dataID();
     for (const TrackMatch& m : trkMatches) {
       ATH_MSG_DEBUG("Match  dR: " << m.dR << " second  dR: " << m.seconddR
                                   << " hasPix: " << m.hasPix