diff --git a/docs/datamodel/joinsAndIterators.md b/docs/datamodel/joinsAndIterators.md
index a7d0d9e9..5c2d2f0c 100644
--- a/docs/datamodel/joinsAndIterators.md
+++ b/docs/datamodel/joinsAndIterators.md
@@ -2298,6 +2298,13 @@ Click on the labels to display the definitions. Click buttons to
     </ul>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::HfcRedCollision</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::HfcRedCollision = o2::aod::HfcRedCollisions::iterator</li>
+    </ul>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::HfDstarsWithPvRefitInfo</button>
   <div class="panel">
     <ul>
@@ -5847,6 +5854,20 @@ Click on the labels to display the definitions. Click buttons to
     </ul>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::SGEvent</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::SGEvent = o2::aod::SGEvents::iterator</li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::SGTrack</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::SGTrack = o2::aod::SGTracks::iterator</li>
+    </ul>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::UDMcCollision</button>
   <div class="panel">
     <ul>
diff --git a/docs/datamodel/pwgTables.md b/docs/datamodel/pwgTables.md
index 3e3f9d21..3cf7ab8f 100644
--- a/docs/datamodel/pwgTables.md
+++ b/docs/datamodel/pwgTables.md
@@ -20069,12 +20069,6 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-dielectron-ml
-Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//dielectronMl.cxx" target="_blank">dielectronMl.cxx</a>
-<div>
-
-</div>
-
 ###  o2-analysis-em-event-selection
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//eventSelection.cxx" target="_blank">eventSelection.cxx</a>
 <div>
@@ -31376,6 +31370,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand_xic_to_xi_pi_pi::Chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td></td>
+        <td>chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_cand_xic_to_xi_pi_pi::Chi2TopoXicPlusToPV</td>
         <td></td>
@@ -31383,6 +31384,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand_xic_to_xi_pi_pi::Chi2TopoXiToXicPlusBeforeConstraint</td>
+        <td></td>
+        <td>chi2TopoXiToXicPlusBeforeConstraint</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_cand_xic_to_xi_pi_pi::Chi2TopoXiToXicPlus</td>
         <td></td>
@@ -49005,16 +49013,30 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::full::Chi2XicPlusTopoToPV</td>
+        <td>o2::aod::full::Chi2TopoXicPlusToPVBeforeConstraint</td>
         <td></td>
-        <td>chi2XicPlusTopoToPV</td>
+        <td>chi2TopoXicPlusToPVBeforeConstraint</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::full::Chi2XicPlusTopoXiToXicPlus</td>
+        <td>o2::aod::full::Chi2TopoXicPlusToPV</td>
         <td></td>
-        <td>chi2XicPlusTopoXiToXicPlus</td>
+        <td>chi2TopoXicPlusToPV</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::full::Chi2TopoXiToXicPlusBeforeConstraint</td>
+        <td></td>
+        <td>chi2TopoXiToXicPlusBeforeConstraint</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::full::Chi2TopoXiToXicPlus</td>
+        <td></td>
+        <td>chi2TopoXiToXicPlus</td>
         <td>float</td>
         <td></td>
       </tr>
@@ -49848,16 +49870,30 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::full::Chi2XicPlusTopoToPV</td>
+        <td>o2::aod::full::Chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td></td>
+        <td>chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::full::Chi2TopoXicPlusToPV</td>
+        <td></td>
+        <td>chi2TopoXicPlusToPV</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::full::Chi2TopoXiToXicPlusBeforeConstraint</td>
         <td></td>
-        <td>chi2XicPlusTopoToPV</td>
+        <td>chi2TopoXiToXicPlusBeforeConstraint</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::full::Chi2XicPlusTopoXiToXicPlus</td>
+        <td>o2::aod::full::Chi2TopoXiToXicPlus</td>
         <td></td>
-        <td>chi2XicPlusTopoXiToXicPlus</td>
+        <td>chi2TopoXiToXicPlus</td>
         <td>float</td>
         <td></td>
       </tr>
@@ -52419,27 +52455,6 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>int64_t</td>
         <td></td>
       </tr>
