diff --git a/benchmarks/far_forward/options/far_forward_reconstruction.py b/benchmarks/far_forward/options/far_forward_reconstruction.py
index 59fc6494ff94df3b9011123f7c68fcf5a8519361..50420e8c0ba23117d2cc8f8ea1d07c189bfc118b 100644
--- a/benchmarks/far_forward/options/far_forward_reconstruction.py
+++ b/benchmarks/far_forward/options/far_forward_reconstruction.py
@@ -16,7 +16,9 @@ geo_service = GeoSvc("GeoSvc", detectors=[compact_path], OutputLevel=WARNING)
 podioevent = EICDataSvc("EventDataSvc", inputs=input_sims, OutputLevel=WARNING)
 
 from Configurables import PodioInput
-from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi
+
+from Configurables import Jug__Digi__SimTrackerHitCollector as SimTrackerHitCollector
+from Configurables import Jug__Digi__SiliconTrackerDigi as TrackerDigi
 from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerReco
 
 from Configurables import Jug__Reco__TrackerSourceLinker as TrackerSourceLinker
@@ -32,8 +34,12 @@ from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitRecon
 sim_colls = [
     "MCParticles",
     "B0TrackerHits",
-    "ForwardRomanPotHits",
-    "ForwardOffMTrackerHits"
+    "ForwardRomanPotHits1",
+    "ForwardRomanPotHits2",
+    "ForwardOffMTrackerHits1"
+    "ForwardOffMTrackerHits2"
+    "ForwardOffMTrackerHits3"
+    "ForwardOffMTrackerHits4"
 ]
 
 # list of algorithms
@@ -44,6 +50,12 @@ podin = PodioInput("PodioReader", collections=sim_colls)
 algorithms.append(podin)
 
 ## Roman pots
