diff --git a/PWGDQ/Core/VarManager.cxx b/PWGDQ/Core/VarManager.cxx
index e7f84bda876..383b4d5f8ee 100644
--- a/PWGDQ/Core/VarManager.cxx
+++ b/PWGDQ/Core/VarManager.cxx
@@ -1346,6 +1346,58 @@ void VarManager::SetDefaultVarNames()
   fgVariableUnits[kBdtPrompt] = " ";
   fgVariableNames[kBdtNonprompt] = "kBdtNonprompt";
   fgVariableUnits[kBdtNonprompt] = " ";
+  fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
+  fgVariableUnits[kAmplitudeFT0A] = "a.u.";
+  fgVariableNames[kAmplitudeFT0C] = "FT0C amplitude";
+  fgVariableUnits[kAmplitudeFT0C] = "a.u.";
+  fgVariableNames[kTimeFT0A] = "FT0A time";
+  fgVariableUnits[kTimeFT0A] = "ns";
+  fgVariableNames[kTimeFT0C] = "FT0C time";
+  fgVariableUnits[kTimeFT0C] = "ns";
+  fgVariableNames[kTriggerMaskFT0] = "FT0 trigger mask";
+  fgVariableUnits[kTriggerMaskFT0] = "";
+  fgVariableNames[kNFiredChannelsFT0A] = "FT0A fired channels";
+  fgVariableUnits[kNFiredChannelsFT0A] = "";
+  fgVariableNames[kNFiredChannelsFT0C] = "FT0C fired channels";
+  fgVariableUnits[kNFiredChannelsFT0C] = "";
+  fgVariableNames[kAmplitudeFDDA] = "FDDA amplitude";
+  fgVariableUnits[kAmplitudeFDDA] = "a.u.";
+  fgVariableNames[kAmplitudeFDDC] = "FDDC amplitude";
+  fgVariableUnits[kAmplitudeFDDC] = "a.u.";
+  fgVariableNames[kTimeFDDA] = "FDDA time";
+  fgVariableUnits[kTimeFDDA] = "ns";
+  fgVariableNames[kTimeFDDC] = "FDDC time";
+  fgVariableUnits[kTimeFDDC] = "ns";
+  fgVariableNames[kTriggerMaskFDD] = "FDD trigger mask";
+  fgVariableUnits[kTriggerMaskFDD] = "";
+  fgVariableNames[kAmplitudeFV0A] = "FV0A amplitude";
+  fgVariableUnits[kAmplitudeFV0A] = "a.u.";
+  fgVariableNames[kTimeFV0A] = "FV0A time";
+  fgVariableUnits[kTimeFV0A] = "ns";
+  fgVariableNames[kTriggerMaskFV0A] = "FV0A trigger mask";
+  fgVariableUnits[kTriggerMaskFV0A] = "";
+  fgVariableNames[kNFiredChannelsFV0A] = "FV0A fired channels";
+  fgVariableUnits[kNFiredChannelsFV0A] = "";
+  fgVariableNames[kBBFT0Apf] = "FT0A BB pileup flag";
+  fgVariableUnits[kBBFT0Apf] = "";
+  fgVariableNames[kBGFT0Apf] = "FT0A BG pileup flag";
+  fgVariableUnits[kBGFT0Apf] = "";
+  fgVariableNames[kBBFT0Cpf] = "FT0C BB pileup flag";
+  fgVariableUnits[kBBFT0Cpf] = "";
+  fgVariableNames[kBGFT0Cpf] = "FT0C BG pileup flag";
+  fgVariableUnits[kBGFT0Cpf] = "";
+  fgVariableNames[kBBFV0Apf] = "FV0A BB pileup flag";
+  fgVariableUnits[kBBFV0Apf] = "";
+  fgVariableNames[kBGFV0Apf] = "FV0A BG pileup flag";
+  fgVariableUnits[kBGFV0Apf] = "";
+  fgVariableNames[kBBFDDApf] = "FDDA BB pileup flag";
+  fgVariableUnits[kBBFDDApf] = "";
+  fgVariableNames[kBGFDDApf] = "FDDA BG pileup flag";
+  fgVariableUnits[kBGFDDApf] = "";
+  fgVariableNames[kBBFDDCpf] = "FDDC BB pileup flag";
+  fgVariableUnits[kBBFDDCpf] = "";
+  fgVariableNames[kBGFDDCpf] = "FDDC BG pileup flag";
+  fgVariableUnits[kBGFDDCpf] = "";
 
   // Set the variables short names map. This is needed for dynamic configuration via JSON files
   fgVarNamesMap["kNothing"] = kNothing;