-      <tr>
-        <td>o2::aod::hf_track_index_reduced::HfRedCollisionId</td>
-        <td>I</td>
-        <td>hfRedCollisionId</td>
-        <td>int32</td>
-        <td>ReducedCollision index</td>
-      </tr>
-      <tr>
-        <td>o2::aod::hf_reso_cand_reduced::Prong0Id</td>
-        <td>I</td>
-        <td>prong0Id</td>
-        <td>int</td>
-        <td>Prong0 index (D daughter)</td>
-      </tr>
-      <tr>
-        <td>o2::aod::hf_reso_cand_reduced::Prong1Id</td>
-        <td>I</td>
-        <td>prong1Id</td>
-        <td>int</td>
-        <td>Prong1 index (V0 daughter)</td>
-      </tr>
       <tr>
         <td>o2::aod::hf_cand::PxProng0</td>
         <td></td>
@@ -52524,6 +52539,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td>Radius of V0 candidate</td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_reso_cand_reduced::InvMassD0</td>
+        <td></td>
+        <td>invMassD0</td>
+        <td>float</td>
+        <td>Invariant Mass of potential D0 daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::hf_reso_cand_reduced::Pt</td>
         <td>D</td>
@@ -52545,6 +52567,27 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_reso_v0::Px</td>
+        <td>D</td>
+        <td>px</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_v0::Py</td>
+        <td>D</td>
+        <td>py</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_v0::Pz</td>
+        <td>D</td>
+        <td>pz</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_cand::PVectorProng0</td>
         <td>D</td>
@@ -52583,6 +52626,46 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
     </table>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfResoIndices</button>
+  <div class="panel">
+    <div>
+       Table with Indices of resonance daughters for MC matching
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/DataModel/ReducedDataModel.h" target="_blank">PWGHF/D2H/DataModel/ReducedDataModel.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_track_index_reduced::HfRedCollisionId</td>
+        <td>I</td>
+        <td>hfRedCollisionId</td>
+        <td>int32</td>
+        <td>ReducedCollision index</td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_cand_reduced::Prong0Id</td>
+        <td>I</td>
+        <td>prong0Id</td>
+        <td>int</td>
+        <td>Prong0 index (D daughter)</td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_cand_reduced::Prong1Id</td>
+        <td>I</td>
+        <td>prong1Id</td>
+        <td>int</td>
+        <td>Prong1 index (V0 daughter)</td>
+      </tr>
+    </table>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfCharmResoMLs</button>
   <div class="panel">
     <div>
@@ -55576,6 +55659,27 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng0</td>
+        <td>D</td>
+        <td>pVectorProng0</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng1</td>
+        <td>D</td>
+        <td>pVectorProng1</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_v0::PVector</td>
+        <td>D</td>
+        <td>pVector</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
     </table>
   </div>
 
@@ -55993,19 +56097,33 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::hf_reso_3_prong::InvMassDstar</td>
+        <td>o2::aod::hf_cand_dstar::InvMassDstar</td>
         <td>D</td>
         <td>invMassDstar</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::hf_reso_3_prong::InvMassAntiDstar</td>
+        <td>o2::aod::hf_cand_dstar::InvMassAntiDstar</td>
         <td>D</td>
         <td>invMassAntiDstar</td>
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand_dstar::InvMassD0</td>
+        <td>D</td>
+        <td>invMassD0</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_cand_dstar::InvMassD0Bar</td>
+        <td>D</td>
+        <td>invMassD0Bar</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_reso_3_prong::Pt</td>
         <td>D</td>
@@ -56013,6 +56131,34 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng0</td>
+        <td>D</td>
+        <td>pVectorProng0</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng1</td>
+        <td>D</td>
+        <td>pVectorProng1</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng2</td>
+        <td>D</td>
+        <td>pVectorProng2</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_3_prong::PVector</td>
+        <td>D</td>
+        <td>pVector</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
     </table>
   </div>
 
@@ -56067,6 +56213,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>int8_t</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_reso_cand_reduced::SignD0</td>
+        <td></td>
+        <td>signD0</td>
+        <td>int8_t</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_b0_mc::PtMother</td>
         <td></td>