+ffi_romanpot_coll = SimTrackerHitCollector("ffi_romanpot_coll",
+        inputSimTrackerHits = [
+                "ForwardRomanPotHits1",
+                "ForwardRomanPotHits2"],
+        outputSimTrackerHits = "ForwardRomanPotHits")
+algorithms.append(ffi_romanpot_coll)
 ffi_romanpot_digi = TrackerDigi("ffi_romanpot_digi",
         inputHitCollection = "ForwardRomanPotHits",
         outputHitCollection = "ForwardRomanPotRawHits",
@@ -61,6 +73,14 @@ ffi_romanpot_parts = FarForwardParticles("ffi_romanpot_parts",
 algorithms.append(ffi_romanpot_parts)
 
 ## Off momentum tracker
+ffi_offmtracker_coll = SimTrackerHitCollector("ffi_offmtracker_coll",
+        inputSimTrackerHits = [
+                "ForwardOffMTrackerHits1",
+                "ForwardOffMTrackerHits2",
+                "ForwardOffMTrackerHits3",
+                "ForwardOffMTrackerHits4"],
+        outputSimTrackerHits = "ForwardOffMTrackerHits")
+algorithms.append(ffi_romanpot_coll)
 ffi_offmtracker_digi = TrackerDigi("ffi_offmtracker_digi",
         inputHitCollection = "ForwardOffMTrackerHits",
         outputHitCollection = "ForwardOffMTrackerRawHits",
diff --git a/benchmarks/track_finding/options/track_reconstruction.py b/benchmarks/track_finding/options/track_reconstruction.py
index f9ee38dc532fdaa8a5286fd356b6156644a365ba..ef88832c4de9eba4114879567e75f724b0456275 100644
--- a/benchmarks/track_finding/options/track_reconstruction.py
+++ b/benchmarks/track_finding/options/track_reconstruction.py
@@ -100,6 +100,7 @@ algorithms.append( podioinput )
 trk_b_coll = SimTrackerHitsCollector("trk_b_coll",
         inputSimTrackerHits = tracker_barrel_collections,
         outputSimTrackerHits = "TrackerBarrelHits")
+algorithms.append( trk_b_coll )
 trk_b_digi = TrackerDigi("trk_b_digi",
         inputHitCollection = trk_b_coll.outputSimTrackerHits,
         outputHitCollection = "TrackerBarrelRawHits",
@@ -109,6 +110,7 @@ algorithms.append( trk_b_digi )
 trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll",
         inputSimTrackerHits = tracker_endcap_collections,
         outputSimTrackerHits = "TrackerEndcapHits")
+algorithms.append( trk_ec_coll )
 trk_ec_digi = TrackerDigi("trk_ec_digi",
         inputHitCollection = trk_ec_coll.outputSimTrackerHits,
         outputHitCollection = "TrackerEndcapRawHits",
@@ -118,6 +120,7 @@ algorithms.append( trk_ec_digi )
 vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll",
         inputSimTrackerHits = vertex_barrel_collections,
         outputSimTrackerHits = "VertexBarrelHits")
+algorithms.append( vtx_b_coll )
 vtx_b_digi = TrackerDigi("vtx_b_digi",
         inputHitCollection = vtx_b_coll.outputSimTrackerHits,
         outputHitCollection = "VertexBarrelRawHits",
@@ -128,6 +131,7 @@ if 'acadia' in detector_version:
     vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll",
             inputSimTrackerHits = vertex_endcap_collections,
             outputSimTrackerHits = "VertexEndcapHits")
+    algorithms.append( vtx_ec_coll )
     vtx_ec_digi = TrackerDigi("vtx_ec_digi",
             inputHitCollection = vtx_ec_coll.outputSimTrackerHits,
             outputHitCollection = "VertexEndcapRawHits",
@@ -137,6 +141,7 @@ else:
     mm_b_coll = SimTrackerHitsCollector("mm_b_coll",
             inputSimTrackerHits = mpgd_barrel_collections,
             outputSimTrackerHits = "MPGDTrackerBarrelHits")
+    algorithms.append( mm_b_coll )
     mm_b_digi = TrackerDigi("mm_b_digi",
             inputHitCollection = mm_b_coll.outputSimTrackerHits,
             outputHitCollection = "MPGDTrackerBarrelRawHits",
@@ -146,11 +151,12 @@ else:
 gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll",
         inputSimTrackerHits = gem_endcap_collections,
         outputSimTrackerHits = "GEMTrackerEndcapHits")
+algorithms.append( gem_ec_coll )
 gem_ec_digi = TrackerDigi("gem_ec_digi",
         inputHitCollection = gem_ec_coll.outputSimTrackerHits,
         outputHitCollection = "GEMTrackerEndcapRawHits",
         timeResolution=10)
-algorithms.append(gem_ec_digi)
+algorithms.append( gem_ec_digi )
 
 # Tracker and vertex reconstruction
 trk_b_reco = TrackerHitReconstruction("trk_b_reco",
diff --git a/benchmarks/track_fitting/options/track_reconstruction.py b/benchmarks/track_fitting/options/track_reconstruction.py
index 31e4a6ce499cff0dfdeaa821261d7d304b0ab67c..fc6ed688adf8e942a2d5a6c63da0e96ad110c57b 100644
--- a/benchmarks/track_fitting/options/track_reconstruction.py
+++ b/benchmarks/track_fitting/options/track_reconstruction.py
@@ -99,6 +99,7 @@ algorithms.append( podioinput )
 trk_b_coll = SimTrackerHitsCollector("trk_b_coll",
         inputSimTrackerHits = tracker_barrel_collections,
         outputSimTrackerHits = "TrackerBarrelHits")
+algorithms.append( trk_b_coll )
 trk_b_digi = TrackerDigi("trk_b_digi",
         inputHitCollection = trk_b_coll.outputSimTrackerHits,
         outputHitCollection = "TrackerBarrelRawHits",
@@ -108,6 +109,7 @@ algorithms.append( trk_b_digi )
 trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll",
         inputSimTrackerHits = tracker_endcap_collections,
         outputSimTrackerHits = "TrackerEndcapHits")
+algorithms.append( trk_ec_coll )
 trk_ec_digi = TrackerDigi("trk_ec_digi",
         inputHitCollection = trk_ec_coll.outputSimTrackerHits,
         outputHitCollection = "TrackerEndcapRawHits",
@@ -117,6 +119,7 @@ algorithms.append( trk_ec_digi )
 vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll",
         inputSimTrackerHits = vertex_barrel_collections,
         outputSimTrackerHits = "VertexBarrelHits")
+algorithms.append( vtx_b_coll )
 vtx_b_digi = TrackerDigi("vtx_b_digi",
         inputHitCollection = vtx_b_coll.outputSimTrackerHits,
         outputHitCollection = "VertexBarrelRawHits",
@@ -127,6 +130,7 @@ if 'acadia' in detector_version:
     vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll",
             inputSimTrackerHits = vertex_endcap_collections,
             outputSimTrackerHits = "VertexEndcapHits")
+    algorithms.append( vtx_ec_coll )
     vtx_ec_digi = TrackerDigi("vtx_ec_digi",
             inputHitCollection = vtx_ec_coll.outputSimTrackerHits,
             outputHitCollection = "VertexEndcapRawHits",
@@ -136,6 +140,7 @@ else:
     mm_b_coll = SimTrackerHitsCollector("mm_b_coll",
             inputSimTrackerHits = mpgd_barrel_collections,
             outputSimTrackerHits = "MPGDTrackerBarrelHits")
+    algorithms.append( mm_b_coll )
     mm_b_digi = TrackerDigi("mm_b_digi",
             inputHitCollection = mm_b_coll.outputSimTrackerHits,
             outputHitCollection = "MPGDTrackerBarrelRawHits",
@@ -145,11 +150,12 @@ else:
 gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll",
         inputSimTrackerHits = gem_endcap_collections,
         outputSimTrackerHits = "GEMTrackerEndcapHits")
+algorithms.append( gem_ec_coll )
 gem_ec_digi = TrackerDigi("gem_ec_digi",
         inputHitCollection = gem_ec_coll.outputSimTrackerHits,
         outputHitCollection = "GEMTrackerEndcapRawHits",
         timeResolution=10)
-algorithms.append(gem_ec_digi)
+algorithms.append( gem_ec_digi )
 
 # Tracker and vertex reconstruction
 trk_b_reco = TrackerHitReconstruction("trk_b_reco",
diff --git a/benchmarks/tracking/options/track_reconstruction.py b/benchmarks/tracking/options/track_reconstruction.py
index 2512324c9a9f44004fddb69b9db893c5a0afffd6..11f4862fb78f0bc88095b1e0f3489d24d703dc28 100644
--- a/benchmarks/tracking/options/track_reconstruction.py
+++ b/benchmarks/tracking/options/track_reconstruction.py
@@ -100,6 +100,7 @@ algorithms.append( podioinput )
 trk_b_coll = SimTrackerHitsCollector("trk_b_coll",
         inputSimTrackerHits = tracker_barrel_collections,
         outputSimTrackerHits = "TrackerBarrelHits")
+algorithms.append( trk_b_coll )
 trk_b_digi = TrackerDigi("trk_b_digi",
         inputHitCollection = trk_b_coll.outputSimTrackerHits,
         outputHitCollection = "TrackerBarrelRawHits",
@@ -109,6 +110,7 @@ algorithms.append( trk_b_digi )
 trk_ec_coll = SimTrackerHitsCollector("trk_ec_coll",
         inputSimTrackerHits = tracker_endcap_collections,
         outputSimTrackerHits = "TrackerEndcapHits")
+algorithms.append( trk_ec_coll )
 trk_ec_digi = TrackerDigi("trk_ec_digi",
         inputHitCollection = trk_ec_coll.outputSimTrackerHits,
         outputHitCollection = "TrackerEndcapRawHits",
@@ -118,6 +120,7 @@ algorithms.append( trk_ec_digi )
 vtx_b_coll = SimTrackerHitsCollector("vtx_b_coll",
         inputSimTrackerHits = vertex_barrel_collections,
         outputSimTrackerHits = "VertexBarrelHits")
+algorithms.append( vtx_b_coll )
 vtx_b_digi = TrackerDigi("vtx_b_digi",
         inputHitCollection = vtx_b_coll.outputSimTrackerHits,
         outputHitCollection = "VertexBarrelRawHits",
@@ -128,6 +131,7 @@ if 'acadia' in detector_version:
     vtx_ec_coll = SimTrackerHitsCollector("vtx_ec_coll",
             inputSimTrackerHits = vertex_endcap_collections,
             outputSimTrackerHits = "VertexEndcapHits")
+    algorithms.append( vtx_ec_coll )
     vtx_ec_digi = TrackerDigi("vtx_ec_digi",
             inputHitCollection = vtx_ec_coll.outputSimTrackerHits,
             outputHitCollection = "VertexEndcapRawHits",
@@ -137,6 +141,7 @@ else:
     mm_b_coll = SimTrackerHitsCollector("mm_b_coll",
             inputSimTrackerHits = mpgd_barrel_collections,
             outputSimTrackerHits = "MPGDTrackerBarrelHits")
+    algorithms.append( mm_b_coll )
     mm_b_digi = TrackerDigi("mm_b_digi",
             inputHitCollection = mm_b_coll.outputSimTrackerHits,
             outputHitCollection = "MPGDTrackerBarrelRawHits",
@@ -146,11 +151,12 @@ else:
 gem_ec_coll = SimTrackerHitsCollector("gem_ec_coll",
         inputSimTrackerHits = gem_endcap_collections,
         outputSimTrackerHits = "GEMTrackerEndcapHits")
+algorithms.append( gem_ec_coll )
 gem_ec_digi = TrackerDigi("gem_ec_digi",
         inputHitCollection = gem_ec_coll.outputSimTrackerHits,
         outputHitCollection = "GEMTrackerEndcapRawHits",
         timeResolution=10)
-algorithms.append(gem_ec_digi)
+algorithms.append( gem_ec_digi )
 
 # Tracker and vertex reconstruction
 trk_b_reco = TrackerHitReconstruction("trk_b_reco",