@@ -2002,56 +2054,30 @@ void VarManager::SetDefaultVarNames()
   fgVarNamesMap["kBdtBackground"] = kBdtBackground;
   fgVarNamesMap["kBdtPrompt"] = kBdtPrompt;
   fgVarNamesMap["kBdtNonprompt"] = kBdtNonprompt;
-  fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
-  fgVariableUnits[kAmplitudeFT0A] = "a.u.";
-  fgVariableNames[kAmplitudeFT0C] = "FT0C amplitude";
-  fgVariableUnits[kAmplitudeFT0C] = "a.u.";
-  fgVariableNames[kTimeFT0A] = "FT0A time";
-  fgVariableUnits[kTimeFT0A] = "ns";
-  fgVariableNames[kTimeFT0C] = "FT0C time";
-  fgVariableUnits[kTimeFT0C] = "ns";
-  fgVariableNames[kTriggerMaskFT0] = "FT0 trigger mask";
-  fgVariableUnits[kTriggerMaskFT0] = "";
-  fgVariableNames[kNFiredChannelsFT0A] = "FT0A fired channels";
-  fgVariableUnits[kNFiredChannelsFT0A] = "";
-  fgVariableNames[kNFiredChannelsFT0C] = "FT0C fired channels";
-  fgVariableUnits[kNFiredChannelsFT0C] = "";
-  fgVariableNames[kAmplitudeFDDA] = "FDDA amplitude";
-  fgVariableUnits[kAmplitudeFDDA] = "a.u.";
-  fgVariableNames[kAmplitudeFDDC] = "FDDC amplitude";
-  fgVariableUnits[kAmplitudeFDDC] = "a.u.";
-  fgVariableNames[kTimeFDDA] = "FDDA time";
-  fgVariableUnits[kTimeFDDA] = "ns";
-  fgVariableNames[kTimeFDDC] = "FDDC time";
-  fgVariableUnits[kTimeFDDC] = "ns";
-  fgVariableNames[kTriggerMaskFDD] = "FDD trigger mask";
-  fgVariableUnits[kTriggerMaskFDD] = "";
-  fgVariableNames[kAmplitudeFV0A] = "FV0A amplitude";
-  fgVariableUnits[kAmplitudeFV0A] = "a.u.";
-  fgVariableNames[kTimeFV0A] = "FV0A time";
-  fgVariableUnits[kTimeFV0A] = "ns";
-  fgVariableNames[kTriggerMaskFV0A] = "FV0A trigger mask";
-  fgVariableUnits[kTriggerMaskFV0A] = "";
-  fgVariableNames[kNFiredChannelsFV0A] = "FV0A fired channels";
-  fgVariableUnits[kNFiredChannelsFV0A] = "";
-  fgVariableNames[kBBFT0Apf] = "FT0A BB pileup flag";
-  fgVariableUnits[kBBFT0Apf] = "";
-  fgVariableNames[kBGFT0Apf] = "FT0A BG pileup flag";
-  fgVariableUnits[kBGFT0Apf] = "";
-  fgVariableNames[kBBFT0Cpf] = "FT0C BB pileup flag";
-  fgVariableUnits[kBBFT0Cpf] = "";
-  fgVariableNames[kBGFT0Cpf] = "FT0C BG pileup flag";
-  fgVariableUnits[kBGFT0Cpf] = "";
-  fgVariableNames[kBBFV0Apf] = "FV0A BB pileup flag";
-  fgVariableUnits[kBBFV0Apf] = "";
-  fgVariableNames[kBGFV0Apf] = "FV0A BG pileup flag";
-  fgVariableUnits[kBGFV0Apf] = "";
-  fgVariableNames[kBBFDDApf] = "FDDA BB pileup flag";
-  fgVariableUnits[kBBFDDApf] = "";
-  fgVariableNames[kBGFDDApf] = "FDDA BG pileup flag";
-  fgVariableUnits[kBGFDDApf] = "";
-  fgVariableNames[kBBFDDCpf] = "FDDC BB pileup flag";
-  fgVariableUnits[kBBFDDCpf] = "";
-  fgVariableNames[kBGFDDCpf] = "FDDC BG pileup flag";
-  fgVariableUnits[kBGFDDCpf] = "";
+  fgVarNamesMap["kAmplitudeFT0A"] = kAmplitudeFT0A;
+  fgVarNamesMap["kAmplitudeFT0C"] = kAmplitudeFT0C;
+  fgVarNamesMap["kTimeFT0A"] = kTimeFT0A;
+  fgVarNamesMap["kTimeFT0C"] = kTimeFT0C;
+  fgVarNamesMap["kTriggerMaskFT0"] = kTriggerMaskFT0;
+  fgVarNamesMap["kNFiredChannelsFT0A"] = kNFiredChannelsFT0A;
+  fgVarNamesMap["kNFiredChannelsFT0C"] = kNFiredChannelsFT0C;
+  fgVarNamesMap["kAmplitudeFDDA"] = kAmplitudeFDDA;
+  fgVarNamesMap["kAmplitudeFDDC"] = kAmplitudeFDDC;
+  fgVarNamesMap["kTimeFDDA"] = kTimeFDDA;
+  fgVarNamesMap["kTimeFDDC"] = kTimeFDDC;
+  fgVarNamesMap["kTriggerMaskFDD"] = kTriggerMaskFDD;
+  fgVarNamesMap["kAmplitudeFV0A"] = kAmplitudeFV0A;
+  fgVarNamesMap["kTimeFV0A"] = kTimeFV0A;
+  fgVarNamesMap["kTriggerMaskFV0A"] = kTriggerMaskFV0A;
+  fgVarNamesMap["kNFiredChannelsFV0A"] = kNFiredChannelsFV0A;
+  fgVarNamesMap["kBBFT0Apf"] = kBBFT0Apf;
+  fgVarNamesMap["kBGFT0Apf"] = kBGFT0Apf;
+  fgVarNamesMap["kBBFT0Cpf"] = kBBFT0Cpf;
+  fgVarNamesMap["kBGFT0Cpf"] = kBGFT0Cpf;
+  fgVarNamesMap["kBBFV0Apf"] = kBBFV0Apf;
+  fgVarNamesMap["kBGFV0Apf"] = kBGFV0Apf;
+  fgVarNamesMap["kBBFDDApf"] = kBBFDDApf;
+  fgVarNamesMap["kBGFDDApf"] = kBGFDDApf;
+  fgVarNamesMap["kBBFDDCpf"] = kBBFDDCpf;
+  fgVarNamesMap["kBGFDDCpf"] = kBGFDDCpf;
 }
diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h
index 822575019af..c23294ca248 100644
--- a/PWGDQ/Core/VarManager.h
+++ b/PWGDQ/Core/VarManager.h
@@ -110,7 +110,8 @@ class VarManager : public TObject
     ReducedEventMultExtra = BIT(19),
     CollisionQvectCentr = BIT(20),
     RapidityGapFilter = BIT(21),
-    ReducedFit = BIT(22),
+    Fit = BIT(22),
+    ReducedFit = BIT(23),
     Track = BIT(0),
     TrackCov = BIT(1),
     TrackExtra = BIT(2),
@@ -2105,6 +2106,35 @@ void VarManager::FillEvent(T const& event, float* values)
     FillZDC(event, values);
   }
 
+  if constexpr ((fillMap & ReducedFit) > 0) {
+    values[kAmplitudeFT0A] = event.amplitudeFT0A();
+    values[kAmplitudeFT0C] = event.amplitudeFT0C();
+    values[kTimeFT0A] = event.timeFT0A();
+    values[kTimeFT0C] = event.timeFT0C();
+    values[kTriggerMaskFT0] = event.triggerMaskFT0();
+    values[kNFiredChannelsFT0A] = event.nFiredChannelsFT0A();
+    values[kNFiredChannelsFT0C] = event.nFiredChannelsFT0C();
+    values[kAmplitudeFDDA] = event.amplitudeFDDA();
+    values[kAmplitudeFDDC] = event.amplitudeFDDC();
+    values[kTimeFDDA] = event.timeFDDA();
+    values[kTimeFDDC] = event.timeFDDC();
+    values[kTriggerMaskFDD] = event.triggerMaskFDD();
+    values[kAmplitudeFV0A] = event.amplitudeFV0A();
+    values[kTimeFV0A] = event.timeFV0A();
+    values[kTriggerMaskFV0A] = event.triggerMaskFV0A();
+    values[kNFiredChannelsFV0A] = event.nFiredChannelsFV0A();
+    values[kBBFT0Apf] = event.bbFT0Apf();
+    values[kBGFT0Apf] = event.bgFT0Apf();
+    values[kBBFT0Cpf] = event.bbFT0Cpf();
+    values[kBGFT0Cpf] = event.bgFT0Cpf();
+    values[kBBFV0Apf] = event.bbFV0Apf();
+    values[kBGFV0Apf] = event.bgFV0Apf();
+    values[kBBFDDApf] = event.bbFDDApf();
+    values[kBGFDDApf] = event.bgFDDApf();
+    values[kBBFDDCpf] = event.bbFDDCpf();
+    values[kBGFDDCpf] = event.bgFDDCpf();
+  }
+
   // FillEventDerived(values);
 }
 