@@ -57317,79 +57470,6 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorDsHadrons.cxx" target="_blank">correlatorDsHadrons.cxx</a>
 <div>
 
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfRedCollisions</button>
-  <div class="panel">
-    <div>
-       Table with collision for reduced workflow
-    </div>
-    <div>
-      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/DataModel/ReducedDataModel.h" target="_blank">PWGHF/D2H/DataModel/ReducedDataModel.h</a>
-    </div>
-    <div>Is used in:
-      <ul>
-        <li>o2::aod::HfRedCollision = o2::aod::HfRedCollisions::iterator</li>
-      </ul>
-    </div>
-    <table class=DataModel>
-      <tr>
-        <th>Name</th>
-        <th></th>
-        <th>Getter</th>
-        <th>Type</th>
-        <th>Comment</th>
-      </tr>
-      <tr>
-        <td>o2::soa::Index</td>
-        <td>GI</td>
-        <td>globalIndex</td>
-        <td>int64_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::&zwnj;collision::PosX</td>
-        <td></td>
-        <td>posX</td>
-        <td>float</td>
-        <td>X Vertex position in cm</td>
-      </tr>
-      <tr>
-        <td>o2::aod::&zwnj;collision::PosY</td>
-        <td></td>
-        <td>posY</td>
-        <td>float</td>
-        <td>Y Vertex position in cm</td>
-      </tr>
-      <tr>
-        <td>o2::aod::&zwnj;collision::PosZ</td>
-        <td></td>
-        <td>posZ</td>
-        <td>float</td>
-        <td>Z Vertex position in cm</td>
-      </tr>
-      <tr>
-        <td>o2::aod::&zwnj;collision::NumContrib</td>
-        <td></td>
-        <td>numContrib</td>
-        <td>uint16_t</td>
-        <td>Number of tracks used for the vertex</td>
-      </tr>
-      <tr>
-        <td>o2::aod::hf_reduced_collision::HfCollisionRejectionMap</td>
-        <td></td>
-        <td>hfCollisionRejectionMap</td>
-        <td>uint16_t</td>
-        <td>Bitmask with failed selection criteria</td>
-      </tr>
-      <tr>
-        <td>o2::aod::hf_reduced_collision::Bz</td>
-        <td></td>
-        <td>bz</td>
-        <td>float</td>
-        <td>Magnetic field in z-direction</td>
-      </tr>
-    </table>
-  </div>
-
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::DsHadronPair</button>
   <div class="panel">
     <div>
@@ -57696,6 +57776,51 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
     </table>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfcRedCollisions</button>
+  <div class="panel">
+    <div>
+       Table with collision info
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h" target="_blank">PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h</a>
+    </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::HfcRedCollision = o2::aod::HfcRedCollisions::iterator</li>
+      </ul>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::soa::Index</td>
+        <td>GI</td>
+        <td></td>
+        <td>?</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_collisions_reduced::Multiplicity</td>
+        <td></td>
+        <td>multiplicity</td>
+        <td>float</td>
+        <td>Event multiplicity</td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_collisions_reduced::PosZ</td>
+        <td></td>
+        <td>posZ</td>
+        <td>float</td>
+        <td>Primary vertex z position</td>
+      </tr>
+    </table>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::DsCandReduced</button>
   <div class="panel">
     <div>
@@ -57720,9 +57845,9 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::hf_candidate_reduced::HfRedCollisionId</td>
+        <td>o2::aod::hf_candidate_reduced::HfcRedCollisionId</td>
         <td>I</td>
-        <td>hfRedCollisionId</td>
+        <td>hfcRedCollisionId</td>
         <td>int32</td>
         <td>ReducedCollision index</td>
       </tr>
@@ -57757,7 +57882,7 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
     </table>
   </div>
 
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::AssocTrackReduced</button>
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::AssocTrackRed</button>
   <div class="panel">
     <div>
        Table with associated track info
@@ -57781,9 +57906,9 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::hf_candidate_reduced::HfRedCollisionId</td>
+        <td>o2::aod::hf_candidate_reduced::HfcRedCollisionId</td>
         <td>I</td>
-        <td>hfRedCollisionId</td>
+        <td>hfcRedCollisionId</td>
         <td>int32</td>
         <td>ReducedCollision index</td>
       </tr>
@@ -58234,6 +58359,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>int</td>
         <td>Pool Bin for the MixedEvent</td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_correlation_lc_hadron::IsAutoCorrelated</td>
+        <td></td>
+        <td>isAutoCorrelated</td>
+        <td>bool</td>
+        <td>Correlation Status</td>
+      </tr>
     </table>
   </div>
 
@@ -67819,6 +67951,34 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>nsigma of TPC PID of the bachelor daughter</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxProton</td>
+        <td></td>
+        <td>tpcdedxproton</td>
+        <td>float</td>
+        <td>TPC dEdx of the proton daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxPion</td>
+        <td></td>
+        <td>tpcdedxpion</td>
+        <td>float</td>
+        <td>TPC dEdx of the pion daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxDeuteron</td>
+        <td></td>
+        <td>tpcdedxdeuteron</td>
+        <td>float</td>
+        <td>TPC dEdx of the bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TOFNSigmaDeuteron</td>
+        <td></td>
+        <td>tofnsigmadeuteron</td>
+        <td>float</td>
+        <td>nsigma of TOF PID of the bachelor daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::vtx3body::VtxRadius</td>
         <td>D</td>
