diff --git a/k4Reco/DDPlanarDigi/components/DDPlanarDigi.cpp b/k4Reco/DDPlanarDigi/components/DDPlanarDigi.cpp
index f37ad56..95a6cb2 100644
--- a/k4Reco/DDPlanarDigi/components/DDPlanarDigi.cpp
+++ b/k4Reco/DDPlanarDigi/components/DDPlanarDigi.cpp
@@ -40,11 +40,11 @@
 DDPlanarDigi::DDPlanarDigi(const std::string& name, ISvcLocator* svcLoc)
     : MultiTransformer(name, svcLoc,
                        {
-                           KeyValue("SimTrackerHitCollectionName", "SimTrackerHits"),
-                           KeyValue("HeaderName", "EventHeader"),
+                         KeyValues("SimTrackerHitCollectionName", {"SimTrackerHits"}),
+                           KeyValues("HeaderName", {"EventHeader"}),
                        },
-                       {KeyValue("TrackerHitCollectionName", "VTXTrackerHits"),
-                        KeyValue("SimTrkHitRelCollection", "VTXTrackerHitRelations")}) {
+                       {KeyValues("TrackerHitCollectionName", {"VTXTrackerHits"}),
+                        KeyValues("SimTrkHitRelCollection", {"VTXTrackerHitRelations"})}) {
   m_uidSvc = service<IUniqueIDGenSvc>("UniqueIDGenSvc", true);
   if (!m_uidSvc) {
     error() << "Unable to get UniqueIDGenSvc" << endmsg;
diff --git a/k4Reco/DDPlanarDigi/components/DDPlanarDigi.h b/k4Reco/DDPlanarDigi/components/DDPlanarDigi.h
index 4e0f2fd..80024d9 100644
--- a/k4Reco/DDPlanarDigi/components/DDPlanarDigi.h
+++ b/k4Reco/DDPlanarDigi/components/DDPlanarDigi.h
@@ -24,15 +24,16 @@
 #include "Gaudi/Property.h"
 #include "GaudiAlg/Transformer.h"
 #include "GaudiKernel/RndmGenerators.h"
-#include "k4FWCore/BaseClass.h"
-#include "k4Interface/IGeoSvc.h"
-#include "k4Interface/IUniqueIDGenSvc.h"
 
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCRecoTrackerHitPlaneAssociationCollection.h"
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/TrackerHitPlaneCollection.h"
 
+#include "k4FWCore/Transformer.h"
+#include "k4Interface/IGeoSvc.h"
+#include "k4Interface/IUniqueIDGenSvc.h"
+
 #include "DDRec/SurfaceManager.h"
 
 #include <random>
@@ -74,10 +75,9 @@
 enum { hu = 0, hv, hT, hitE, hitsAccepted, diffu, diffv, diffT, hSize };
 
 struct DDPlanarDigi final
-    : Gaudi::Functional::MultiTransformer<
+    : k4FWCore::MultiTransformer<
           std::tuple<edm4hep::TrackerHitPlaneCollection, edm4hep::MCRecoTrackerHitPlaneAssociationCollection>(
-              const edm4hep::SimTrackerHitCollection&, const edm4hep::EventHeaderCollection&),
-          BaseClass_t> {
+              const edm4hep::SimTrackerHitCollection&, const edm4hep::EventHeaderCollection&)> {
   DDPlanarDigi(const std::string& name, ISvcLocator* svcLoc);
 
   StatusCode initialize() override;