diff --git a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
index 9383e58143a..a5d531b6924 100644
--- a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
+++ b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx
@@ -131,7 +131,7 @@ constexpr static uint32_t gkEventFillMapWithMultsZdc = VarManager::ObjTypes::BC
 constexpr static uint32_t gkEventFillMapWithMultsAndEventFilter = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::EventFilter;
 constexpr static uint32_t gkEventFillMapWithMultsEventFilterZdc = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::EventFilter | VarManager::ObjTypes::Zdc;
 // constexpr static uint32_t gkEventFillMapWithMultsRapidityGapFilterZdc = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::RapidityGapFilter | VarManager::ObjTypes::Zdc;
-constexpr static uint32_t gkEventFillMapWithMultsRapidityGapFilterZdcFit = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::RapidityGapFilter | VarManager::ObjTypes::Zdc | VarManager::ObjTypes::ReducedFit;
+constexpr static uint32_t gkEventFillMapWithMultsRapidityGapFilterZdcFit = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::RapidityGapFilter | VarManager::ObjTypes::Zdc | VarManager::ObjTypes::Fit;
 // constexpr static uint32_t gkEventFillMapWithCent = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionCent;
 constexpr static uint32_t gkEventFillMapWithCentAndMults = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionCent | VarManager::CollisionMult | VarManager::ObjTypes::CollisionMultExtra;
 constexpr static uint32_t gkEventFillMapWithMultsExtra = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::CollisionMult | VarManager::ObjTypes::CollisionMultExtra;
@@ -867,7 +867,7 @@ struct TableMaker {
         }
       }
       // Fill FIT info using newbc pattern for UPC events (similar to ZDC)