@@ -68414,6 +68574,34 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>nsigma of TPC PID of the bachelor daughter</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxProton</td>
+        <td></td>
+        <td>tpcdedxproton</td>
+        <td>float</td>
+        <td>TPC dEdx of the proton daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxPion</td>
+        <td></td>
+        <td>tpcdedxpion</td>
+        <td>float</td>
+        <td>TPC dEdx of the pion daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxDeuteron</td>
+        <td></td>
+        <td>tpcdedxdeuteron</td>
+        <td>float</td>
+        <td>TPC dEdx of the bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TOFNSigmaDeuteron</td>
+        <td></td>
+        <td>tofnsigmadeuteron</td>
+        <td>float</td>
+        <td>nsigma of TOF PID of the bachelor daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::vtx3body::VtxRadius</td>
         <td>D</td>
@@ -70912,254 +71100,91 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <th>Comment</th>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PtHe3</td>
-        <td></td>
-        <td>ptHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaHe3</td>
-        <td></td>
-        <td>etaHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiHe3</td>
-        <td></td>
-        <td>phiHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PtPr</td>
-        <td></td>
-        <td>ptPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaPr</td>
-        <td></td>
-        <td>etaPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiPr</td>
-        <td></td>
-        <td>phiPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAxyHe3</td>
-        <td></td>
-        <td>dcaxyHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAzHe3</td>
-        <td></td>
-        <td>dcazHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAxyPr</td>
-        <td></td>
-        <td>dcaxyPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAzPr</td>
-        <td></td>
-        <td>dcazPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SignalTPCHe3</td>
-        <td></td>
-        <td>signalTPCHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::InnerParamTPCHe3</td>
-        <td></td>
-        <td>innerParamTPCHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SignalTPCPr</td>
-        <td></td>
-        <td>signalTPCPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::InnerParamTPCPr</td>
-        <td></td>
-        <td>innerParamTPCPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::NClsTPCHe3</td>
-        <td></td>
-        <td>nClsTPCHe3</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::NSigmaTPCHe3</td>
-        <td></td>
-        <td>nSigmaTPCHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::NSigmaTPCPr</td>
-        <td></td>
-        <td>nSigmaTOFPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::Chi2TPCHe3</td>
+        <td>o2::aod::Lithium4TablesNS::PtMCHe3</td>
         <td></td>
-        <td>chi2TPCHe3</td>
+        <td>ptMCHe3</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::Chi2TPCPr</td>
+        <td>o2::aod::Lithium4TablesNS::EtaMCHe3</td>
         <td></td>
-        <td>chi2TPCPr</td>
+        <td>etaMCHe3</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::MassTOFHe3</td>
+        <td>o2::aod::Lithium4TablesNS::PhiMCHe3</td>
         <td></td>
-        <td>massTOFHe3</td>
+        <td>phiMCHe3</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::MassTOFPr</td>
+        <td>o2::aod::Lithium4TablesNS::PtMCPr</td>
         <td></td>
-        <td>massTOFPr</td>
+        <td>ptMCPr</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PIDtrkHe3</td>
-        <td></td>
-        <td>pidTrkHe3</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PIDtrkPr</td>
-        <td></td>
-        <td>pidTrkPr</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::ItsClusterSizeHe3</td>
-        <td></td>
-        <td>itsClusterSizeHe3</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::ItsClusterSizePr</td>
-        <td></td>
-        <td>itsClusterSizePr</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SharedClustersHe3</td>
-        <td></td>
-        <td>sharedClustersHe3</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SharedClustersPr</td>
-        <td></td>
-        <td>sharedClustersPr</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::IsBkgLS</td>
-        <td></td>
-        <td>isBkgLS</td>
-        <td>bool</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::IsBkgEM</td>
-        <td></td>
-        <td>isBkgEM</td>
-        <td>bool</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PtMCHe3</td>
+        <td>o2::aod::Lithium4TablesNS::EtaMCPr</td>
         <td></td>
-        <td>ptMCHe3</td>
+        <td>etaMCPr</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaMCHe3</td>
+        <td>o2::aod::Lithium4TablesNS::PhiMCPr</td>
         <td></td>
