diff --git a/src/algorithms/fardetectors/FarDetectorTransportationPostML.cc b/src/algorithms/fardetectors/FarDetectorTransportationPostML.cc
index b854fe459d..d742c12bf8 100644
--- a/src/algorithms/fardetectors/FarDetectorTransportationPostML.cc
+++ b/src/algorithms/fardetectors/FarDetectorTransportationPostML.cc
@@ -28,8 +28,8 @@ void FarDetectorTransportationPostML::process(
     const FarDetectorTransportationPostML::Input& input,
     const FarDetectorTransportationPostML::Output& output) const {
 
-  const auto [prediction_tensors, track_associations, beamElectrons] = input;
-  auto [out_particles, out_links, out_associations]                  = output;
+  const auto [prediction_tensors, tracks, track_associations, beamElectrons] = input;
+  auto [out_particles, out_links, out_associations]                          = output;
 
   //Set beam energy from first MCBeamElectron, using std::call_once
   if (beamElectrons != nullptr) {
@@ -111,6 +111,13 @@ void FarDetectorTransportationPostML::process(
     particle.setMass(m_mass);
     particle.setPDG(m_cfg.pdg_value);
 
+    if (i >= tracks->size()) {
+      error("Prediction tensor row {} has no corresponding track (tracks size={})", i,
+            tracks->size());
+      throw std::runtime_error("Prediction tensor/track size mismatch");
+    }
+    particle.addToTracks(tracks->at(i));
+
     //Check if both association collections are set and copy the MCParticle association
     if ((track_associations != nullptr) && (track_associations->size() > i)) {
       // Copy the association from the input to the output
@@ -125,8 +132,6 @@ void FarDetectorTransportationPostML::process(
       out_association.setWeight(association.getWeight());
     }
   }
-
-  // TODO: Implement the association of the reconstructed particles with the tracks
 }
 
 } // namespace eicrecon
diff --git a/src/algorithms/fardetectors/FarDetectorTransportationPostML.h b/src/algorithms/fardetectors/FarDetectorTransportationPostML.h
index 6b74a2f608..5346c34f01 100644
--- a/src/algorithms/fardetectors/FarDetectorTransportationPostML.h
+++ b/src/algorithms/fardetectors/FarDetectorTransportationPostML.h
@@ -10,6 +10,7 @@
 #include <edm4eic/ReconstructedParticleCollection.h>
 #include <edm4eic/TensorCollection.h>
 #include <edm4hep/MCParticleCollection.h>
+#include <edm4eic/TrackCollection.h>
 #include <mutex>
 #include <optional>
 #include <string>
@@ -21,7 +22,7 @@
 namespace eicrecon {
 
 using FarDetectorTransportationPostMLAlgorithm = algorithms::Algorithm<
-    algorithms::Input<edm4eic::TensorCollection,
+    algorithms::Input<edm4eic::TensorCollection, edm4eic::TrackCollection,
                       std::optional<edm4eic::MCRecoTrackParticleAssociationCollection>,
                       std::optional<edm4hep::MCParticleCollection>>,
     algorithms::Output<edm4eic::ReconstructedParticleCollection,
@@ -36,7 +37,7 @@ class FarDetectorTransportationPostML
   FarDetectorTransportationPostML(std::string_view name)
       : FarDetectorTransportationPostMLAlgorithm{
             name,
-            {"inputPredictionsTensor", "trackAssociations", "beamElectrons"},
+            {"inputPredictionsTensor", "tracks", "trackAssociations", "beamElectrons"},
             {"outputParticles", "outputLinks", "outputAssociations"},
             "Convert ML output tensor into reconstructed electron"} {}
 
diff --git a/src/algorithms/reco/Helix.cc b/src/algorithms/reco/Helix.cc
index 5d4437515e..47ab20d713 100644
--- a/src/algorithms/reco/Helix.cc
+++ b/src/algorithms/reco/Helix.cc
@@ -36,7 +36,10 @@ Helix::Helix(const edm4hep::Vector3f& p, const edm4hep::Vector3f& o, const doubl
 Helix::Helix(const edm4eic::ReconstructedParticle& p, const double b_field) {
   const auto& tracks = p.getTracks();
   for (const auto& trk : tracks) {
-    const auto& traj    = trk.getTrajectory();
+    const auto& traj = trk.getTrajectory();
+    if (!traj.isAvailable()) {
+      continue;
+    }
     const auto& trkPars = traj.getTrackParameters();
     for (const auto& par : trkPars) {
       setParameters(par, b_field);
diff --git a/src/algorithms/tracking/IterativeVertexFinder.cc b/src/algorithms/tracking/IterativeVertexFinder.cc
index b2a0442a6a..1f850bfd10 100644
--- a/src/algorithms/tracking/IterativeVertexFinder.cc
+++ b/src/algorithms/tracking/IterativeVertexFinder.cc
@@ -178,7 +178,10 @@ void eicrecon::IterativeVertexFinder::process(const Input& input, const Output&
       for (const auto& part : *reconParticles) {
         const auto& tracks = part.getTracks();
         for (const auto& trk : tracks) {
-          const auto& traj    = trk.getTrajectory();
+          const auto& traj = trk.getTrajectory();
+          if (!traj.isAvailable()) {
+            continue;
+          }
           const auto& trkPars = traj.getTrackParameters();
           for (const auto& par : trkPars) {
             const double EPSILON = 1.0e-4; // mm
diff --git a/src/algorithms/tracking/SecondaryVertexFinder.cc b/src/algorithms/tracking/SecondaryVertexFinder.cc
index 08775d7d1a..61ab8a593f 100644
--- a/src/algorithms/tracking/SecondaryVertexFinder.cc
+++ b/src/algorithms/tracking/SecondaryVertexFinder.cc
@@ -94,7 +94,10 @@ void SecondaryVertexFinder::storeVertices(
       for (const auto& part : reconParticles) {
         const auto& tracks = part.getTracks();
         for (const auto& trk : tracks) {
-          const auto& traj    = trk.getTrajectory();
+          const auto& traj = trk.getTrajectory();
+          if (!traj.isAvailable()) {
+            continue;
+          }
           const auto& trkPars = traj.getTrackParameters();
           for (const auto& trkPar : trkPars) {
             double EPSILON = std::numeric_limits<double>::epsilon();
diff --git a/src/algorithms/tracking/TracksToParticles.cc b/src/algorithms/tracking/TracksToParticles.cc
index ed1593b81b..cabd2258fa 100644
--- a/src/algorithms/tracking/TracksToParticles.cc
+++ b/src/algorithms/tracking/TracksToParticles.cc
@@ -28,6 +28,9 @@ void TracksToParticles::process(const TracksToParticles::Input& input,
 
   for (const auto& track : *tracks) {
     auto trajectory = track.getTrajectory();
+    if (!trajectory.isAvailable()) {
+      continue;
+    }
     for (const auto& trk : trajectory.getTrackParameters()) {
       const auto mom        = edm4hep::utils::sphericalToVector(1.0 / std::abs(trk.getQOverP()),
                                                                 trk.getTheta(), trk.getPhi());
diff --git a/src/detectors/LOWQ2/LOWQ2.cc b/src/detectors/LOWQ2/LOWQ2.cc
index 1a82cca322..6c59c2028a 100644
--- a/src/detectors/LOWQ2/LOWQ2.cc
+++ b/src/detectors/LOWQ2/LOWQ2.cc
@@ -210,7 +210,8 @@ void InitPlugin(JApplication* app) {
       app));
   app->Add(new JOmniFactoryGeneratorT<FarDetectorTransportationPostML_factory>(
       "TaggerTrackerTransportationPostML",
-      {"TaggerTrackerPredictionTensor", "TaggerTrackerLocalTrackAssociations", "MCBeamElectrons"},
+      {"TaggerTrackerPredictionTensor", "TaggerTrackerLocalTracks",
+       "TaggerTrackerLocalTrackAssociations", "MCBeamElectrons"},
       {"TaggerTrackerReconstructedParticles", "TaggerTrackerReconstructedParticleLinks",
        "TaggerTrackerReconstructedParticleAssociations"},
       {
diff --git a/src/factories/fardetectors/FarDetectorTransportationPostML_factory.h b/src/factories/fardetectors/FarDetectorTransportationPostML_factory.h
index a0e831d445..209db52434 100644
--- a/src/factories/fardetectors/FarDetectorTransportationPostML_factory.h
+++ b/src/factories/fardetectors/FarDetectorTransportationPostML_factory.h
@@ -7,6 +7,7 @@
 #include "algorithms/fardetectors/FarDetectorTransportationPostML.h"
 #include "services/algorithms_init/AlgorithmsInit_service.h"
 #include "extensions/jana/JOmniFactory.h"
+#include <edm4eic/TrackCollection.h>
 
 namespace eicrecon {
 
@@ -21,6 +22,7 @@ class FarDetectorTransportationPostML_factory
   std::unique_ptr<AlgoT> m_algo;
 
   PodioInput<edm4eic::Tensor> m_prediction_tensor_input{this};
+  PodioInput<edm4eic::Track> m_tracks_input{this};
   PodioInput<edm4eic::MCRecoTrackParticleAssociation> m_association_input{this};
   PodioInput<edm4hep::MCParticle> m_beamelectrons_input{this};
 
@@ -47,7 +49,8 @@ class FarDetectorTransportationPostML_factory
 
   void Process(int32_t /* run_number */, uint64_t /* event_number */) {
     m_algo->process(
-        {m_prediction_tensor_input(), m_association_input(), m_beamelectrons_input()},
+        {m_prediction_tensor_input(), m_tracks_input(), m_association_input(),
+         m_beamelectrons_input()},
         {m_particle_output().get(), m_links_output().get(), m_association_output().get()});
   }
 };