diff --git a/ForwardDetectors/ForwardTracker/ForwardTracker/ForwardTrack.h b/ForwardDetectors/ForwardTracker/ForwardTracker/ForwardTrack.h
index c064c5b6ef8f954ee31145c01cef4e842fa44538..113c0dae464e17e8d25491f1002ae5523b734091 100644
--- a/ForwardDetectors/ForwardTracker/ForwardTracker/ForwardTrack.h
+++ b/ForwardDetectors/ForwardTracker/ForwardTracker/ForwardTrack.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ForwardTrack_H
@@ -16,13 +16,13 @@ class ForwardTrack {
   
   ForwardTrack();
   
-  void initialize(ForwardTracker::ConfigData);
+  void initialize(const ForwardTracker::ConfigData&);
   
   bool TrackParticle(ForwardTracker::Particle);
 
-  inline ForwardTracker::Point    fPos() { return m_fPosition; }
-  inline ForwardTracker::Point    fMom() { return m_fMomentum; }
-  inline ForwardTracker::Particle fPar() { return m_fParticle; }
+  inline const ForwardTracker::Point&    fPos() { return m_fPosition; }
+  inline const ForwardTracker::Point&    fMom() { return m_fMomentum; }
+  inline const ForwardTracker::Particle& fPar() { return m_fParticle; }
 
  private:
 
diff --git a/ForwardDetectors/ForwardTracker/src/ForwardTrack.cxx b/ForwardDetectors/ForwardTracker/src/ForwardTrack.cxx
index c0561543b33eabe2db6c23c7bc48fa887b8e5227..8e86eb315a578763d8d4c08b57a94f682ef245c9 100644
--- a/ForwardDetectors/ForwardTracker/src/ForwardTrack.cxx
+++ b/ForwardDetectors/ForwardTracker/src/ForwardTrack.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ForwardTracker/BeamlineSetup.h"
@@ -11,7 +11,7 @@ ForwardTrack::ForwardTrack()
 {
 }
 
-void ForwardTrack::initialize(ForwardTracker::ConfigData cData) {
+void ForwardTrack::initialize(const ForwardTracker::ConfigData& cData) {
   
   std::cout << " ForwardTrack::initialize " << std::endl;
   std::cout << " ConfigData "               << cData;