diff --git a/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp b/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
index 7b361351a17c987464727d72a02cee69859e942b..aea43eec01348fb7e7e057c8f2e8a07270293f0f 100644
--- a/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
+++ b/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
@@ -162,7 +162,7 @@ bool GenfitTrack::createGenfitTrackFromMCParticle(int pidType,
 
 ///Create a Genfit track with MCParticle, unit conversion here
 bool GenfitTrack::createGenfitTrackFromEDM4HepTrack(int pidType,
-        const edm4hep::Track& track, double eventStartTime)
+        edm4hep::ConstTrack& track, double eventStartTime)
 {
     //std::cout<<__FILE__<<"   "<<__LINE__<<" bz kilogauss "<<m_genfitField->getBz({0.,0.,0.})/dd4hep::kilogauss<<std::endl;
     //std::cout<<__FILE__<<"   "<<__LINE__<<" bz tesla "<<m_genfitField->getBz({0.,0.,0.})/dd4hep::tesla<<std::endl;
@@ -307,7 +307,7 @@ void GenfitTrack::addWireMeasurement(double driftDistance,
 }//end of addWireMeasurementOnTrack
 
 //Add wire measurement on wire, unit conversion here
-bool GenfitTrack::addWireMeasurementOnTrack(edm4hep::Track& track,double sigma)
+bool GenfitTrack::addWireMeasurementOnTrack(edm4hep::ConstTrack& track,double sigma)
 {
     for(unsigned int iHit=0;iHit<track.trackerHits_size();iHit++){
         edm4hep::ConstTrackerHit hit=track.getTrackerHits(iHit);
@@ -644,7 +644,7 @@ double GenfitTrack::extrapolateToHit( TVector3& poca, TVector3& pocaDir,
 
 
 ///Add space point measurement from edm4hep::Track to genfit track
-int GenfitTrack::addSimTrackerHits(const edm4hep::Track& track,
+int GenfitTrack::addSimTrackerHits(edm4hep::ConstTrack& track,
         const edm4hep::MCRecoTrackerAssociationCollection* assoHits,
         float sigma,bool smear){
     //A TrakerHit collection
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitTrack.h b/Reconstruction/RecGenfitAlg/src/GenfitTrack.h
index 422ffd0fdcbe39fa4bb9bd3ca5bd85868494e8ec..678e73762da46fa91b2a8871f7c326bc9d94a2f7 100644
--- a/Reconstruction/RecGenfitAlg/src/GenfitTrack.h
+++ b/Reconstruction/RecGenfitAlg/src/GenfitTrack.h
@@ -43,6 +43,7 @@ namespace edm4hep{
     class ReconstructedParticle;
     class MCRecoTrackerAssociationCollection;
     class Track;
+    class ConstTrack;
     class ConstTrackerHit;
     class Vector3d;
     class Vector3f;
@@ -91,7 +92,7 @@ class GenfitTrack {
     ///Create genfit track from MCParticle
     bool createGenfitTrackFromMCParticle(int pidTyep,const edm4hep::MCParticle&
             mcParticle, double eventStartTime=0.);
-    bool createGenfitTrackFromEDM4HepTrack(int pidType,const edm4hep::Track& track,
+    bool createGenfitTrackFromEDM4HepTrack(int pidType, edm4hep::ConstTrack& track,
             double eventStartTime);
 
     //  /// Prepare a hit list, return number of hits on track
@@ -110,10 +111,10 @@ class GenfitTrack {
             const TVector3& endPoint2, int lrAmbig, int detID, int hitID);
 
     /// Add a WireMeasurement with DC digi
-    virtual bool addWireMeasurementOnTrack(edm4hep::Track& track, double sigma);
+    virtual bool addWireMeasurementOnTrack(edm4hep::ConstTrack& track, double sigma);
 
     ///Add space point from truth to track
-    int addSimTrackerHits(const edm4hep::Track& track,
+    int addSimTrackerHits( edm4hep::ConstTrack& track,
         const edm4hep::MCRecoTrackerAssociationCollection* assoHits,
         float sigma,bool smear=false);// float nSigmaSelection
 
diff --git a/Reconstruction/RecGenfitAlg/src/RecGenfitAlgDC.cpp b/Reconstruction/RecGenfitAlg/src/RecGenfitAlgDC.cpp
index 0e93b89c6c02fcb03f2ffb3b14a484169c347675..6619c418ebd22f4dc7d21d1be1a52327e8dd2a7d 100644
--- a/Reconstruction/RecGenfitAlg/src/RecGenfitAlgDC.cpp
+++ b/Reconstruction/RecGenfitAlg/src/RecGenfitAlgDC.cpp
@@ -384,7 +384,7 @@ void RecGenfitAlgDC::debugEvent()
     m_nSimDCHit=simDCHitCol->size();
     int iHit=0;
     for(auto simDCHit: *simDCHitCol){
-        edm4hep::Vector3d pos=simDCHit.position();
+        edm4hep::Vector3d pos=simDCHit.getPosition();
         TVectorD p(3);
         p[0]=pos.x;//no unit conversion here
         p[1]=pos.y;