-      if constexpr ((TEventFillMap & VarManager::ObjTypes::ReducedFit) > 0) {
+      if constexpr ((TEventFillMap & VarManager::ObjTypes::Fit) > 0) {
         if constexpr (!std::is_same_v<TFt0s, std::nullptr_t> &&
                       !std::is_same_v<TFv0as, std::nullptr_t> &&
                       !std::is_same_v<TFdds, std::nullptr_t>) {
@@ -987,7 +987,7 @@ struct TableMaker {
         }
       }
       // Fill FIT table if requested
-      if constexpr ((TEventFillMap & VarManager::ObjTypes::ReducedFit) > 0) {
+      if constexpr ((TEventFillMap & VarManager::ObjTypes::Fit) > 0) {
         fit(VarManager::fgValues[VarManager::kAmplitudeFT0A], VarManager::fgValues[VarManager::kAmplitudeFT0C],
             VarManager::fgValues[VarManager::kTimeFT0A], VarManager::fgValues[VarManager::kTimeFT0C],
             static_cast<uint8_t>(VarManager::fgValues[VarManager::kTriggerMaskFT0]),
diff --git a/PWGDQ/Tasks/tableReader_withAssoc.cxx b/PWGDQ/Tasks/tableReader_withAssoc.cxx
index 72dd471dff2..398146441e4 100644
--- a/PWGDQ/Tasks/tableReader_withAssoc.cxx
+++ b/PWGDQ/Tasks/tableReader_withAssoc.cxx
@@ -196,6 +196,7 @@ using MyEventsMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtend
 using MyEventsMultExtraQVector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra>;
 using MyEventsZdc = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedZdcs>;
 using MyEventsMultExtraZdc = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedZdcs>;
+using MyEventsMultExtraZdcFit = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedZdcs, aod::ReducedFITs>;
 using MyEventsSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::EventCuts>;
 using MyEventsMultExtraSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::EventCuts>;
 using MyEventsVtxCovSelectedMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
@@ -204,8 +205,8 @@ using MyEventsVtxCov = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended,
 using MyEventsVtxCovSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts>;
 using MyEventsVtxCovSelectedQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra>;
 using MyEventsVtxCovSelectedQvectorWithHash = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra, aod::MixingHashes>;
-using MyEventsVtxCovZdcSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::EventCuts>;
-using MyEventsVtxCovZdcSelectedMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::EventCuts, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
+using MyEventsVtxCovZdcFitSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::ReducedFITs, aod::EventCuts>;
+using MyEventsVtxCovZdcFitSelectedMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::ReducedFITs, aod::EventCuts, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
 using MyEventsQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsQvector>;
 using MyEventsHashSelectedQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::EventCuts, aod::MixingHashes, aod::ReducedEventsQvector>;
 using MyEventsQvectorCentr = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsQvectorCentr, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
@@ -230,12 +231,13 @@ constexpr static uint32_t gkEventFillMap = VarManager::ObjTypes::ReducedEvent |
 constexpr static uint32_t gkEventFillMapWithZdc = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ReducedZdc;
 constexpr static uint32_t gkEventFillMapWithCov = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov;
 // constexpr static uint32_t gkEventFillMapWithCovFlow = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ObjTypes::ReducedEventQvector;
-constexpr static uint32_t gkEventFillMapWithCovZdc = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ReducedZdc;
+constexpr static uint32_t gkEventFillMapWithCovZdcFit = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ReducedZdc | VarManager::ReducedFit;
 constexpr static uint32_t gkEventFillMapWithMultExtra = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventMultExtra;
 // New fillmap
 constexpr static uint32_t gkEventFillMapWithMultExtraWithQVector = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventMultExtra | VarManager::ObjTypes::CollisionQvect;
 constexpr static uint32_t gkEventFillMapWithMultExtraZdc = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventMultExtra | VarManager::ReducedZdc;
-constexpr static uint32_t gkEventFillMapWithCovZdcMultExtra = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ReducedZdc | VarManager::ReducedEventMultExtra;
+constexpr static uint32_t gkEventFillMapWithMultExtraZdcFit = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventMultExtra | VarManager::ReducedZdc | VarManager::ReducedFit;
+constexpr static uint32_t gkEventFillMapWithCovZdcFitMultExtra = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ReducedZdc | VarManager::ReducedFit | VarManager::ReducedEventMultExtra;
 constexpr static uint32_t gkEventFillMapWithQvectorCentr = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::CollisionQvect | VarManager::ObjTypes::ReducedEventMultExtra;
 // constexpr static uint32_t gkEventFillMapWithQvector = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventQvector;
 // constexpr static uint32_t gkEventFillMapWithCovQvector = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ObjTypes::ReducedEventQvector;
@@ -302,7 +304,7 @@ struct AnalysisEventSelection {
   void init(o2::framework::InitContext& context)
   {
 
-    bool isAnyProcessEnabled = context.mOptions.get<bool>("processSkimmed") || context.mOptions.get<bool>("processSkimmedWithZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtra") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdc") || context.mOptions.get<bool>("processSkimmedWithQvectorCentr");
+    bool isAnyProcessEnabled = context.mOptions.get<bool>("processSkimmed") || context.mOptions.get<bool>("processSkimmedWithZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtra") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdcFit") || context.mOptions.get<bool>("processSkimmedWithQvectorCentr");
     bool isDummyEnabled = context.mOptions.get<bool>("processDummy");
 
     if (isDummyEnabled) {
@@ -538,6 +540,11 @@ struct AnalysisEventSelection {
     runEventSelection<gkEventFillMapWithMultExtraZdc>(events);
     publishSelections<gkEventFillMapWithMultExtraZdc>(events);
   }
+  void processSkimmedWithMultExtraZdcFit(MyEventsMultExtraZdcFit const& events)
+  {
+    runEventSelection<gkEventFillMapWithMultExtraZdcFit>(events);
+    publishSelections<gkEventFillMapWithMultExtraZdcFit>(events);
+  }
   void processSkimmedWithQvectorCentr(MyEventsQvectorCentr const& events)
   {
     runEventSelection<gkEventFillMapWithQvectorCentr>(events);
@@ -552,6 +559,7 @@ struct AnalysisEventSelection {
   PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithZdc, "Run event selection on DQ skimmed events, with ZDC", false);
   PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithMultExtra, "Run event selection on DQ skimmed events, with mult extra", false);
   PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithMultExtraZdc, "Run event selection on DQ skimmed events, with mult extra and ZDC", false);
+  PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithMultExtraZdcFit, "Run event selection on DQ skimmed events, with mult extra, ZDC and FIT", false);
   PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithQvectorCentr, "Run event selection on DQ skimmed events, with Q-vector", false);
   PROCESS_SWITCH(AnalysisEventSelection, processDummy, "Dummy function", true);
 };
@@ -3035,39 +3043,39 @@ struct AnalysisAsymmetricPairing {
     } // end loop (cuts)
   }
 
-  void processKaonPionSkimmed(MyEventsVtxCovZdcSelected const& events,
+  void processKaonPionSkimmed(MyEventsVtxCovZdcFitSelected const& events,
                               soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& barrelAssocs,
                               MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
   {
-    runAsymmetricPairing<true, VarManager::kDecayToKPi, gkEventFillMapWithCovZdc, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
+    runAsymmetricPairing<true, VarManager::kDecayToKPi, gkEventFillMapWithCovZdcFit, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
   }
 
-  void processKaonPionSkimmedMultExtra(MyEventsVtxCovZdcSelectedMultExtra const& events,
+  void processKaonPionSkimmedMultExtra(MyEventsVtxCovZdcFitSelectedMultExtra const& events,
                                        soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& barrelAssocs,
                                        MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
   {
-    runAsymmetricPairing<true, VarManager::kDecayToKPi, gkEventFillMapWithCovZdcMultExtra, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
+    runAsymmetricPairing<true, VarManager::kDecayToKPi, gkEventFillMapWithCovZdcFitMultExtra, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
   }
 
-  void processKaonPionPionSkimmed(MyEventsVtxCovZdcSelected const& events,
+  void processKaonPionPionSkimmed(MyEventsVtxCovZdcFitSelected const& events,
                                   soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& barrelAssocs,
                                   MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
   {
-    runThreeProng<true, gkEventFillMapWithCovZdc, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToKPiPi);
+    runThreeProng<true, gkEventFillMapWithCovZdcFit, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToKPiPi);
   }
 
-  void processKaonPionPionSkimmedMultExtra(MyEventsVtxCovZdcSelectedMultExtra const& events,
+  void processKaonPionPionSkimmedMultExtra(MyEventsVtxCovZdcFitSelectedMultExtra const& events,
                                            soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& barrelAssocs,
                                            MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
   {
-    runThreeProng<true, gkEventFillMapWithCovZdcMultExtra, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToKPiPi);
+    runThreeProng<true, gkEventFillMapWithCovZdcFitMultExtra, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToKPiPi);
   }
 
-  void processProtonKaonPionSkimmed(MyEventsVtxCovZdcSelected const& events,
+  void processProtonKaonPionSkimmed(MyEventsVtxCovZdcFitSelected const& events,
                                     soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts> const& barrelAssocs,
                                     MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
   {
-    runThreeProng<true, gkEventFillMapWithCovZdc, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToPKPi);
+    runThreeProng<true, gkEventFillMapWithCovZdcFit, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToPKPi);
   }
 
   void processDummy(MyEvents&)
@@ -3582,7 +3590,7 @@ struct AnalysisDileptonTrack {
     }
   }
 
-  void processDstarToD0Pi(soa::Filtered<MyEventsVtxCovSelected> const& events,
+  void processDstarToD0Pi(soa::Filtered<MyEventsVtxCovZdcFitSelected> const& events,
                           soa::Filtered<soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts>> const& assocs,
                           MyBarrelTracksWithCov const& tracks, soa::Filtered<MyDitrackCandidates> const& ditracks)
   {
@@ -3597,7 +3605,7 @@ struct AnalysisDileptonTrack {
     for (auto& event : events) {
       auto groupedBarrelAssocs = assocs.sliceBy(trackAssocsPerCollision, event.globalIndex());
       auto groupedDitracks = ditracks.sliceBy(ditracksPerCollision, event.globalIndex());
-      runDileptonHadron<VarManager::kDstarToD0KPiPi, gkEventFillMapWithCov, gkTrackFillMapWithCov>(event, groupedBarrelAssocs, tracks, groupedDitracks);
+      runDileptonHadron<VarManager::kDstarToD0KPiPi, gkEventFillMapWithCovZdcFit, gkTrackFillMapWithCov>(event, groupedBarrelAssocs, tracks, groupedDitracks);
     }
   }