diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h
index 86caa1cd..a2002fcf 100644
--- a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h
+++ b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h
@@ -64,89 +64,89 @@ namespace edm4hep {
 namespace EDM4hep2LCIOConv {
 
   template<typename T1, typename T2>
-  using TypeMapT = k4EDM4hep2LcioConv::MapT<T1, T2>;
+  using ObjectMapT = k4EDM4hep2LcioConv::MapT<T1, T2>;
 
   struct CollectionsPairVectors {
-    TypeMapT<lcio::TrackImpl*, edm4hep::Track> tracks {};
-    TypeMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit> trackerhits {};
-    TypeMapT<lcio::SimTrackerHitImpl*, edm4hep::SimTrackerHit> simtrackerhits {};
-    TypeMapT<lcio::CalorimeterHitImpl*, edm4hep::CalorimeterHit> calohits {};
-    TypeMapT<lcio::RawCalorimeterHitImpl*, edm4hep::RawCalorimeterHit> rawcalohits {};
-    TypeMapT<lcio::SimCalorimeterHitImpl*, edm4hep::SimCalorimeterHit> simcalohits {};
-    TypeMapT<lcio::TPCHitImpl*, edm4hep::RawTimeSeries> tpchits {};
-    TypeMapT<lcio::ClusterImpl*, edm4hep::Cluster> clusters {};
-    TypeMapT<lcio::VertexImpl*, edm4hep::Vertex> vertices {};
-    TypeMapT<lcio::ReconstructedParticleImpl*, edm4hep::ReconstructedParticle> recoparticles {};
-    TypeMapT<lcio::MCParticleImpl*, edm4hep::MCParticle> mcparticles {};
+    ObjectMapT<lcio::TrackImpl*, edm4hep::Track> tracks {};
+    ObjectMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit> trackerhits {};
+    ObjectMapT<lcio::SimTrackerHitImpl*, edm4hep::SimTrackerHit> simtrackerhits {};
+    ObjectMapT<lcio::CalorimeterHitImpl*, edm4hep::CalorimeterHit> calohits {};
+    ObjectMapT<lcio::RawCalorimeterHitImpl*, edm4hep::RawCalorimeterHit> rawcalohits {};
+    ObjectMapT<lcio::SimCalorimeterHitImpl*, edm4hep::SimCalorimeterHit> simcalohits {};
+    ObjectMapT<lcio::TPCHitImpl*, edm4hep::RawTimeSeries> tpchits {};
+    ObjectMapT<lcio::ClusterImpl*, edm4hep::Cluster> clusters {};
+    ObjectMapT<lcio::VertexImpl*, edm4hep::Vertex> vertices {};
+    ObjectMapT<lcio::ReconstructedParticleImpl*, edm4hep::ReconstructedParticle> recoparticles {};
+    ObjectMapT<lcio::MCParticleImpl*, edm4hep::MCParticle> mcparticles {};
   };
 
   template<
-    typename TrackMapT = TypeMapT<lcio::TrackImpl*, edm4hep::Track>,
-    typename TrackerHitMapT = TypeMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit>>
+    typename TrackMapT = ObjectMapT<lcio::TrackImpl*, edm4hep::Track>,
+    typename TrackerHitMapT = ObjectMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit>>
   lcio::LCCollectionVec* convTracks(
     const edm4hep::TrackCollection* const tracks_coll,
     TrackMapT& tracks_vec,
     const TrackerHitMapT& trackerhits_vec);
 
-  template<typename TrackerHitMapT = TypeMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit>>
+  template<typename TrackerHitMapT = ObjectMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit>>
   lcio::LCCollectionVec* convTrackerHits(
     const edm4hep::TrackerHitCollection* const trackerhits_coll,
     const std::string cellIDstr,
     TrackerHitMapT& trackerhits_vec);
 
   template<
-    typename SimTrHitMapT = TypeMapT<lcio::SimTrackerHitImpl*, edm4hep::SimTrackerHit>,
-    typename MCParticleMapT = TypeMapT<lcio::MCParticleImpl*, edm4hep::MCParticle>>
+    typename SimTrHitMapT = ObjectMapT<lcio::SimTrackerHitImpl*, edm4hep::SimTrackerHit>,
+    typename MCParticleMapT = ObjectMapT<lcio::MCParticleImpl*, edm4hep::MCParticle>>
   lcio::LCCollectionVec* convSimTrackerHits(
     const edm4hep::SimTrackerHitCollection* const simtrackerhits_coll,
     const std::string cellIDstr,
     SimTrHitMapT& simtrackerhits_vec,
     const MCParticleMapT& mcparticles_vec);
 
-  template<typename CaloHitMapT = TypeMapT<lcio::CalorimeterHitImpl*, edm4hep::CalorimeterHit>>
+  template<typename CaloHitMapT = ObjectMapT<lcio::CalorimeterHitImpl*, edm4hep::CalorimeterHit>>
   lcio::LCCollectionVec* convCalorimeterHits(
     const edm4hep::CalorimeterHitCollection* const calohit_coll,
     const std::string cellIDstr,
     CaloHitMapT& calo_hits_vec);
 
-  template<typename RawCaloHitMapT = TypeMapT<lcio::RawCalorimeterHitImpl*, edm4hep::RawCalorimeterHit>>
+  template<typename RawCaloHitMapT = ObjectMapT<lcio::RawCalorimeterHitImpl*, edm4hep::RawCalorimeterHit>>
   lcio::LCCollectionVec* convRawCalorimeterHits(
     const edm4hep::RawCalorimeterHitCollection* const rawcalohit_coll,
     RawCaloHitMapT& raw_calo_hits_vec);
 
-  template<typename SimCaloHitMapT, typename MCParticleMapT = TypeMapT<lcio::MCParticleImpl*, edm4hep::MCParticle>>
+  template<typename SimCaloHitMapT, typename MCParticleMapT = ObjectMapT<lcio::MCParticleImpl*, edm4hep::MCParticle>>
   lcio::LCCollectionVec* convSimCalorimeterHits(
     const edm4hep::SimCalorimeterHitCollection* const simcalohit_coll,
     const std::string cellIDstr,
     SimCaloHitMapT& sim_calo_hits_vec,
     const MCParticleMapT& mcparticles);
 
-  template<typename TPCHitMapT = TypeMapT<lcio::TPCHitImpl*, edm4hep::RawTimeSeries>>
+  template<typename TPCHitMapT = ObjectMapT<lcio::TPCHitImpl*, edm4hep::RawTimeSeries>>
   lcio::LCCollectionVec* convTPCHits(
     const edm4hep::RawTimeSeriesCollection* const tpchit_coll,
     TPCHitMapT& tpc_hits_vec);
 
   template<
-    typename ClusterMapT = TypeMapT<lcio::ClusterImpl*, edm4hep::Cluster>,
-    typename CaloHitMapT = TypeMapT<lcio::CalorimeterHitImpl*, edm4hep::CalorimeterHit>>
+    typename ClusterMapT = ObjectMapT<lcio::ClusterImpl*, edm4hep::Cluster>,
+    typename CaloHitMapT = ObjectMapT<lcio::CalorimeterHitImpl*, edm4hep::CalorimeterHit>>
   lcio::LCCollectionVec* convClusters(
     const edm4hep::ClusterCollection* const cluster_coll,
     ClusterMapT& cluster_vec,
     const CaloHitMapT& calohits_vec);
 
   template<
-    typename VertexMapT = TypeMapT<lcio::VertexImpl*, edm4hep::Vertex>,
-    typename RecoPartMapT = TypeMapT<lcio::ReconstructedParticleImpl*, edm4hep::ReconstructedParticle>>
+    typename VertexMapT = ObjectMapT<lcio::VertexImpl*, edm4hep::Vertex>,
+    typename RecoPartMapT = ObjectMapT<lcio::ReconstructedParticleImpl*, edm4hep::ReconstructedParticle>>
   lcio::LCCollectionVec* convVertices(
     const edm4hep::VertexCollection* const vertex_coll,
     VertexMapT& vertex_vec,
     const RecoPartMapT& recoparticles_vec);
 
   template<
-    typename RecoPartMapT = TypeMapT<lcio::ReconstructedParticleImpl*, edm4hep::ReconstructedParticle>,
-    typename TrackMapT = TypeMapT<lcio::TrackImpl*, edm4hep::Track>,
-    typename VertexMapT = TypeMapT<lcio::VertexImpl*, edm4hep::Vertex>,
-    typename ClusterMapT = TypeMapT<lcio::ClusterImpl*, edm4hep::Cluster>>
+    typename RecoPartMapT = ObjectMapT<lcio::ReconstructedParticleImpl*, edm4hep::ReconstructedParticle>,
+    typename TrackMapT = ObjectMapT<lcio::TrackImpl*, edm4hep::Track>,
+    typename VertexMapT = ObjectMapT<lcio::VertexImpl*, edm4hep::Vertex>,
+    typename ClusterMapT = ObjectMapT<lcio::ClusterImpl*, edm4hep::Cluster>>
   lcio::LCCollectionVec* convReconstructedParticles(
     const edm4hep::ReconstructedParticleCollection* const recos_coll,
     RecoPartMapT& recoparticles_vec,
@@ -154,13 +154,14 @@ namespace EDM4hep2LCIOConv {
     const VertexMapT& vertex_vec,
     const ClusterMapT& clusters_vec);
 
-  template<typename MCPartMapT = TypeMapT<lcio::MCParticleImpl*, edm4hep::MCParticle>>
+  template<typename MCPartMapT = ObjectMapT<lcio::MCParticleImpl*, edm4hep::MCParticle>>
   lcio::LCCollectionVec* convMCParticles(
     const edm4hep::MCParticleCollection* const mcparticle_coll,
     MCPartMapT& mc_particles_vec);
 
   void convEventHeader(const edm4hep::EventHeaderCollection* const header_coll, lcio::LCEventImpl* const lcio_event);
 
+  template<typename ObjectMappingT = CollectionsPairVectors>
   void FillMissingCollections(ObjectMappingT& collection_pairs);
 
   bool collectionExist(const std::string& collection_name, const lcio::LCEventImpl* lcio_event);
diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h
index 6df90c7b..cb5775bf 100644
--- a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h
+++ b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h
@@ -63,26 +63,26 @@
 
 namespace LCIO2EDM4hepConv {
   template<typename LcioT, typename EdmT>
-  using TypeMapT = k4EDM4hep2LcioConv::MapT<LcioT, EdmT>;
+  using ObjectMapT = k4EDM4hep2LcioConv::MapT<LcioT, EdmT>;
 
   /**
    * Maping holding all the original and converted objects in a 1:1 mapping in a
    * way that makes the lookup from LCIO to EDM4hep easy.
    */
   struct LcioEdmTypeMapping {
-    TypeMapT<lcio::Track*, edm4hep::MutableTrack> tracks {};
-    TypeMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit> trackerHits {};
-    TypeMapT<lcio::SimTrackerHit*, edm4hep::MutableSimTrackerHit> simTrackerHits {};
-    TypeMapT<lcio::CalorimeterHit*, edm4hep::MutableCalorimeterHit> caloHits {};
-    TypeMapT<lcio::RawCalorimeterHit*, edm4hep::MutableRawCalorimeterHit> rawCaloHits {};
-    TypeMapT<lcio::SimCalorimeterHit*, edm4hep::MutableSimCalorimeterHit> simCaloHits {};
-    TypeMapT<lcio::TPCHit*, edm4hep::MutableRawTimeSeries> tpcHits {};
-    TypeMapT<lcio::Cluster*, edm4hep::MutableCluster> clusters {};
-    TypeMapT<lcio::Vertex*, edm4hep::MutableVertex> vertices {};
-    TypeMapT<lcio::ReconstructedParticle*, edm4hep::MutableReconstructedParticle> recoParticles {};
-    TypeMapT<lcio::MCParticle*, edm4hep::MutableMCParticle> mcParticles {};
-    TypeMapT<lcio::TrackerHitPlane*, edm4hep::MutableTrackerHitPlane> trackerHitPlanes {};
-    TypeMapT<lcio::ParticleID*, edm4hep::MutableParticleID> particleIDs {};
+    ObjectMapT<lcio::Track*, edm4hep::MutableTrack> tracks {};
+    ObjectMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit> trackerHits {};
+    ObjectMapT<lcio::SimTrackerHit*, edm4hep::MutableSimTrackerHit> simTrackerHits {};
+    ObjectMapT<lcio::CalorimeterHit*, edm4hep::MutableCalorimeterHit> caloHits {};
+    ObjectMapT<lcio::RawCalorimeterHit*, edm4hep::MutableRawCalorimeterHit> rawCaloHits {};
+    ObjectMapT<lcio::SimCalorimeterHit*, edm4hep::MutableSimCalorimeterHit> simCaloHits {};
+    ObjectMapT<lcio::TPCHit*, edm4hep::MutableRawTimeSeries> tpcHits {};
+    ObjectMapT<lcio::Cluster*, edm4hep::MutableCluster> clusters {};
+    ObjectMapT<lcio::Vertex*, edm4hep::MutableVertex> vertices {};
+    ObjectMapT<lcio::ReconstructedParticle*, edm4hep::MutableReconstructedParticle> recoParticles {};
+    ObjectMapT<lcio::MCParticle*, edm4hep::MutableMCParticle> mcParticles {};
+    ObjectMapT<lcio::TrackerHitPlane*, edm4hep::MutableTrackerHitPlane> trackerHitPlanes {};
+    ObjectMapT<lcio::ParticleID*, edm4hep::MutableParticleID> particleIDs {};
   };
 
   using CollNamePair = std::tuple<std::string, std::unique_ptr<podio::CollectionBase>>;
@@ -181,7 +181,7 @@ namespace LCIO2EDM4hepConv {
    * Convert an MCParticle collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename MCParticleMapT = TypeMapT<lcio::MCParticle*, edm4hep::MutableMCParticle>>
+  template<typename MCParticleMapT = ObjectMapT<lcio::MCParticle*, edm4hep::MutableMCParticle>>
   std::unique_ptr<edm4hep::MCParticleCollection>
   convertMCParticles(const std::string& name, EVENT::LCCollection* LCCollection, MCParticleMapT& mcparticlesMap);
 
@@ -194,8 +194,8 @@ namespace LCIO2EDM4hepConv {
    * <name>_particleIDs
    */
   template<
-    typename RecoMapT = TypeMapT<lcio::ReconstructedParticle*, edm4hep::MutableReconstructedParticle>,
-    typename PIDMapT = TypeMapT<lcio::ParticleID*, edm4hep::MutableParticleID>>
+    typename RecoMapT = ObjectMapT<lcio::ReconstructedParticle*, edm4hep::MutableReconstructedParticle>,
+    typename PIDMapT = ObjectMapT<lcio::ParticleID*, edm4hep::MutableParticleID>>
   std::vector<CollNamePair> convertReconstructedParticles(
     const std::string& name,
     EVENT::LCCollection* LCCollection,
@@ -206,7 +206,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a Vertex collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename VertexMapT = TypeMapT<lcio::Vertex*, edm4hep::MutableVertex>>
+  template<typename VertexMapT = ObjectMapT<lcio::Vertex*, edm4hep::MutableVertex>>
   std::unique_ptr<edm4hep::VertexCollection>
   convertVertices(const std::string& name, EVENT::LCCollection* LCCollection, VertexMapT& vertexMap);
 
@@ -214,7 +214,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a SimTrackerHit collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename SimTrHitMapT = TypeMapT<lcio::SimTrackerHit*, edm4hep::MutableSimTrackerHit>>
+  template<typename SimTrHitMapT = ObjectMapT<lcio::SimTrackerHit*, edm4hep::MutableSimTrackerHit>>
   std::unique_ptr<edm4hep::SimTrackerHitCollection>
   convertSimTrackerHits(const std::string& name, EVENT::LCCollection* LCCollection, SimTrHitMapT& SimTrHitMap);
 
@@ -222,7 +222,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a TPCHit collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename HitMapT = TypeMapT<lcio::TPCHit*, edm4hep::MutableRawTimeSeries>>
+  template<typename HitMapT = ObjectMapT<lcio::TPCHit*, edm4hep::MutableRawTimeSeries>>
   std::unique_ptr<edm4hep::RawTimeSeriesCollection>
   convertTPCHits(const std::string& name, EVENT::LCCollection* LCCollection, HitMapT& TPCHitMap);
 
@@ -230,7 +230,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a TrackerHit collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename HitMapT = TypeMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit>>
+  template<typename HitMapT = ObjectMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit>>
   std::unique_ptr<edm4hep::TrackerHitCollection>
   convertTrackerHits(const std::string& name, EVENT::LCCollection* LCCollection, HitMapT& TrackerHitMap);
 
@@ -238,7 +238,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a TrackerHitPlane collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename HitMapT = TypeMapT<lcio::TrackerHitPlane*, edm4hep::MutableTrackerHitPlane>>
+  template<typename HitMapT = ObjectMapT<lcio::TrackerHitPlane*, edm4hep::MutableTrackerHitPlane>>
   std::unique_ptr<edm4hep::TrackerHitPlaneCollection>
   convertTrackerHitPlanes(const std::string& name, EVENT::LCCollection* LCCollection, HitMapT& TrackerHitPlaneMap);
 
@@ -246,7 +246,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a Track collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename TrackMapT = TypeMapT<lcio::Track*, edm4hep::MutableTrack>>
+  template<typename TrackMapT = ObjectMapT<lcio::Track*, edm4hep::MutableTrack>>
   std::unique_ptr<edm4hep::TrackCollection>
   convertTracks(const std::string& name, EVENT::LCCollection* LCCollection, TrackMapT& TrackMap);
 
@@ -254,7 +254,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a SimCalorimeterHit collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename HitMapT = TypeMapT<lcio::SimCalorimeterHit*, edm4hep::MutableSimCalorimeterHit>>
+  template<typename HitMapT = ObjectMapT<lcio::SimCalorimeterHit*, edm4hep::MutableSimCalorimeterHit>>
   std::unique_ptr<edm4hep::SimCalorimeterHitCollection>
   convertSimCalorimeterHits(const std::string& name, EVENT::LCCollection* LCCollection, HitMapT& SimCaloHitMap);
 
@@ -262,7 +262,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a RawCalorimeterHit collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename HitMapT = TypeMapT<lcio::RawCalorimeterHit*, edm4hep::MutableRawCalorimeterHit>>
+  template<typename HitMapT = ObjectMapT<lcio::RawCalorimeterHit*, edm4hep::MutableRawCalorimeterHit>>
   std::unique_ptr<edm4hep::RawCalorimeterHitCollection>
   convertRawCalorimeterHits(const std::string& name, EVENT::LCCollection* LCCollection, HitMapT& rawCaloHitMap);
 
@@ -270,7 +270,7 @@ namespace LCIO2EDM4hepConv {
    * Convert a CalorimeterHit collection and return the resulting collection.
    * Simultaneously populates the mapping from LCIO to EDM4hep objects.
    */
-  template<typename HitMapT = TypeMapT<lcio::CalorimeterHit*, edm4hep::MutableCalorimeterHit>>
+  template<typename HitMapT = ObjectMapT<lcio::CalorimeterHit*, edm4hep::MutableCalorimeterHit>>
   std::unique_ptr<edm4hep::CalorimeterHitCollection>
   convertCalorimeterHits(const std::string& name, EVENT::LCCollection* LCCollection, HitMapT& caloHitMap);
 
@@ -283,8 +283,8 @@ namespace LCIO2EDM4hepConv {
    * <name>_particleIDs
    */
   template<
-    typename ClusterMapT = TypeMapT<lcio::Cluster*, edm4hep::MutableCluster>,
-    typename PIDMapT = TypeMapT<lcio::ParticleID*, edm4hep::MutableParticleID>>
+    typename ClusterMapT = ObjectMapT<lcio::Cluster*, edm4hep::MutableCluster>,
+    typename PIDMapT = ObjectMapT<lcio::ParticleID*, edm4hep::MutableParticleID>>
   std::vector<CollNamePair> convertClusters(
     const std::string& name,
     EVENT::LCCollection* LCCollection,
@@ -391,8 +391,8 @@ namespace LCIO2EDM4hepConv {
    * The contributions are also attached to their corresponding SimCalorimeterHits.
    */
   template<
-    typename HitMapT = TypeMapT<lcio::SimCalorimeterHit*, edm4hep::MutableSimCalorimeterHit>,
-    typename MCParticleMapT = TypeMapT<lcio::MCParticle*, edm4hep::MutableMCParticle>>
+    typename HitMapT = ObjectMapT<lcio::SimCalorimeterHit*, edm4hep::MutableSimCalorimeterHit>,
+    typename MCParticleMapT = ObjectMapT<lcio::MCParticle*, edm4hep::MutableMCParticle>>
   std::unique_ptr<edm4hep::CaloHitContributionCollection> createCaloHitContributions(
     HitMapT& SimCaloHitMap,
     const MCParticleMapT& mcparticlesMap);
@@ -400,25 +400,25 @@ namespace LCIO2EDM4hepConv {
   /**
    * Resolve the relations for the MCParticles.
    */
-  template<typename MCParticleMapT = TypeMapT<lcio::MCParticle*, edm4hep::MutableMCParticle>>
+  template<typename MCParticleMapT = ObjectMapT<lcio::MCParticle*, edm4hep::MutableMCParticle>>
   void resolveRelationsMCParticles(MCParticleMapT& mcparticlesMap);
 
   /**
    * Resolve the relations for SimTrackerHits
    */
   template<
-    typename HitMapT = TypeMapT<lcio::SimTrackerHit*, edm4hep::MutableSimTrackerHit>,
-    typename MCParticleMapT = TypeMapT<lcio::MCParticle*, edm4hep::MutableMCParticle>>
+    typename HitMapT = ObjectMapT<lcio::SimTrackerHit*, edm4hep::MutableSimTrackerHit>,
+    typename MCParticleMapT = ObjectMapT<lcio::MCParticle*, edm4hep::MutableMCParticle>>
   void resolveRelationsSimTrackerHits(HitMapT& SimTrHitMap, const MCParticleMapT& mcparticlesMap);
 
   /**
    * Resolve the relations for ReconstructedParticles
    */
   template<
-    typename RecoParticleMapT = TypeMapT<lcio::ReconstructedParticle*, edm4hep::MutableReconstructedParticle>,
-    typename VertexMapT = TypeMapT<lcio::Vertex*, edm4hep::MutableVertex>,
-    typename ClusterMapT = TypeMapT<lcio::Cluster*, edm4hep::MutableCluster>,
-    typename TrackMapT = TypeMapT<lcio::Track*, edm4hep::MutableTrack>>
+    typename RecoParticleMapT = ObjectMapT<lcio::ReconstructedParticle*, edm4hep::MutableReconstructedParticle>,
+    typename VertexMapT = ObjectMapT<lcio::Vertex*, edm4hep::MutableVertex>,
+    typename ClusterMapT = ObjectMapT<lcio::Cluster*, edm4hep::MutableCluster>,
+    typename TrackMapT = ObjectMapT<lcio::Track*, edm4hep::MutableTrack>>
   void resolveRelationsRecoParticles(
     RecoParticleMapT& recoparticlesMap,
     const VertexMapT& vertexMap,
@@ -429,18 +429,18 @@ namespace LCIO2EDM4hepConv {
    * Resolve the relations for Clusters
    */
   template<
-    typename ClusterMapT = TypeMapT<lcio::Cluster*, edm4hep::MutableCluster>,
-    typename CaloHitMapT = TypeMapT<lcio::CalorimeterHit*, edm4hep::MutableCalorimeterHit>>
+    typename ClusterMapT = ObjectMapT<lcio::Cluster*, edm4hep::MutableCluster>,
+    typename CaloHitMapT = ObjectMapT<lcio::CalorimeterHit*, edm4hep::MutableCalorimeterHit>>
   void resolveRelationsClusters(ClusterMapT& clustersMap, const CaloHitMapT& caloHitMap);
 
   /**
    * Resolve the relations for Tracks
    */
   template<
-    typename TrackMapT = TypeMapT<lcio::Track*, edm4hep::MutableTrack>,
-    typename TrackHitMapT = TypeMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit>,
-    typename TPCHitMapT = TypeMapT<lcio::TPCHit*, edm4hep::MutableRawTimeSeries>,
-    typename THPlaneHitMapT = TypeMapT<lcio::TrackerHitPlane*, edm4hep::MutableTrackerHitPlane>>
+    typename TrackMapT = ObjectMapT<lcio::Track*, edm4hep::MutableTrack>,
+    typename TrackHitMapT = ObjectMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit>,
+    typename TPCHitMapT = ObjectMapT<lcio::TPCHit*, edm4hep::MutableRawTimeSeries>,
+    typename THPlaneHitMapT = ObjectMapT<lcio::TrackerHitPlane*, edm4hep::MutableTrackerHitPlane>>
   void resolveRelationsTracks(
     TrackMapT& tracksMap,
     const TrackHitMapT& trackerHitMap,
@@ -451,8 +451,8 @@ namespace LCIO2EDM4hepConv {
    * Resolve the relations for Vertices
    */
   template<
-    typename VertexMapT = TypeMapT<lcio::Vertex*, edm4hep::MutableVertex>,
-    typename RecoParticleMapT = TypeMapT<lcio::ReconstructedParticle*, edm4hep::MutableReconstructedParticle>>
+    typename VertexMapT = ObjectMapT<lcio::Vertex*, edm4hep::MutableVertex>,
+    typename RecoParticleMapT = ObjectMapT<lcio::ReconstructedParticle*, edm4hep::MutableReconstructedParticle>>
   void resolveRelationsVertices(VertexMapT& vertexMap, const RecoParticleMapT& recoparticleMap);
 
   template<typename LCIOType>