diff --git a/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h b/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
index 723db5fc069..b7fd3e34524 100644
--- a/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
+++ b/PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
@@ -124,12 +124,6 @@ DECLARE_SOA_COLUMN(DecayVtxY, decayVtxY, float);     //! Y position of the decay
 DECLARE_SOA_COLUMN(DecayVtxZ, decayVtxZ, float);     //! Z position of the decay vertex
 DECLARE_SOA_COLUMN(MKaon, mKaon, float);             //! The invariant mass of V0 candidate, assuming kaon
 
-DECLARE_SOA_COLUMN(TOFNSigmaEl, tofNSigmaEl, float);
-DECLARE_SOA_COLUMN(TOFNSigmaPi, tofNSigmaPi, float);
-DECLARE_SOA_COLUMN(TOFNSigmaKa, tofNSigmaKa, float);
-DECLARE_SOA_COLUMN(TOFNSigmaPr, tofNSigmaPr, float);
-DECLARE_SOA_COLUMN(TOFNSigmaDe, tofNSigmaDe, float);
-
 } // namespace femtouniverseparticle
 DECLARE_SOA_TABLE(FDParticles, "AOD", "FDPARTICLE",
                   o2::soa::Index<>,
@@ -168,11 +162,11 @@ DECLARE_SOA_TABLE(FDExtParticles, "AOD", "FDEXTPARTICLE",
                   pidtpc_tiny::TPCNSigmaStoreKa,
                   pidtpc_tiny::TPCNSigmaStorePr,
                   pidtpc_tiny::TPCNSigmaStoreDe,
-                  femtouniverseparticle::TOFNSigmaEl,
-                  femtouniverseparticle::TOFNSigmaPi,
-                  femtouniverseparticle::TOFNSigmaKa,
-                  femtouniverseparticle::TOFNSigmaPr,
-                  femtouniverseparticle::TOFNSigmaDe,
+                  pidtof_tiny::TOFNSigmaStoreEl,
+                  pidtof_tiny::TOFNSigmaStorePi,
+                  pidtof_tiny::TOFNSigmaStoreKa,
+                  pidtof_tiny::TOFNSigmaStorePr,
+                  pidtof_tiny::TOFNSigmaStoreDe,
                   femtouniverseparticle::DaughDCA,
                   femtouniverseparticle::TransRadius,
                   femtouniverseparticle::DecayVtxX,
@@ -184,7 +178,12 @@ DECLARE_SOA_TABLE(FDExtParticles, "AOD", "FDEXTPARTICLE",
                   pidtpc_tiny::TPCNSigmaPi<pidtpc_tiny::TPCNSigmaStorePi>,
                   pidtpc_tiny::TPCNSigmaKa<pidtpc_tiny::TPCNSigmaStoreKa>,
                   pidtpc_tiny::TPCNSigmaPr<pidtpc_tiny::TPCNSigmaStorePr>,
-                  pidtpc_tiny::TPCNSigmaDe<pidtpc_tiny::TPCNSigmaStoreDe>);
+                  pidtpc_tiny::TPCNSigmaDe<pidtpc_tiny::TPCNSigmaStoreDe>,
+                  pidtof_tiny::TOFNSigmaEl<pidtof_tiny::TOFNSigmaStoreEl>,
+                  pidtof_tiny::TOFNSigmaPi<pidtof_tiny::TOFNSigmaStorePi>,
+                  pidtof_tiny::TOFNSigmaKa<pidtof_tiny::TOFNSigmaStoreKa>,
+                  pidtof_tiny::TOFNSigmaPr<pidtof_tiny::TOFNSigmaStorePr>,
+                  pidtof_tiny::TOFNSigmaDe<pidtof_tiny::TOFNSigmaStoreDe>);
 using FDFullParticle = FDExtParticles::iterator;
 
 /// FemtoUniverseTrackMC
diff --git a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx
index d52c4966a7b..838567876fb 100644
--- a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx
+++ b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx
@@ -65,8 +65,8 @@ using FemtoFullCollisionMC = soa::Join<aod::Collisions, aod::EvSels, aod::Mults,
 using FemtoFullTracks =
   soa::Join<aod::FullTracks, aod::TracksDCA, aod::TOFSignal, aod::pidTPCEl, aod::TrackSelection,
             aod::pidTPCMu, aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr,
-            aod::pidTPCDe, aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
-            aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFFullDe>;
+            aod::pidTPCDe, aod::pidTOFEl, aod::pidTOFMu, aod::pidTOFPi,
+            aod::pidTOFKa, aod::pidTOFPr, aod::pidTOFDe>;
 
 // using FilteredFullV0s = soa::Filtered<aod::V0Datas>; /// predefined Join
 // table for o2::aod::V0s = soa::Join<o2::aod::TransientV0s, o2::aod::StoredV0s>
@@ -450,9 +450,9 @@ struct femtoUniverseProducerTask {
                        particle.dcaXY(), particle.dcaZ(), particle.tpcSignal(),
                        particle.tpcNSigmaStoreEl(), particle.tpcNSigmaStorePi(),
                        particle.tpcNSigmaStoreKa(), particle.tpcNSigmaStorePr(),
-                       particle.tpcNSigmaStoreDe(), particle.tofNSigmaEl(),
-                       particle.tofNSigmaPi(), particle.tofNSigmaKa(),
-                       particle.tofNSigmaPr(), particle.tofNSigmaDe(),
+                       particle.tpcNSigmaStoreDe(), particle.tofNSigmaStoreEl(),
+                       particle.tofNSigmaStorePi(), particle.tofNSigmaStoreKa(),
+                       particle.tofNSigmaStorePr(), particle.tofNSigmaStoreDe(),
                        -999., -999., -999., -999., -999., -999.);
     } else if constexpr (isPhiOrD0) {
       outputDebugParts(-999., -999., -999., -999., -999., -999., -999., -999.,
diff --git a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.cxx b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.cxx
index 5697376630e..1e801a5937c 100644
--- a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.cxx
+++ b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.cxx
@@ -39,6 +39,7 @@ using namespace o2::aod::pidutils;
 struct femtoUniversePairTaskTrackV0Extended {
 
   SliceCache cache;
+  // using FemtoFullParticles = soa::Join<aod::FDParticles, aod::FUExtParticles>;
   using FemtoFullParticles = soa::Join<aod::FDParticles, aod::FDExtParticles>;
   Preslice<FemtoFullParticles> perCol = aod::femtouniverseparticle::fdCollisionId;
 
@@ -175,7 +176,7 @@ struct femtoUniversePairTaskTrackV0Extended {
     for (auto& part : groupPartsOne) {
       /// PID using stored binned nsigma
       const float tpcNSigmas[3] = {unPackInTable<aod::pidtpc_tiny::binning>(part.tpcNSigmaStorePr()), unPackInTable<aod::pidtpc_tiny::binning>(part.tpcNSigmaStorePi()), unPackInTable<aod::pidtpc_tiny::binning>(part.tpcNSigmaStoreKa())};
-      const float tofNSigmas[3] = {part.tofNSigmaPr(), part.tofNSigmaPi(), part.tofNSigmaKa()};
+      const float tofNSigmas[3] = {unPackInTable<aod::pidtof_tiny::binning>(part.tofNSigmaStorePr()), unPackInTable<aod::pidtof_tiny::binning>(part.tofNSigmaStorePi()), unPackInTable<aod::pidtof_tiny::binning>(part.tofNSigmaStoreKa())};
 
       if (!IsParticleNSigma(part.p(), tpcNSigmas[ConfTrackChoicePartOne], tofNSigmas[ConfTrackChoicePartOne])) {
         continue;
@@ -199,7 +200,7 @@ struct femtoUniversePairTaskTrackV0Extended {
       }
       /// PID using stored binned nsigma
       const float tpcNSigmas[3] = {unPackInTable<aod::pidtpc_tiny::binning>(p1.tpcNSigmaStorePr()), unPackInTable<aod::pidtpc_tiny::binning>(p1.tpcNSigmaStorePi()), unPackInTable<aod::pidtpc_tiny::binning>(p1.tpcNSigmaStoreKa())};
-      const float tofNSigmas[3] = {p1.tofNSigmaPr(), p1.tofNSigmaPi(), p1.tofNSigmaKa()};
+      const float tofNSigmas[3] = {unPackInTable<aod::pidtof_tiny::binning>(p1.tofNSigmaStorePr()), unPackInTable<aod::pidtof_tiny::binning>(p1.tofNSigmaStorePi()), unPackInTable<aod::pidtof_tiny::binning>(p1.tofNSigmaStoreKa())};
 
       if (!IsParticleNSigma(p1.p(), tpcNSigmas[ConfTrackChoicePartOne], tofNSigmas[ConfTrackChoicePartOne])) {
         continue;
@@ -241,7 +242,7 @@ struct femtoUniversePairTaskTrackV0Extended {
         }
         /// PID using stored binned nsigma
         const float tpcNSigmas[3] = {unPackInTable<aod::pidtpc_tiny::binning>(p1.tpcNSigmaStorePr()), unPackInTable<aod::pidtpc_tiny::binning>(p1.tpcNSigmaStorePi()), unPackInTable<aod::pidtpc_tiny::binning>(p1.tpcNSigmaStoreKa())};
-        const float tofNSigmas[3] = {p1.tofNSigmaPr(), p1.tofNSigmaPi(), p1.tofNSigmaKa()};
+        const float tofNSigmas[3] = {unPackInTable<aod::pidtof_tiny::binning>(p1.tofNSigmaStorePr()), unPackInTable<aod::pidtof_tiny::binning>(p1.tofNSigmaStorePi()), unPackInTable<aod::pidtof_tiny::binning>(p1.tofNSigmaStoreKa())};
 
         if (!IsParticleNSigma(p1.p(), tpcNSigmas[ConfTrackChoicePartOne], tofNSigmas[ConfTrackChoicePartOne])) {
           continue;