-        <td>etaMCHe3</td>
+        <td>phiMCPr</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiMCHe3</td>
+        <td>o2::aod::Lithium4TablesNS::SignedPtMC</td>
         <td></td>
-        <td>phiMCHe3</td>
+        <td>signedPtMC</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PtMCPr</td>
+        <td>o2::aod::Lithium4TablesNS::MassMC</td>
         <td></td>
-        <td>ptMCPr</td>
+        <td>massMC</td>
         <td>float</td>
         <td></td>
       </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::Lithium4Mult</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFLithium4Tables.h" target="_blank">PWGLF/DataModel/LFLithium4Tables.h</a>
+    </div>
+    <table class=DataModel>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaMCPr</td>
-        <td></td>
-        <td>etaMCPr</td>
-        <td>float</td>
-        <td></td>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiMCPr</td>
+        <td>o2::aod::Lithium4TablesNS::Multiplicity</td>
         <td></td>
-        <td>phiMCPr</td>
-        <td>float</td>
+        <td>multiplicity</td>
+        <td>uint16_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::SignedPtMC</td>
+        <td>o2::aod::Lithium4TablesNS::CentralityFT0C</td>
         <td></td>
-        <td>signedPtMC</td>
+        <td>centFT0C</td>
         <td>float</td>
         <td></td>
       </tr>
@@ -71844,6 +71869,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::NucleiTableNS::TOFchi2</td>
+        <td></td>
+        <td>tofChi2</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::NucleiTableNS::Flags</td>
         <td></td>
@@ -72092,6 +72124,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::NucleiTableNS::TOFchi2</td>
+        <td></td>
+        <td>tofChi2</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::NucleiTableNS::Flags</td>
         <td></td>
@@ -73407,6 +73446,34 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>nsigma of TPC PID of the bachelor daughter</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxProton</td>
+        <td></td>
+        <td>tpcdedxproton</td>
+        <td>float</td>
+        <td>TPC dEdx of the proton daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxPion</td>
+        <td></td>
+        <td>tpcdedxpion</td>
+        <td>float</td>
+        <td>TPC dEdx of the pion daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxDeuteron</td>
+        <td></td>
+        <td>tpcdedxdeuteron</td>
+        <td>float</td>
+        <td>TPC dEdx of the bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TOFNSigmaDeuteron</td>
+        <td></td>
+        <td>tofnsigmadeuteron</td>
+        <td>float</td>
+        <td>nsigma of TOF PID of the bachelor daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::kfvtx3body::GenP</td>
         <td></td>
@@ -90497,6 +90564,81 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
     </table>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::UDTracksPIDExtra</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/DataModel/UDTables.h" target="_blank">PWGUD/DataModel/UDTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtpc::TPCNSigmaDe</td>
+        <td></td>
+        <td>tpcNSigmaDe</td>
+        <td>float</td>
+        <td>Nsigma separation with the TPC detector for deuteron</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtpc::TPCNSigmaTr</td>
+        <td></td>
+        <td>tpcNSigmaTr</td>
+        <td>float</td>
+        <td>Nsigma separation with the TPC detector for triton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtpc::TPCNSigmaHe</td>
+        <td></td>
+        <td>tpcNSigmaHe</td>
+        <td>float</td>
+        <td>Nsigma separation with the TPC detector for helium3</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtpc::TPCNSigmaAl</td>
+        <td></td>
+        <td>tpcNSigmaAl</td>
+        <td>float</td>
+        <td>Nsigma separation with the TPC detector for alpha</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtof::TOFNSigmaDe</td>
+        <td></td>
+        <td>tofNSigmaDe</td>
+        <td>float</td>
+        <td>Nsigma separation with the TOF detector for deuteron</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtof::TOFNSigmaTr</td>
+        <td></td>
+        <td>tofNSigmaTr</td>
+        <td>float</td>
+        <td>Nsigma separation with the TOF detector for triton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtof::TOFNSigmaHe</td>
+        <td></td>
+        <td>tofNSigmaHe</td>
+        <td>float</td>
+        <td>Nsigma separation with the TOF detector for helium3</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtof::TOFNSigmaAl</td>
+        <td></td>
+        <td>tofNSigmaAl</td>
+        <td>float</td>
+        <td>Nsigma separation with the TOF detector for alpha</td>
+      </tr>
+    </table>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::UDTracksExtra</button>
   <div class="panel">
     <div>