diff --git a/Detector/DetComponents/src/RedoSegmentation.cpp b/Detector/DetComponents/src/RedoSegmentation.cpp
index 8985f63..92f13c1 100644
--- a/Detector/DetComponents/src/RedoSegmentation.cpp
+++ b/Detector/DetComponents/src/RedoSegmentation.cpp
@@ -67,7 +67,7 @@ StatusCode RedoSegmentation::initialize() {
     m_segmentationType=2;
   else
     m_segmentationType=0;
-  m_oldSegmentation = m_geoSvc->lcdd()->readout(m_oldReadoutName).segmentation().segmentation();
+  m_oldSegmentation = m_geoSvc->getDetector()->readout(m_oldReadoutName).segmentation().segmentation();
   info() << "Old segmentation is of type:\t" << m_oldSegmentation->type() << endmsg;
   if (m_oldSegmentation->type() == "FCCSWGridModuleThetaMerged")
     m_oldSegmentationType=2;
diff --git a/SimG4Components/src/InspectHitsCollectionsTool.cpp b/SimG4Components/src/InspectHitsCollectionsTool.cpp
index deda4d8..34aeca3 100644
--- a/SimG4Components/src/InspectHitsCollectionsTool.cpp
+++ b/SimG4Components/src/InspectHitsCollectionsTool.cpp
@@ -34,7 +34,7 @@ StatusCode InspectHitsCollectionsTool::initialize() {
             << "Make sure you have GeoSvc and SimSvc in the right order in the configuration." << endmsg;
     return StatusCode::FAILURE;
   }
-  auto lcdd = m_geoSvc->lcdd();
+  auto lcdd = m_geoSvc->getDetector();
   auto allReadouts = lcdd->readouts();
   for (auto& readoutName : m_readoutNames) {
     if (allReadouts.find(readoutName) == allReadouts.end()) {
@@ -62,7 +62,7 @@ StatusCode InspectHitsCollectionsTool::saveOutput(const G4Event& aEvent) {
         info() << "\tcollection #: " << iter_coll << "\tname: " << collect->GetName()
                << "\tsize: " << collect->GetSize() << endmsg;
         size_t n_hit = collect->GetSize();
-        auto decoder = m_geoSvc->lcdd()->readout(collect->GetName()).idSpec().decoder();
+        auto decoder = m_geoSvc->getDetector()->readout(collect->GetName()).idSpec().decoder();
         for (size_t iter_hit = 0; iter_hit < n_hit; iter_hit++) {
           hitT = dynamic_cast<k4::Geant4PreDigiTrackHit*>(collect->GetHit(iter_hit));
           if (hitT) {