diff --git a/include/KDCluster.h b/include/KDCluster.h
index 870b1eb..70270e4 100644
--- a/include/KDCluster.h
+++ b/include/KDCluster.h
@@ -16,6 +16,7 @@
 #include <IMPL/TrackImpl.h>
 
 #include <UTIL/CellIDEncoder.h>
+#include "UTIL/LCTrackerConf.h"
 #include <UTIL/ILDConf.h>
 #include <UTIL/BitSet32.h>
 #include <UTIL/LCRelationNavigator.h>
diff --git a/src/ConformalTracking.cc b/src/ConformalTracking.cc
index 5dda926..3f74bae 100644
--- a/src/ConformalTracking.cc
+++ b/src/ConformalTracking.cc
@@ -18,6 +18,7 @@
 #include <IMPL/TrackImpl.h>
 
 #include <UTIL/CellIDEncoder.h>
+#include "UTIL/LCTrackerConf.h"
 #include <UTIL/ILDConf.h>
 #include <UTIL/BitSet32.h>
 #include <UTIL/LCRelationNavigator.h>
@@ -110,7 +111,7 @@ ConformalTracking::ConformalTracking() : Processor("ConformalTracking") {
   registerProcessorParameter( "MaxDistance",				"Maximum length of a cell (max. distance between two hits)", 	m_maxDistance, 				double(0.015) 	);
   registerProcessorParameter( "MaxChi2",						"Maximum chi2/ndof for linear conformal tracks", 							m_chi2cut, 						double(300.) 	);
   registerProcessorParameter( "MinClustersOnTrack", "Minimum number of clusters to create a track", 							m_minClustersOnTrack, int(6)				);
-  registerProcessorParameter( "CellIDDecoderString","Decoding string used for Cell ID calculation", 							m_decoderString, 			std::string(lcio::ILDCellID0::encoder_string));
+  registerProcessorParameter( "CellIDDecoderString","Decoding string used for Cell ID calculation", 							m_decoderString, 			std::string(lcio::LCTrackerCellID::encoding_string()));
 
 }
 
@@ -370,7 +371,7 @@ void ConformalTracking::processEvent( LCEvent* evt ) {
         // Make the conformal hit, first get subdetector information to check if it is a barrel or endcap
         const int celId = hit->getCellID0() ;
         m_encoder.setValue(celId) ;
-        int side = m_encoder[lcio::ILDCellID0::side];
+        int side = m_encoder[lcio::LCTrackerCellID::side()];
         bool isEndcap = false;
         if(side != ILDDetID::barrel) isEndcap = true;
         KDCluster* kdhit = new KDCluster(hit,isEndcap);
@@ -425,9 +426,9 @@ void ConformalTracking::processEvent( LCEvent* evt ) {
         
 //        const int celId = tempHolder[cluster]->getCellID0() ;
 //        m_encoder.setValue(celId) ;
-//        int subdet = m_encoder[lcio::ILDCellID0::subdet];
-//        int side = m_encoder[lcio::ILDCellID0::side];
-//        int layer = m_encoder[lcio::ILDCellID0::layer];
+//        int subdet = m_encoder[lcio::LCTrackerCellID::subdet()];
+//        int side = m_encoder[lcio::LCTrackerCellID::side()];
+//        int layer = m_encoder[lcio::LCTrackerCellID::layer()];
 //        
 //        double x = tempHolder[cluster]->getPosition()[0];
 //        double y = tempHolder[cluster]->getPosition()[1];
@@ -539,9 +540,9 @@ void ConformalTracking::processEvent( LCEvent* evt ) {
       // Get subdetector information and check if the hit is in the barrel or endcaps
       const int celId = hit->getCellID0() ;
       m_encoder.setValue(celId) ;
-      int subdet = m_encoder[lcio::ILDCellID0::subdet];
-      int side = m_encoder[lcio::ILDCellID0::side];
-      int layer = m_encoder[lcio::ILDCellID0::layer];
+      int subdet = m_encoder[lcio::LCTrackerCellID::subdet()];
+      int side = m_encoder[lcio::LCTrackerCellID::side()];
+      int layer = m_encoder[lcio::LCTrackerCellID::layer()];
       bool isEndcap = false;
       if(side != ILDDetID::barrel) isEndcap = true;