diff --git a/PWGHF/Core/HfDerivedData.h b/PWGHF/Core/HfDerivedData.h
new file mode 100644
index 00000000000..988563674a1
--- /dev/null
+++ b/PWGHF/Core/HfDerivedData.h
@@ -0,0 +1,114 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file HfDerivedData.h
+/// \brief Class with helper functions for HF derived data format
+///
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
+
+#ifndef PWGHF_CORE_HFDERIVEDDATA_H_
+#define PWGHF_CORE_HFDERIVEDDATA_H_
+
+#include "Common/Core/RecoDecay.h"
+
+class HfDerivedData
+{
+ public:
+  /// Default constructor
+  HfDerivedData() = default;
+
+  /// Default destructor
+  ~HfDerivedData() = default;
+
+  template <bool isMC, typename T, typename U, typename V, typename M>
+  void fillCollTables(const T& collision, bool fillCollBase, U& collBaseTable, bool fillCollId, V& collIdTable, bool fillMcRCollId, M& matchedCollisions)
+  {
+    if (fillCollBase) {
+      collBaseTable(
+        collision.posX(),
+        collision.posY(),
+        collision.posZ(),
+        collision.numContrib(),
+        collision.centFT0A(),
+        collision.centFT0C(),
+        collision.centFT0M(),
+        collision.centFV0A(),
+        collision.multZeqNTracksPV());
+    }
+    if (fillCollId) {
+      collIdTable(collision.globalIndex());
+    }
+
+    if constexpr (isMC) {
+      if (fillMcRCollId && collision.has_mcCollision()) {
+        LOGF(debug, "Rec. collision %d: Filling derived-collision index %d for MC collision %d", collision.globalIndex(), collBaseTable.lastIndex(), collision.mcCollisionId());
+        matchedCollisions[collision.mcCollisionId()].push_back(collBaseTable.lastIndex()); // [] inserts an empty element if it does not exist
+      }
+    }
+  }
+
+  template <typename T, typename U, typename V, typename M, typename N>
+  void fillCollMcTables(const T& mcCollision, bool fillMcCollBase, U& mcCollBaseTable, bool fillMcCollId, V& mcCollIdTable, bool fillMcRCollId, M& matchedCollisions, N& rmcRCollIdTable)
+  {
+    if (fillMcCollBase) {
+      mcCollBaseTable(
+        mcCollision.posX(),
+        mcCollision.posY(),
+        mcCollision.posZ());
+    }
+    if (fillMcCollId) {
+      mcCollIdTable(
+        mcCollision.globalIndex());
+    }
+    if (fillMcRCollId) {
+      rmcRCollIdTable(
+        matchedCollisions[mcCollision.globalIndex()]);
+    }
+  }
+
+  template <typename T, typename U, typename V>
+  void fillCandidateTables(const T& candidate, bool fillCandidateBase, U& candidateBaseTable, V& collBaseTable, double invMass, double y)
+  {
+    if (fillCandidateBase) {
+      candidateBaseTable(
+        collBaseTable.lastIndex(), // lastIndex is not marked as const so collBaseTable cannot be passed as const either. Should be ok here though
+        candidate.pt(),
+        candidate.eta(),
+        candidate.phi(),
+        invMass,
+        y);
+    }
+  }
+
+  template <typename T, typename U, typename V, typename M, typename N>
+  void fillParticleTables(const T& particle, bool fillParticleBase, U& particleBaseTable, V& mcCollBaseTable, M mass, bool fillParticleId, N& particleIdTable)
+  {
+    if (fillParticleBase) {
+      particleBaseTable(
+        mcCollBaseTable.lastIndex(), // lastIndex is not marked as const so mcCollBaseTable cannot be passed as const either. Should be ok here though
+        particle.pt(),
+        particle.eta(),
+        particle.phi(),
+        RecoDecayPtEtaPhi::y(particle.pt(), particle.eta(), mass),
+        particle.flagMcMatchGen(),
+        particle.originMcGen());
+    }
+    if (fillParticleId) {
+      particleIdTable(
+        particle.mcCollisionId(),
+        particle.globalIndex());
+    }
+  }
+
+ private:
+};
+
+#endif // PWGHF_CORE_HFDERIVEDDATA_H_
diff --git a/PWGHF/DataModel/DerivedTables.h b/PWGHF/DataModel/DerivedTables.h
index 441d412ea2f..6005502c20c 100644
--- a/PWGHF/DataModel/DerivedTables.h
+++ b/PWGHF/DataModel/DerivedTables.h
@@ -32,18 +32,13 @@ namespace o2::aod
 {
 // basic species:
 // D0 -> K- + pi+ (done)
-// Lc -> pi+ K- p (existing 3P table to be renamed Lc)
+// Lc -> pi+ K- p
 // D+ -> K- + pi+ + pi+ (3P table with adapted PID columns)
 // Ds+ -> K- + K+ + pi+ (3P table with adapted PID columns)
 // composite species
 // B0 -> D- + pi+
 // B+ -> D0 + pi+ (in progress)
 // D*+ -> D0 + pi+
-constexpr uint MarkerBase = 2;
-constexpr uint MarkerD0 = 3;
-constexpr uint Marker3P = 4;
-constexpr uint MarkerBplus = 5;
-constexpr uint MarkerB0 = 6;
 
 // ================
 // Collision tables
@@ -62,172 +57,65 @@ DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float);                 //! FDDM centrali
 DECLARE_SOA_COLUMN(MultZeqNTracksPV, multZeqNTracksPV, float); //! z-equalised barrel multiplicity
 } // namespace hf_coll_base
 
-// base
-
-DECLARE_SOA_TABLE_STAGED(HfCollBases, "HFCOLLBASE", //! Table with basic collision info
-                         o2::soa::Index<>,
-                         collision::PosX,
-                         collision::PosY,
-                         collision::PosZ,
-                         collision::NumContrib,
-                         hf_coll_base::CentFT0A,
-                         hf_coll_base::CentFT0C,
-                         hf_coll_base::CentFT0M,
-                         hf_coll_base::CentFV0A,
-                         hf_coll_base::MultZeqNTracksPV,
-                         // hf_coll_base::IsEventReject,
-                         // bc::RunNumber,
-                         o2::soa::Marker<MarkerBase>);
-
-using HfCollBase = HfCollBases::iterator;
-
-DECLARE_SOA_TABLE_STAGED(HfCollIds, "HFCOLLID", //! Table with original global indices of collisions
-                         hf_cand::CollisionId,
-                         o2::soa::Marker<MarkerBase>);
-
-// D0 (to be replaced by base version)
-
-DECLARE_SOA_TABLE_STAGED(HfD0CollBases, "HFD0COLLBASE", //! Table with basic collision info
-                         o2::soa::Index<>,
-                         collision::PosX,
-                         collision::PosY,
-                         collision::PosZ,
-                         collision::NumContrib,
-                         hf_coll_base::CentFT0A,
-                         hf_coll_base::CentFT0C,
-                         hf_coll_base::CentFT0M,
-                         hf_coll_base::CentFV0A,
-                         hf_coll_base::MultZeqNTracksPV,
-                         // hf_coll_base::IsEventReject,
-                         // bc::RunNumber,
-                         o2::soa::Marker<MarkerD0>);
-
-using HfD0CollBase = HfD0CollBases::iterator;
-using StoredHfD0CollBase = StoredHfD0CollBases::iterator;
-
-DECLARE_SOA_TABLE_STAGED(HfD0CollIds, "HFD0COLLID", //! Table with original global indices of collisions
-                         hf_cand::CollisionId,
-                         o2::soa::Marker<MarkerD0>);
-
-// 3-prong decays (to be replaced by base version)
-
-DECLARE_SOA_TABLE_STAGED(Hf3PCollBases, "HF3PCOLLBASE", //! Table with basic collision info
-                         o2::soa::Index<>,
-                         collision::PosX,
-                         collision::PosY,
-                         collision::PosZ,
-                         collision::NumContrib,
-                         hf_coll_base::CentFT0A,
-                         hf_coll_base::CentFT0C,
-                         hf_coll_base::CentFT0M,
-                         hf_coll_base::CentFV0A,
-                         hf_coll_base::MultZeqNTracksPV,
-                         // hf_coll_base::IsEventReject,
-                         // bc::RunNumber,
-                         o2::soa::Marker<Marker3P>);
-
-using Hf3PCollBase = Hf3PCollBases::iterator;
-using StoredHf3PCollBase = StoredHf3PCollBases::iterator;
-
-DECLARE_SOA_TABLE_STAGED(Hf3PCollIds, "HF3PCOLLID", //! Table with original global indices of collisions
-                         hf_cand::CollisionId,
-                         o2::soa::Marker<Marker3P>);
-
-// ===================
-// MC collision tables
-// ===================
-
-// MC collision columns
 namespace hf_mc_coll
 {
-DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision);      //! original global index of the MC collision
-DECLARE_SOA_ARRAY_INDEX_COLUMN(HfCollBase, hfCollBases); //! collision index array pointing to the derived reconstructed collisions for D0 candidates
-namespace der_d0
-{
-DECLARE_SOA_ARRAY_INDEX_COLUMN(HfD0CollBase, hfCollBases); //! collision index array pointing to the derived reconstructed collisions for D0 candidates
-}
-namespace der_3p
-{
-DECLARE_SOA_ARRAY_INDEX_COLUMN(Hf3PCollBase, hfCollBases); //! collision index array pointing to the derived reconstructed collisions for 3-prong candidates
-}
+DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! original global index of the MC collision
 } // namespace hf_mc_coll
 
-// base
-
-DECLARE_SOA_TABLE_STAGED(HfMcCollBases, "HFMCCOLLBASE", //! Table with basic MC collision info
-                         o2::soa::Index<>,
-                         mccollision::PosX,
-                         mccollision::PosY,
-                         mccollision::PosZ,
-                         o2::soa::Marker<MarkerBase>);
-
-using HfMcCollBase = HfMcCollBases::iterator;
-
-DECLARE_SOA_TABLE_STAGED(HfMcCollIds, "HFMCCOLLID", //! Table with original global indices of MC collisions
-                         hf_mc_coll::McCollisionId,
-                         o2::soa::Marker<MarkerBase>);
-
-DECLARE_SOA_TABLE_STAGED(HfMcRCollIds, "HFMCRCOLLID", //! Table with indices pointing to the derived reconstructed-collision table
-                         hf_mc_coll::HfCollBaseIds);
-
-// D0
-
-DECLARE_SOA_TABLE_STAGED(HfD0McCollBases, "HFD0MCCOLLBASE", //! Table with basic MC collision info
-                         o2::soa::Index<>,
-                         mccollision::PosX,
-                         mccollision::PosY,
-                         mccollision::PosZ,
-                         o2::soa::Marker<MarkerD0>);
-
-using HfD0McCollBase = HfD0McCollBases::iterator;
-using StoredHfD0McCollBase = StoredHfD0McCollBases::iterator;
-
-DECLARE_SOA_TABLE_STAGED(HfD0McCollIds, "HFD0MCCOLLID", //! Table with original global indices of MC collisions
-                         hf_mc_coll::McCollisionId,
-                         o2::soa::Marker<MarkerD0>);
-
-DECLARE_SOA_TABLE_STAGED(HfD0McRCollIds, "HFD0MCRCOLLID", //! Table with indices pointing to the derived reconstructed-collision table
-                         hf_mc_coll::der_d0::HfD0CollBaseIds);
-
-// 3-prong decays
-
-DECLARE_SOA_TABLE_STAGED(Hf3PMcCollBases, "HF3PMCCOLLBASE", //! Table with basic MC collision info
-                         o2::soa::Index<>,
-                         mccollision::PosX,
-                         mccollision::PosY,
-                         mccollision::PosZ,
-                         cent::CentFT0M,
-                         o2::soa::Marker<Marker3P>);
-
-using Hf3PMcCollBase = Hf3PMcCollBases::iterator;
-using StoredHf3PMcCollBase = StoredHf3PMcCollBases::iterator;
-
-DECLARE_SOA_TABLE_STAGED(Hf3PMcCollIds, "HF3PMCCOLLID", //! Table with original global indices of MC collisions
-                         hf_mc_coll::McCollisionId,
-                         o2::soa::Marker<Marker3P>);
-
-DECLARE_SOA_TABLE_STAGED(Hf3PMcRCollIds, "HF3PMCRCOLLID", //! Table with indices pointing to the derived reconstructed-collision table
-                         hf_mc_coll::der_3p::Hf3PCollBaseIds);
-
-// ================
-// Candidate tables
-// ================
+// Defines the collision table
+#define DECLARE_COLL_TABLE(_hf_type_, _hf_description_)                                \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##CollBases, "HF" _hf_description_ "COLLBASE", \
+                           o2::soa::Index<>,                                           \
+                           collision::PosX,                                            \
+                           collision::PosY,                                            \
+                           collision::PosZ,                                            \
+                           collision::NumContrib,                                      \
+                           hf_coll_base::CentFT0A,                                     \
+                           hf_coll_base::CentFT0C,                                     \
+                           hf_coll_base::CentFT0M,                                     \
+                           hf_coll_base::CentFV0A,                                     \
+                           hf_coll_base::MultZeqNTracksPV,                             \
+                           o2::soa::Marker<Marker##_hf_type_>);                        \
+                                                                                       \
+  using Hf##_hf_type_##CollBase = Hf##_hf_type_##CollBases::iterator;                  \
+  using StoredHf##_hf_type_##CollBase = StoredHf##_hf_type_##CollBases::iterator;      \
+                                                                                       \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##CollIds, "HF" _hf_description_ "COLLID",     \
+                           hf_cand::CollisionId,                                       \
+                           o2::soa::Marker<Marker##_hf_type_>);
+
+// Defines the mc collision table
+#define DECLARE_MCCOLL_TABLE(_hf_type_, _hf_description_, _hf_namespace_)                  \
+  namespace hf_mc_coll                                                                     \
+  {                                                                                        \
+  namespace der_##_hf_namespace_                                                           \
+  {                                                                                        \
+    DECLARE_SOA_ARRAY_INDEX_COLUMN(Hf##_hf_type_##CollBase, hfCollBases);                  \
+  }                                                                                        \
+  }                                                                                        \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollBases, "HF" _hf_description_ "MCCOLLBASE", \
+                           o2::soa::Index<>,                                               \
+                           mccollision::PosX,                                              \
+                           mccollision::PosY,                                              \
+                           mccollision::PosZ,                                              \
+                           o2::soa::Marker<Marker##_hf_type_>);                            \
+                                                                                           \
+  using Hf##_hf_type_##McCollBase = Hf##_hf_type_##McCollBases::iterator;                  \
+  using StoredHf##_hf_type_##McCollBase = StoredHf##_hf_type_##McCollBases::iterator;      \
+                                                                                           \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollIds, "HF" _hf_description_ "MCCOLLID",     \
+                           hf_mc_coll::McCollisionId,                                      \
+                           o2::soa::Marker<Marker##_hf_type_>);                            \
+                                                                                           \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McRCollIds, "HF" _hf_description_ "MCRCOLLID",   \
+                           hf_mc_coll::der_##_hf_namespace_::Hf##_hf_type_##CollBaseIds);
+
+#define DECLARE_COLL_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
+  DECLARE_COLL_TABLE(_hf_type_, _hf_description_)                        \
+  DECLARE_MCCOLL_TABLE(_hf_type_, _hf_description_, _hf_namespace_)
 
-// Basic candidate properties
 namespace hf_cand_base
 {
-namespace der_d0
-{
-DECLARE_SOA_INDEX_COLUMN(HfD0CollBase, hfCollBase); //! collision index pointing to the derived collision table for D0 candidates
-}
-namespace der_bplus
-{
-DECLARE_SOA_INDEX_COLUMN(HfCollBase, hfCollBase); //! collision index pointing to the derived collision table for B+ candidates
-}
-namespace der_3p
-{
-DECLARE_SOA_INDEX_COLUMN(Hf3PCollBase, hfCollBase); //! collision index pointing to the derived collision table for 3-prong candidates
-}
 DECLARE_SOA_COLUMN(Eta, eta, float); //! pseudorapidity
 DECLARE_SOA_COLUMN(M, m, float);     //! invariant mass
 DECLARE_SOA_COLUMN(Phi, phi, float); //! azimuth
@@ -243,6 +131,127 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p, //! momentum
                            [](float pt, float eta) -> float { return RecoDecayPtEtaPhi::p(pt, eta); });
 } // namespace hf_cand_base
 
+// Candidate MC columns
+namespace hf_cand_mc
+{
+DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);         //! flag for reconstruction level matching
+DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t);               //! particle origin, reconstruction level
+DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int8_t); //! swapping of the prongs order
+DECLARE_SOA_COLUMN(FlagMcDecayChanRec, flagMcDecayChanRec, int8_t); //! resonant decay channel flag, reconstruction level
+DECLARE_SOA_COLUMN(MlScoreSig, mlScoreSig, float);                  //! ML score for signal class
+DECLARE_SOA_COLUMN(MlScoreBkg, mlScoreBkg, float);                  //! ML score for background class
+DECLARE_SOA_COLUMN(MlScorePrompt, mlScorePrompt, float);            //! ML score for prompt class
+DECLARE_SOA_COLUMN(MlScoreNonPrompt, mlScoreNonPrompt, float);      //! ML score for non-prompt class
+DECLARE_SOA_COLUMN(MlScores, mlScores, std::vector<float>);         //! vector of ML scores
+} // namespace hf_cand_mc
+
+namespace hf_mc_particle
+{
+DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision);                 //! MC collision of this particle
+DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle);                   //! MC particle
+DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);         //! flag for generator level matching
+DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t);               //! particle origin, generator level
+DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant decay channel flag, generator level
+} // namespace hf_mc_particle
+
+#define DECLARE_CAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_)              \
+  namespace hf_cand_base                                                                  \
+  {                                                                                       \
+  namespace der_##_hf_namespace_                                                          \
+  {                                                                                       \
+    DECLARE_SOA_INDEX_COLUMN(Hf##_hf_type_##CollBase, hfCollBase);                        \
+  }                                                                                       \
+  }                                                                                       \
+                                                                                          \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Bases, "HF" _hf_description_ "BASE",            \
+                           o2::soa::Index<>,                                              \
+                           hf_cand_base::der_##_hf_namespace_::Hf##_hf_type_##CollBaseId, \
+                           hf_cand_base::Pt,                                              \
+                           hf_cand_base::Eta,                                             \
+                           hf_cand_base::Phi,                                             \
+                           hf_cand_base::M,                                               \
+                           hf_cand_base::Y,                                               \
+                           hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>,         \
+                           hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>,         \
+                           hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>,         \
+                           hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>,          \
+                           o2::soa::Marker<Marker##_hf_type_>);
+
+#define DECLARE_CAND_2P_ID_TABLE(_hf_type_, _hf_description_)              \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Ids, "HF" _hf_description_ "ID", \
+                           hf_cand::CollisionId,                           \
+                           hf_track_index::Prong0Id,                       \
+                           hf_track_index::Prong1Id,                       \
+                           o2::soa::Marker<Marker##_hf_type_>);
+
+#define DECLARE_CAND_3P_ID_TABLE(_hf_type_, _hf_description_)              \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Ids, "HF" _hf_description_ "ID", \
+                           hf_cand::CollisionId,                           \
+                           hf_track_index::Prong0Id,                       \
+                           hf_track_index::Prong1Id,                       \
+                           hf_track_index::Prong2Id,                       \
+                           o2::soa::Marker<Marker##_hf_type_>);
+
+#define DECLARE_MCCAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_)                \
+  namespace hf_mc_particle                                                                    \
+  {                                                                                           \
+  namespace der_##_hf_namespace_                                                              \
+  {                                                                                           \
+    DECLARE_SOA_INDEX_COLUMN(Hf##_hf_type_##McCollBase, hfMcCollBase);                        \
+  }                                                                                           \
+  }                                                                                           \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##PBases, "HF" _hf_description_ "PBASE",              \
+                           o2::soa::Index<>,                                                  \
+                           hf_mc_particle::der_##_hf_namespace_::Hf##_hf_type_##McCollBaseId, \
+                           hf_cand_base::Pt,                                                  \
+                           hf_cand_base::Eta,                                                 \
+                           hf_cand_base::Phi,                                                 \
+                           hf_cand_base::Y,                                                   \
+                           hf_mc_particle::FlagMcMatchGen,                                    \
+                           hf_mc_particle::OriginMcGen,                                       \
+                           hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>,             \
+                           hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>,             \
+                           hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>,             \
+                           hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>,              \
+                           o2::soa::Marker<Marker##_hf_type_>);
+
+#define DECLARE_MCCAND_ID_TABLE(_hf_type_, _hf_description_)                 \
+  DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##PIds, "HF" _hf_description_ "PID", \
+                           hf_mc_particle::McCollisionId,                    \
+                           hf_mc_particle::McParticleId,                     \
+                           o2::soa::Marker<Marker##_hf_type_>);
+
+#define DECLARE_CAND_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
+  DECLARE_CAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_)   \
+  DECLARE_MCCAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
+  DECLARE_MCCAND_ID_TABLE(_hf_type_, _hf_description_)
+
+#define DECLARE_CAND_2P_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
+  DECLARE_CAND_TABLES(_hf_type_, _hf_description_, _hf_namespace_)          \
+  DECLARE_CAND_2P_ID_TABLE(_hf_type_, _hf_description_)
+
+#define DECLARE_CAND_3P_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
+  DECLARE_CAND_TABLES(_hf_type_, _hf_description_, _hf_namespace_)          \
+  DECLARE_CAND_3P_ID_TABLE(_hf_type_, _hf_description_)
+
+#define DECLARE_2P_TABLES(_hf_type_, _hf_description_, _hf_namespace_, _marker_number_) \
+  constexpr uint Marker##_hf_type_ = _marker_number_;                                   \
+  DECLARE_COLL_TABLES(_hf_type_, _hf_description_, _hf_namespace_)                      \
+  DECLARE_CAND_2P_TABLES(_hf_type_, _hf_description_, _hf_namespace_)
+
+#define DECLARE_3P_TABLES(_hf_type_, _hf_description_, _hf_namespace_, _marker_number_) \
+  constexpr uint Marker##_hf_type_ = _marker_number_;                                   \
+  DECLARE_COLL_TABLES(_hf_type_, _hf_description_, _hf_namespace_)                      \
+  DECLARE_CAND_3P_TABLES(_hf_type_, _hf_description_, _hf_namespace_)
+
+DECLARE_2P_TABLES(D0, "D0", d0, 2);
+DECLARE_3P_TABLES(Lc, "LC", lc, 3);
+DECLARE_3P_TABLES(Bplus, "BP", bplus, 4);
+
+// ================
+// Candidate tables
+// ================
+
 // Candidate properties used for selection
 namespace hf_cand_par
 {
@@ -387,20 +396,6 @@ namespace hf_cand_sel
 DECLARE_SOA_COLUMN(CandidateSelFlag, candidateSelFlag, int8_t); //! bitmap of the selected candidate type
 }
 
-// Candidate MC columns
-namespace hf_cand_mc
-{
-DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t);         //! flag for reconstruction level matching
-DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t);               //! particle origin, reconstruction level
-DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int8_t); //! swapping of the prongs order
-DECLARE_SOA_COLUMN(FlagMcDecayChanRec, flagMcDecayChanRec, int8_t); //! resonant decay channel flag, reconstruction level
-DECLARE_SOA_COLUMN(MlScoreSig, mlScoreSig, float);                  //! ML score for signal class
-DECLARE_SOA_COLUMN(MlScoreBkg, mlScoreBkg, float);                  //! ML score for background class
-DECLARE_SOA_COLUMN(MlScorePrompt, mlScorePrompt, float);            //! ML score for prompt class
-DECLARE_SOA_COLUMN(MlScoreNonPrompt, mlScoreNonPrompt, float);      //! ML score for non-prompt class
-DECLARE_SOA_COLUMN(MlScores, mlScores, std::vector<float>);         //! vector of ML scores
-} // namespace hf_cand_mc
-
 // Candidate MC columns of the charm daughter
 namespace hf_cand_mc_charm
 {
@@ -415,22 +410,6 @@ DECLARE_SOA_COLUMN(MlScoreNonPromptCharm, mlScoreNonPromptCharm, float);      //
 DECLARE_SOA_COLUMN(MlScoresCharm, mlScoresCharm, std::vector<float>);         //! vector of ML scores
 } // namespace hf_cand_mc_charm
 
-// D0
-
-DECLARE_SOA_TABLE_STAGED(HfD0Bases, "HFD0BASE", //! Table with basic candidate properties used in the analyses
-                         o2::soa::Index<>,
-                         hf_cand_base::der_d0::HfD0CollBaseId,
-                         hf_cand_base::Pt,
-                         hf_cand_base::Eta,
-                         hf_cand_base::Phi,
-                         hf_cand_base::M,
-                         hf_cand_base::Y,
-                         hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         o2::soa::Marker<MarkerD0>);
-
 // candidates for removal:
 // PxProng0, PyProng0, PzProng0,... (same for 1, 2), we can keep Pt, Eta, Phi instead
 // XY: CpaXY, DecayLengthXY, ErrorDecayLengthXY
@@ -495,33 +474,11 @@ DECLARE_SOA_TABLE_STAGED(HfD0Mls, "HFD0ML", //! Table with candidate selection M
                          hf_cand_mc::MlScores,
                          o2::soa::Marker<MarkerD0>);
 
-DECLARE_SOA_TABLE_STAGED(HfD0Ids, "HFD0ID", //! Table with original global indices for candidates
-                         hf_cand::CollisionId,
-                         hf_track_index::Prong0Id,
-                         hf_track_index::Prong1Id,
-                         o2::soa::Marker<MarkerD0>);
-
 DECLARE_SOA_TABLE_STAGED(HfD0Mcs, "HFD0MC", //! Table with MC candidate info
                          hf_cand_mc::FlagMcMatchRec,
                          hf_cand_mc::OriginMcRec,
                          o2::soa::Marker<MarkerD0>);
 
-// B+
-
-DECLARE_SOA_TABLE_STAGED(HfBplusBases, "HFBPBASE", //! Table with basic candidate properties used in the analyses
-                         o2::soa::Index<>,
-                         hf_cand_base::der_bplus::HfCollBaseId,
-                         hf_cand_base::Pt,
-                         hf_cand_base::Eta,
-                         hf_cand_base::Phi,
-                         hf_cand_base::M,
-                         hf_cand_base::Y,
-                         hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         o2::soa::Marker<MarkerBplus>);
-
 // candidates for removal:
 // PxProng0, PyProng0, PzProng0,... (same for 1, 2), we can keep Pt, Eta, Phi instead
 // XY: CpaXY, DecayLengthXY, ErrorDecayLengthXY
@@ -585,47 +542,24 @@ DECLARE_SOA_TABLE_STAGED(HfBplusParEs, "HFBPPARE", //! Table with additional can
                          hf_cand_par::Ct,
                          o2::soa::Marker<MarkerBplus>);
 
-DECLARE_SOA_TABLE_STAGED(HfBplusMls, "HFBPML", //! Table with candidate selection ML scores
-                         hf_cand_mc::MlScoreSig,
+DECLARE_SOA_TABLE_STAGED(HfBplusMls, "HFBPML",   //! Table with candidate selection ML scores
+                         hf_cand_mc::MlScoreSig, // why is this the signal ML score instead of the full one?
                          o2::soa::Marker<MarkerBplus>);
 
 DECLARE_SOA_TABLE_STAGED(HfBplusMlD0s, "HFBPMLD0", //! Table with D0 candidate selection ML scores
                          hf_cand_mc_charm::MlScoresCharm,
                          o2::soa::Marker<MarkerBplus>);
 
-DECLARE_SOA_TABLE_STAGED(HfBplusIds, "HFBPID", //! Table with original global indices for candidates
-                         hf_cand::CollisionId,
-                         hf_track_index::Prong0Id, // D0 prong 0
-                         hf_track_index::Prong1Id, // D0 prong 1
-                         hf_track_index::Prong2Id, // bachelor pion
-                         o2::soa::Marker<MarkerBplus>);
-
 DECLARE_SOA_TABLE_STAGED(HfBplusMcs, "HFBPMC", //! Table with MC candidate info
                          hf_cand_mc::FlagMcMatchRec,
                          hf_cand_mc::OriginMcRec,
                          o2::soa::Marker<MarkerBplus>);
 
-// 3-prong decays
-
-DECLARE_SOA_TABLE_STAGED(Hf3PBases, "HF3PBASE", //! Table with basic candidate properties used in the analyses
-                         o2::soa::Index<>,
-                         hf_cand_base::der_3p::Hf3PCollBaseId,
-                         hf_cand_base::Pt,
-                         hf_cand_base::Eta,
-                         hf_cand_base::Phi,
-                         hf_cand_base::M,
-                         hf_cand_base::Y,
-                         hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         o2::soa::Marker<Marker3P>);
-
 // candidates for removal:
 // PxProng0, PyProng0, PzProng0,... (same for 1, 2), we can keep Pt, Eta, Phi instead
 // XY: CpaXY, DecayLengthXY, ErrorDecayLengthXY
 // normalised: DecayLengthNormalised, DecayLengthXYNormalised, ImpactParameterNormalised0
-DECLARE_SOA_TABLE_STAGED(Hf3PPars, "HF3PPAR", //! Table with candidate properties used for selection
+DECLARE_SOA_TABLE_STAGED(HfLcPars, "HFLCPAR", //! Table with candidate properties used for selection
                          hf_cand::Chi2PCA,
                          hf_cand::NProngsContributorsPV,
                          hf_cand_par::Cpa,
@@ -658,9 +592,9 @@ DECLARE_SOA_TABLE_STAGED(Hf3PPars, "HF3PPAR", //! Table with candidate propertie
                          hf_cand_par::NSigTofPr2,
                          hf_cand_par::NSigTpcTofPi2,
                          hf_cand_par::NSigTpcTofPr2,
-                         o2::soa::Marker<Marker3P>);
+                         o2::soa::Marker<MarkerLc>);
 
-DECLARE_SOA_TABLE_STAGED(Hf3PParEs, "HF3PPARE", //! Table with additional candidate properties used for selection
+DECLARE_SOA_TABLE_STAGED(HfLcParEs, "HFLCPARE", //! Table with additional candidate properties used for selection
                          hf_cand::XSecondaryVertex,
                          hf_cand::YSecondaryVertex,
                          hf_cand::ZSecondaryVertex,
@@ -683,120 +617,22 @@ DECLARE_SOA_TABLE_STAGED(Hf3PParEs, "HF3PPARE", //! Table with additional candid
                          hf_cand::ErrorImpactParameter1,
                          hf_cand::ErrorImpactParameter2,
                          hf_cand_par::Ct,
-                         o2::soa::Marker<Marker3P>);
+                         o2::soa::Marker<MarkerLc>);
 
-DECLARE_SOA_TABLE_STAGED(Hf3PSels, "HF3PSEL", //! Table with candidate selection flags
+DECLARE_SOA_TABLE_STAGED(HfLcSels, "HFLCSEL", //! Table with candidate selection flags
                          hf_cand_sel::CandidateSelFlag,
-                         o2::soa::Marker<Marker3P>);
+                         o2::soa::Marker<MarkerLc>);
 
-DECLARE_SOA_TABLE_STAGED(Hf3PMls, "HF3PML", //! Table with candidate selection ML scores
+DECLARE_SOA_TABLE_STAGED(HfLcMls, "HFLCML", //! Table with candidate selection ML scores
                          hf_cand_mc::MlScores,
-                         o2::soa::Marker<Marker3P>);
-
-DECLARE_SOA_TABLE_STAGED(Hf3PIds, "HF3PID", //! Table with original global indices for candidates
-                         hf_cand::CollisionId,
-                         hf_track_index::Prong0Id,
-                         hf_track_index::Prong1Id,
-                         hf_track_index::Prong2Id,
-                         o2::soa::Marker<Marker3P>);
+                         o2::soa::Marker<MarkerLc>);
 
-DECLARE_SOA_TABLE_STAGED(Hf3PMcs, "HF3PMC", //! Table with MC candidate info
+DECLARE_SOA_TABLE_STAGED(HfLcMcs, "HFLcMC", //! Table with MC candidate info
                          hf_cand_mc::FlagMcMatchRec,
                          hf_cand_mc::OriginMcRec,
                          hf_cand_mc::IsCandidateSwapped,
-                         o2::soa::Marker<Marker3P>);
-
-// ==================
-// MC particle tables
-// ==================
-
-// MC particle columns
-namespace hf_mc_particle
-{
-DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! MC collision of this particle
-DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle);   //! MC particle
-namespace der_d0
-{
-DECLARE_SOA_INDEX_COLUMN(HfD0McCollBase, hfMcCollBase); //! collision index pointing to the derived MC collision table for D0 candidates
-}
-namespace der_bplus
-{
-DECLARE_SOA_INDEX_COLUMN(HfMcCollBase, hfMcCollBase); //! collision index pointing to the derived MC collision table for B+ candidates
-}
-namespace der_3p
-{
-DECLARE_SOA_INDEX_COLUMN(Hf3PMcCollBase, hfMcCollBase); //! collision index pointing to the derived MC collision table for 3-prong candidates
-}
-DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t);         //! flag for generator level matching
-DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t);               //! particle origin, generator level
-DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant decay channel flag, generator level
-} // namespace hf_mc_particle
-
-// D0
-
-DECLARE_SOA_TABLE_STAGED(HfD0PBases, "HFD0PBASE", //! Table with MC particle info
-                         o2::soa::Index<>,
-                         hf_mc_particle::der_d0::HfD0McCollBaseId,
-                         hf_cand_base::Pt,
-                         hf_cand_base::Eta,
-                         hf_cand_base::Phi,
-                         hf_cand_base::Y,
-                         hf_mc_particle::FlagMcMatchGen,
-                         hf_mc_particle::OriginMcGen,
-                         hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         o2::soa::Marker<MarkerD0>);
-
-DECLARE_SOA_TABLE_STAGED(HfD0PIds, "HFD0PID", //! Table with original global indices for MC particles
-                         hf_mc_particle::McCollisionId,
-                         hf_mc_particle::McParticleId,
-                         o2::soa::Marker<MarkerD0>);
-
-// B+
-
-DECLARE_SOA_TABLE_STAGED(HfBplusPBases, "HFBPPBASE", //! Table with MC particle info
-                         o2::soa::Index<>,
-                         hf_mc_particle::der_bplus::HfMcCollBaseId,
-                         hf_cand_base::Pt,
-                         hf_cand_base::Eta,
-                         hf_cand_base::Phi,
-                         hf_cand_base::Y,
-                         hf_mc_particle::FlagMcMatchGen,
-                         hf_mc_particle::OriginMcGen,
-                         hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         o2::soa::Marker<MarkerBplus>);
-
-DECLARE_SOA_TABLE_STAGED(HfBplusPIds, "HFBPPID", //! Table with original global indices for MC particles
-                         hf_mc_particle::McCollisionId,
-                         hf_mc_particle::McParticleId,
-                         o2::soa::Marker<MarkerBplus>);
+                         o2::soa::Marker<MarkerLc>);
 
-// 3-prong decays
-
-DECLARE_SOA_TABLE_STAGED(Hf3PPBases, "HF3PPBASE", //! Table with MC particle info
-                         o2::soa::Index<>,
-                         hf_mc_particle::der_3p::Hf3PMcCollBaseId,
-                         hf_cand_base::Pt,
-                         hf_cand_base::Eta,
-                         hf_cand_base::Phi,
-                         hf_cand_base::Y,
-                         hf_mc_particle::FlagMcMatchGen,
-                         hf_mc_particle::OriginMcGen,
-                         hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>,
-                         hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>,
-                         o2::soa::Marker<Marker3P>);
-
-DECLARE_SOA_TABLE_STAGED(Hf3PPIds, "HF3PPID", //! Table with original global indices for MC particles
-                         hf_mc_particle::McCollisionId,
-                         hf_mc_particle::McParticleId,
-                         o2::soa::Marker<Marker3P>);
 } // namespace o2::aod
 
 #endif // PWGHF_DATAMODEL_DERIVEDTABLES_H_
diff --git a/PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx b/PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx
index 6c0ada5de5b..a27eb609342 100644
--- a/PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx
+++ b/PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx
@@ -28,6 +28,7 @@
 #include "Common/DataModel/Multiplicity.h"
 
 #include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/HfDerivedData.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 #include "PWGHF/DataModel/DerivedTables.h"
@@ -52,12 +53,12 @@ struct HfDerivedDataCreatorBplusToD0Pi {
   Produces<o2::aod::HfBplusIds> rowCandidateId;
   Produces<o2::aod::HfBplusMcs> rowCandidateMc;
   // Collisions
-  Produces<o2::aod::HfCollBases> rowCollBase;
-  Produces<o2::aod::HfCollIds> rowCollId;
+  Produces<o2::aod::HfBplusCollBases> rowCollBase;
+  Produces<o2::aod::HfBplusCollIds> rowCollId;
   // MC collisions
-  Produces<o2::aod::HfMcCollBases> rowMcCollBase;
-  Produces<o2::aod::HfMcCollIds> rowMcCollId;
-  Produces<o2::aod::HfMcRCollIds> rowMcRCollId;
+  Produces<o2::aod::HfBplusMcCollBases> rowMcCollBase;
+  Produces<o2::aod::HfBplusMcCollIds> rowMcCollId;
+  Produces<o2::aod::HfBplusMcRCollIds> rowMcRCollId;
   // MC particles
   Produces<o2::aod::HfBplusPBases> rowParticleBase;
   Produces<o2::aod::HfBplusPIds> rowParticleId;
@@ -83,6 +84,7 @@ struct HfDerivedDataCreatorBplusToD0Pi {
   Configurable<float> ptMaxForDownSample{"ptMaxForDownSample", 10., "Maximum pt for the application of the downsampling factor"};
 
   HfHelper hfHelper;
+  HfDerivedData hfDerivedData;
   SliceCache cache;
   std::map<int, std::vector<int>> matchedCollisions; // indices of derived reconstructed collisions matched to the global indices of MC collisions
   std::map<int, bool> hasMcParticles;                // flags for MC collisions with HF particles
@@ -127,70 +129,11 @@ struct HfDerivedDataCreatorBplusToD0Pi {
     }
   }
 
-  template <bool isMC, typename T>
-  // void fillTablesCollision(const T& collision, int isEventReject, int runNumber)
-  void fillTablesCollision(const T& collision)
-  {
-    if (fillCollBase) {
-      rowCollBase(
-        collision.posX(),
-        collision.posY(),
-        collision.posZ(),
-        collision.numContrib(),
-        collision.centFT0A(),
-        collision.centFT0C(),
-        collision.centFT0M(),
-        collision.centFV0A(),
-        collision.multZeqNTracksPV());
-      // isEventReject,
-      // runNumber);
-    }
-    if (fillCollId) {
-      rowCollId(
-        collision.globalIndex());
-    }
-    if constexpr (isMC) {
-      if (fillMcRCollId && collision.has_mcCollision()) {
-        // Save rowCollBase.lastIndex() at key collision.mcCollisionId()
-        LOGF(debug, "Rec. collision %d: Filling derived-collision index %d for MC collision %d", collision.globalIndex(), rowCollBase.lastIndex(), collision.mcCollisionId());
-        matchedCollisions[collision.mcCollisionId()].push_back(rowCollBase.lastIndex()); // [] inserts an empty element if it does not exist
-      }
-    }
-  }
-
-  template <typename T>
-  void fillTablesMcCollision(const T& mcCollision)
-  {
-    if (fillMcCollBase) {
-      rowMcCollBase(
-        mcCollision.posX(),
-        mcCollision.posY(),
-        mcCollision.posZ());
-    }
-    if (fillMcCollId) {
-      rowMcCollId(
-        mcCollision.globalIndex());
-    }
-    if (fillMcRCollId) {
-      // Fill the table with the vector of indices of derived reconstructed collisions matched to mcCollision.globalIndex()
-      rowMcRCollId(
-        matchedCollisions[mcCollision.globalIndex()]);
-    }
-  }
-
   template <typename T, typename U, typename V>
-  void fillTablesCandidate(const T& candidate, const U& prongCharm, const V& prongBachelor, int candFlag, double invMass,
+  void fillTablesCandidate(const T& candidate, const U& prongCharm, const V& prongBachelor, int candFlag, float invMass,
                            double ct, double y, int8_t flagMc, int8_t origin, float mlScore, const std::vector<float>& mlScoresCharm)
   {
-    if (fillCandidateBase) {
-      rowCandidateBase(
-        rowCollBase.lastIndex(),
-        candidate.pt(),
-        candidate.eta(),
-        candidate.phi(),
-        invMass,
-        y);
-    }
+    hfDerivedData.fillCandidateTables(candidate, fillCandidateBase, rowCandidateBase, rowCollBase, invMass, y);
     if (fillCandidatePar) {
       rowCandidatePar(
         candidate.chi2PCA(),
@@ -285,26 +228,6 @@ struct HfDerivedDataCreatorBplusToD0Pi {
     }
   }
 
-  template <typename T, typename U>
-  void fillTablesParticle(const T& particle, U mass)
-  {
-    if (fillParticleBase) {
-      rowParticleBase(
-        rowMcCollBase.lastIndex(),
-        particle.pt(),
-        particle.eta(),
-        particle.phi(),
-        RecoDecayPtEtaPhi::y(particle.pt(), particle.eta(), mass),
-        particle.flagMcMatchGen(),
-        particle.originMcGen());
-    }
-    if (fillParticleId) {
-      rowParticleId(
-        particle.mcCollisionId(),
-        particle.globalIndex());
-    }
-  }
-
   template <bool isMl, bool isMc, bool onlyBkg, bool onlySig, typename CollType, typename CandType, typename CandCharmType>
   void processCandidates(CollType const& collisions,
                          Partition<CandType>& candidates,
@@ -338,7 +261,7 @@ struct HfDerivedDataCreatorBplusToD0Pi {
       }
       LOGF(debug, "Filling rec. collision %d at derived index %d", thisCollId, rowCollBase.lastIndex() + 1);
       // fillTablesCollision(collision, 0, collision.bc().runNumber());
-      fillTablesCollision<isMc>(collision);
+      hfDerivedData.fillCollTables<isMc>(collision, fillCollBase, rowCollBase, fillCollId, rowCollId, fillMcRCollId, matchedCollisions);
 
       // Fill candidate properties
       reserveTable(rowCandidateBase, fillCandidateBase, sizeTableCand);
@@ -433,13 +356,13 @@ struct HfDerivedDataCreatorBplusToD0Pi {
         continue;
       }
       LOGF(debug, "Filling MC collision %d at derived index %d", thisMcCollId, rowMcCollBase.lastIndex() + 1);
-      fillTablesMcCollision(mcCollision);
+      hfDerivedData.fillCollMcTables(mcCollision, fillMcCollBase, rowMcCollBase, fillMcCollId, rowMcCollId, fillMcRCollId, matchedCollisions, rowMcRCollId);
 
       // Fill MC particle properties
       reserveTable(rowParticleBase, fillParticleBase, sizeTablePart);
       reserveTable(rowParticleId, fillParticleId, sizeTablePart);
       for (const auto& particle : particlesThisMcColl) {
-        fillTablesParticle(particle, o2::constants::physics::MassBPlus);
+        hfDerivedData.fillParticleTables(particle, fillParticleBase, rowParticleBase, rowMcCollBase, o2::constants::physics::MassBPlus, fillParticleId, rowParticleId);
       }
     }
   }
diff --git a/PWGHF/TableProducer/derivedDataCreatorD0ToKPi.cxx b/PWGHF/TableProducer/derivedDataCreatorD0ToKPi.cxx
index de26dc1dff3..7db34b96cbb 100644
--- a/PWGHF/TableProducer/derivedDataCreatorD0ToKPi.cxx
+++ b/PWGHF/TableProducer/derivedDataCreatorD0ToKPi.cxx
@@ -28,6 +28,7 @@
 #include "Common/DataModel/Multiplicity.h"
 
 #include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/HfDerivedData.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 #include "PWGHF/DataModel/DerivedTables.h"
@@ -81,6 +82,7 @@ struct HfDerivedDataCreatorD0ToKPi {
   Configurable<float> ptMaxForDownSample{"ptMaxForDownSample", 10., "Maximum pt for the application of the downsampling factor"};
 
   HfHelper hfHelper;
+  HfDerivedData hfDerivedData;
   SliceCache cache;
   std::map<int, std::vector<int>> matchedCollisions; // indices of derived reconstructed collisions matched to the global indices of MC collisions
   std::map<int, bool> hasMcParticles;                // flags for MC collisions with HF particles
@@ -140,70 +142,11 @@ struct HfDerivedDataCreatorD0ToKPi {
     }
   }
 
-  template <bool isMC, typename T>
-  // void fillTablesCollision(const T& collision, int isEventReject, int runNumber)
-  void fillTablesCollision(const T& collision)
-  {
-    if (fillCollBase) {
-      rowCollBase(
-        collision.posX(),
-        collision.posY(),
-        collision.posZ(),
-        collision.numContrib(),
-        collision.centFT0A(),
-        collision.centFT0C(),
-        collision.centFT0M(),
-        collision.centFV0A(),
-        collision.multZeqNTracksPV());
-      // isEventReject,
-      // runNumber);
-    }
-    if (fillCollId) {
-      rowCollId(
-        collision.globalIndex());
-    }
-    if constexpr (isMC) {
-      if (fillMcRCollId && collision.has_mcCollision()) {
-        // Save rowCollBase.lastIndex() at key collision.mcCollisionId()
-        LOGF(debug, "Rec. collision %d: Filling derived-collision index %d for MC collision %d", collision.globalIndex(), rowCollBase.lastIndex(), collision.mcCollisionId());
-        matchedCollisions[collision.mcCollisionId()].push_back(rowCollBase.lastIndex()); // [] inserts an empty element if it does not exist
-      }
-    }
-  }
-
-  template <typename T>
-  void fillTablesMcCollision(const T& mcCollision)
-  {
-    if (fillMcCollBase) {
-      rowMcCollBase(
-        mcCollision.posX(),
-        mcCollision.posY(),
-        mcCollision.posZ());
-    }
-    if (fillMcCollId) {
-      rowMcCollId(
-        mcCollision.globalIndex());
-    }
-    if (fillMcRCollId) {
-      // Fill the table with the vector of indices of derived reconstructed collisions matched to mcCollision.globalIndex()
-      rowMcRCollId(
-        matchedCollisions[mcCollision.globalIndex()]);
-    }
-  }
-
   template <typename T>
-  void fillTablesCandidate(const T& candidate, int candFlag, double invMass, double cosThetaStar, double topoChi2,
+  void fillTablesCandidate(const T& candidate, int candFlag, float invMass, double cosThetaStar, double topoChi2,
                            double ct, double y, int8_t flagMc, int8_t origin, const std::vector<float>& mlScores)
   {
-    if (fillCandidateBase) {
-      rowCandidateBase(
-        rowCollBase.lastIndex(),
-        candidate.pt(),
-        candidate.eta(),
-        candidate.phi(),
-        invMass,
-        y);
-    }
+    hfDerivedData.fillCandidateTables(candidate, fillCandidateBase, rowCandidateBase, rowCollBase, invMass, y);
     if (fillCandidatePar) {
       std::array<std::array<std::array<float, 3>, 2>, 2> sigmas{}; // PID nSigma [Expected][Hypothesis][TPC/TOF/TPC+TOF]
       if (candFlag == 0) {
@@ -289,26 +232,6 @@ struct HfDerivedDataCreatorD0ToKPi {
     }
   }
 
-  template <typename T, typename U>
-  void fillTablesParticle(const T& particle, U mass)
-  {
-    if (fillParticleBase) {
-      rowParticleBase(
-        rowMcCollBase.lastIndex(),
-        particle.pt(),
-        particle.eta(),
-        particle.phi(),
-        RecoDecayPtEtaPhi::y(particle.pt(), particle.eta(), mass),
-        particle.flagMcMatchGen(),
-        particle.originMcGen());
-    }
-    if (fillParticleId) {
-      rowParticleId(
-        particle.mcCollisionId(),
-        particle.globalIndex());
-    }
-  }
-
   template <aod::hf_cand::VertexerType reconstructionType, bool isMl, bool isMc, bool onlyBkg, bool onlySig, typename CollType, typename CandType>
   void processCandidates(CollType const& collisions,
                          Partition<CandType>& candidates,
@@ -341,7 +264,7 @@ struct HfDerivedDataCreatorD0ToKPi {
       }
       LOGF(debug, "Filling rec. collision %d at derived index %d", thisCollId, rowCollBase.lastIndex() + 1);
       // fillTablesCollision(collision, 0, collision.bc().runNumber());
-      fillTablesCollision<isMc>(collision);
+      hfDerivedData.fillCollTables<isMc>(collision, fillCollBase, rowCollBase, fillCollId, rowCollId, fillMcRCollId, matchedCollisions);
 
       // Fill candidate properties
       reserveTable(rowCandidateBase, fillCandidateBase, sizeTableCand);
@@ -448,13 +371,13 @@ struct HfDerivedDataCreatorD0ToKPi {
         continue;
       }
       LOGF(debug, "Filling MC collision %d at derived index %d", thisMcCollId, rowMcCollBase.lastIndex() + 1);
-      fillTablesMcCollision(mcCollision);
+      hfDerivedData.fillCollMcTables(mcCollision, fillMcCollBase, rowMcCollBase, fillMcCollId, rowMcCollId, fillMcRCollId, matchedCollisions, rowMcRCollId);
 
       // Fill MC particle properties
       reserveTable(rowParticleBase, fillParticleBase, sizeTablePart);
       reserveTable(rowParticleId, fillParticleId, sizeTablePart);
       for (const auto& particle : particlesThisMcColl) {
-        fillTablesParticle(particle, o2::constants::physics::MassD0);
+        hfDerivedData.fillParticleTables(particle, fillParticleBase, rowParticleBase, rowMcCollBase, o2::constants::physics::MassD0, fillParticleId, rowParticleId);
       }
     }
   }
diff --git a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx
index e16c498cd11..788cfb57272 100644
--- a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx
+++ b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx
@@ -30,6 +30,7 @@
 #include "PWGLF/DataModel/mcCentrality.h"
 
 #include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Core/HfDerivedData.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 #include "PWGHF/DataModel/DerivedTables.h"
@@ -43,23 +44,23 @@ using namespace o2::analysis::hf_derived;
 /// Writes the full information in an output TTree
 struct HfDerivedDataCreatorLcToPKPi {
   // Candidates
-  Produces<o2::aod::Hf3PBases> rowCandidateBase;
-  Produces<o2::aod::Hf3PPars> rowCandidatePar;
-  Produces<o2::aod::Hf3PParEs> rowCandidateParE;
-  Produces<o2::aod::Hf3PSels> rowCandidateSel;
-  Produces<o2::aod::Hf3PMls> rowCandidateMl;
-  Produces<o2::aod::Hf3PIds> rowCandidateId;
-  Produces<o2::aod::Hf3PMcs> rowCandidateMc;
+  Produces<o2::aod::HfLcBases> rowCandidateBase;
+  Produces<o2::aod::HfLcPars> rowCandidatePar;
+  Produces<o2::aod::HfLcParEs> rowCandidateParE;
+  Produces<o2::aod::HfLcSels> rowCandidateSel;
+  Produces<o2::aod::HfLcMls> rowCandidateMl;
+  Produces<o2::aod::HfLcIds> rowCandidateId;
+  Produces<o2::aod::HfLcMcs> rowCandidateMc;
   // Collisions
-  Produces<o2::aod::Hf3PCollBases> rowCollBase;
-  Produces<o2::aod::Hf3PCollIds> rowCollId;
+  Produces<o2::aod::HfLcCollBases> rowCollBase;
+  Produces<o2::aod::HfLcCollIds> rowCollId;
   // MC collisions
-  Produces<o2::aod::Hf3PMcCollBases> rowMcCollBase;
-  Produces<o2::aod::Hf3PMcCollIds> rowMcCollId;
-  Produces<o2::aod::Hf3PMcRCollIds> rowMcRCollId;
+  Produces<o2::aod::HfLcMcCollBases> rowMcCollBase;
+  Produces<o2::aod::HfLcMcCollIds> rowMcCollId;
+  Produces<o2::aod::HfLcMcRCollIds> rowMcRCollId;
   // MC particles
-  Produces<o2::aod::Hf3PPBases> rowParticleBase;
-  Produces<o2::aod::Hf3PPIds> rowParticleId;
+  Produces<o2::aod::HfLcPBases> rowParticleBase;
+  Produces<o2::aod::HfLcPIds> rowParticleId;
 
   // Switches for filling tables
   Configurable<bool> fillCandidateBase{"fillCandidateBase", true, "Fill candidate base properties"};
@@ -81,6 +82,7 @@ struct HfDerivedDataCreatorLcToPKPi {
   Configurable<float> ptMaxForDownSample{"ptMaxForDownSample", 10., "Maximum pt for the application of the downsampling factor"};
 
   HfHelper hfHelper;
+  HfDerivedData hfDerivedData;
   SliceCache cache;
   std::map<int, std::vector<int>> matchedCollisions; // indices of derived reconstructed collisions matched to the global indices of MC collisions
   std::map<int, bool> hasMcParticles;                // flags for MC collisions with HF particles
@@ -123,71 +125,11 @@ struct HfDerivedDataCreatorLcToPKPi {
     }
   }
 
-  template <bool isMC, typename T>
-  // void fillTablesCollision(const T& collision, int isEventReject, int runNumber)
-  void fillTablesCollision(const T& collision)
-  {
-    if (fillCollBase) {
-      rowCollBase(
-        collision.posX(),
-        collision.posY(),
-        collision.posZ(),
-        collision.numContrib(),
-        collision.centFT0A(),
-        collision.centFT0C(),
-        collision.centFT0M(),
-        collision.centFV0A(),
-        collision.multZeqNTracksPV());
-      // isEventReject,
-      // runNumber);
-    }
-    if (fillCollId) {
-      rowCollId(
-        collision.globalIndex());
-    }
-    if constexpr (isMC) {
-      if (fillMcRCollId && collision.has_mcCollision()) {
-        // Save rowCollBase.lastIndex() at key collision.mcCollisionId()
-        LOGF(debug, "Rec. collision %d: Filling derived-collision index %d for MC collision %d", collision.globalIndex(), rowCollBase.lastIndex(), collision.mcCollisionId());
-        matchedCollisions[collision.mcCollisionId()].push_back(rowCollBase.lastIndex()); // [] inserts an empty element if it does not exist
-      }
-    }
-  }
-
-  template <typename T>
-  void fillTablesMcCollision(const T& mcCollision)
-  {
-    if (fillMcCollBase) {
-      rowMcCollBase(
-        mcCollision.posX(),
-        mcCollision.posY(),
-        mcCollision.posZ(),
-        mcCollision.centFT0M());
-    }
-    if (fillMcCollId) {
-      rowMcCollId(
-        mcCollision.globalIndex());
-    }
-    if (fillMcRCollId) {
-      // Fill the table with the vector of indices of derived reconstructed collisions matched to mcCollision.globalIndex()
-      rowMcRCollId(
-        matchedCollisions[mcCollision.globalIndex()]);
-    }
-  }
-
   template <typename T, typename U>
-  void fillTablesCandidate(const T& candidate, const U& prong0, const U& prong1, const U& prong2, int candFlag, double invMass,
+  void fillTablesCandidate(const T& candidate, const U& prong0, const U& prong1, const U& prong2, int candFlag, float invMass,
                            double ct, double y, int8_t flagMc, int8_t origin, int8_t swapping, const std::vector<float>& mlScores)
   {
-    if (fillCandidateBase) {
-      rowCandidateBase(
-        rowCollBase.lastIndex(),
-        candidate.pt(),
-        candidate.eta(),
-        candidate.phi(),
-        invMass,
-        y);
-    }
+    hfDerivedData.fillCandidateTables(candidate, fillCandidateBase, rowCandidateBase, rowCollBase, invMass, y);
     if (fillCandidatePar) {
       rowCandidatePar(
         candidate.chi2PCA(),
@@ -256,13 +198,6 @@ struct HfDerivedDataCreatorLcToPKPi {
       rowCandidateMl(
         mlScores);
     }
-    if (fillCandidateId) {
-      rowCandidateId(
-        candidate.collisionId(),
-        candidate.prong0Id(),
-        candidate.prong1Id(),
-        candidate.prong2Id());
-    }
     if (fillCandidateMc) {
       rowCandidateMc(
         flagMc,
@@ -271,26 +206,6 @@ struct HfDerivedDataCreatorLcToPKPi {
     }
   }
 
-  template <typename T, typename U>
-  void fillTablesParticle(const T& particle, U mass)
-  {
-    if (fillParticleBase) {
-      rowParticleBase(
-        rowMcCollBase.lastIndex(),
-        particle.pt(),
-        particle.eta(),
-        particle.phi(),
-        RecoDecayPtEtaPhi::y(particle.pt(), particle.eta(), mass),
-        particle.flagMcMatchGen(),
-        particle.originMcGen());
-    }
-    if (fillParticleId) {
-      rowParticleId(
-        particle.mcCollisionId(),
-        particle.globalIndex());
-    }
-  }
-
   template <bool isMl, bool isMc, bool onlyBkg, bool onlySig, typename CollType, typename CandType>
   void processCandidates(CollType const& collisions,
                          Partition<CandType>& candidates,
@@ -323,7 +238,7 @@ struct HfDerivedDataCreatorLcToPKPi {
       }
       LOGF(debug, "Filling rec. collision %d at derived index %d", thisCollId, rowCollBase.lastIndex() + 1);
       // fillTablesCollision(collision, 0, collision.bc().runNumber());
-      fillTablesCollision<isMc>(collision);
+      hfDerivedData.fillCollTables<isMc>(collision, fillCollBase, rowCollBase, fillCollId, rowCollId, fillMcRCollId, matchedCollisions);
 
       // Fill candidate properties
       reserveTable(rowCandidateBase, fillCandidateBase, sizeTableCand);
@@ -418,13 +333,13 @@ struct HfDerivedDataCreatorLcToPKPi {
         continue;
       }
       LOGF(debug, "Filling MC collision %d at derived index %d", thisMcCollId, rowMcCollBase.lastIndex() + 1);
-      fillTablesMcCollision(mcCollision);
+      hfDerivedData.fillCollMcTables(mcCollision, fillMcCollBase, rowMcCollBase, fillMcCollId, rowMcCollId, fillMcRCollId, matchedCollisions, rowMcRCollId);
 
       // Fill MC particle properties
       reserveTable(rowParticleBase, fillParticleBase, sizeTablePart);
       reserveTable(rowParticleId, fillParticleId, sizeTablePart);
       for (const auto& particle : particlesThisMcColl) {
-        fillTablesParticle(particle, o2::constants::physics::MassLambdaCPlus);
+        hfDerivedData.fillParticleTables(particle, fillParticleBase, rowParticleBase, rowMcCollBase, o2::constants::physics::MassLambdaCPlus, fillParticleId, rowParticleId);
       }
     }
   }
diff --git a/PWGJE/Core/JetCandidateUtilities.h b/PWGJE/Core/JetCandidateUtilities.h
index 37e5e53d96b..6c5c0328ef5 100644
--- a/PWGJE/Core/JetCandidateUtilities.h
+++ b/PWGJE/Core/JetCandidateUtilities.h
@@ -373,30 +373,30 @@ float getCandidateInvariantMass(T const& candidate)
 }
 
 template <typename T, typename U, typename V>
-void fillCandidateCollisionTable(T const& collision, U const& candidates, V& CandiateCollisionTable, int32_t& CandidateCollisionTableIndex)
+void fillCandidateCollisionTable(T const& collision, U const& /*candidates*/, V& CandiateCollisionTable, int32_t& CandidateCollisionTableIndex)
 {
   if constexpr (jethfutilities::isHFTable<U>()) {
-    jethfutilities::fillHFCollisionTable(collision, candidates, CandiateCollisionTable, CandidateCollisionTableIndex);
+    jethfutilities::fillHFCollisionTable(collision, CandiateCollisionTable, CandidateCollisionTableIndex);
   } else if constexpr (jetdqutilities::isDielectronTable<U>()) {
     jetdqutilities::fillDielectronCollisionTable(collision, CandiateCollisionTable, CandidateCollisionTableIndex); // if more dilepton tables are added we would need a fillDQCollisionTable
   }
 }
 
 template <typename T, typename U, typename V>
-void fillCandidateMcCollisionTable(T const& mcCollision, U const& candidates, V& CandiateMcCollisionTable, int32_t& CandidateMcCollisionTableIndex)
+void fillCandidateMcCollisionTable(T const& mcCollision, U const& /*candidates*/, V& CandiateMcCollisionTable, int32_t& CandidateMcCollisionTableIndex)
 {
   if constexpr (jethfutilities::isHFMcTable<U>()) {
-    jethfutilities::fillHFMcCollisionTable(mcCollision, candidates, CandiateMcCollisionTable, CandidateMcCollisionTableIndex);
+    jethfutilities::fillHFMcCollisionTable(mcCollision, CandiateMcCollisionTable, CandidateMcCollisionTableIndex);
   } else if constexpr (jetdqutilities::isDielectronMcTable<U>()) {
     jetdqutilities::fillDielectronMcCollisionTable(mcCollision, CandiateMcCollisionTable, CandidateMcCollisionTableIndex);
   }
 }
 
-template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O, typename P>
-void fillCandidateTable(T const& candidate, int32_t collisionIndex, U& BaseTable, V& HFParTable, M& HFParETable, N& HFSelectionFlagTable, O& HFMlTable, P& HFMCDTable, int32_t& candidateTableIndex)
+template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O, typename P, typename Q, typename S>
+void fillCandidateTable(T const& candidate, int32_t collisionIndex, U& BaseTable, V& HFParTable, M& HFParETable, N& HFParDaughterTable, O& HFSelectionFlagTable, P& HFMlTable, Q& HFMlDaughterTable, S& HFMCDTable, int32_t& candidateTableIndex)
 {
   if constexpr (jethfutilities::isHFCandidate<T>()) {
-    jethfutilities::fillHFCandidateTable<isMc>(candidate, collisionIndex, BaseTable, HFParTable, HFParETable, HFSelectionFlagTable, HFMlTable, HFMCDTable, candidateTableIndex);
+    jethfutilities::fillHFCandidateTable<isMc>(candidate, collisionIndex, BaseTable, HFParTable, HFParETable, HFParDaughterTable, HFSelectionFlagTable, HFMlTable, HFMlDaughterTable, HFMCDTable, candidateTableIndex);
   } else if constexpr (jetdqutilities::isDielectronCandidate<T>()) {
     jetdqutilities::fillDielectronCandidateTable(candidate, collisionIndex, BaseTable, candidateTableIndex);
   }
diff --git a/PWGJE/Core/JetDQUtilities.h b/PWGJE/Core/JetDQUtilities.h
index e68a23494f6..91b4c3cdd30 100644
--- a/PWGJE/Core/JetDQUtilities.h
+++ b/PWGJE/Core/JetDQUtilities.h
@@ -188,11 +188,7 @@ auto slicedPerDielectronCollision(T const& table, U const& /*candidates*/, V con
 template <typename T>
 int getDielectronCandidateCollisionId(T const& candidate)
 {
-  if constexpr (isDielectronCandidate<T>()) {
-    return candidate.reducedeventId();
-  } else {
-    return -1;
-  }
+  return candidate.reducedeventId();
 }
 
 /**
@@ -275,11 +271,7 @@ float getDielectronTablePDGMass()
 template <typename T>
 float getDielectronCandidateInvariantMass(T const& candidate)
 {
-  if constexpr (isDielectronCandidate<T>()) {
-    return candidate.mass();
-  } else {
-    return -1.0;
-  }
+  return candidate.mass();
 }
 
 template <typename T, typename U>
diff --git a/PWGJE/Core/JetHFUtilities.h b/PWGJE/Core/JetHFUtilities.h
index d76c8d19121..40d8c5361e7 100644
--- a/PWGJE/Core/JetHFUtilities.h
+++ b/PWGJE/Core/JetHFUtilities.h
@@ -245,7 +245,7 @@ constexpr bool isMatchedHFCandidate(T const& candidate)
       return false;
     }
   } else if constexpr (isBplusCandidate<T>()) {
-    if (std::abs(candidate.flagMcMatchRec()) == 1 << o2::aod::hf_cand_bplus::DecayType::BplusToD0Pi) {
+    if (std::abs(candidate.flagMcMatchRec()) == 1 << o2::aod::hf_cand_bplus::DecayType::BplusToD0Pi) { // check this!!
       return true;
     } else {
       return false;
@@ -263,7 +263,7 @@ constexpr bool isMatchedHFCandidate(T const& candidate)
       return false;
     }
   } else if constexpr (isBplusMcCandidate<T>()) {
-    if (std::abs(candidate.flagMcMatchGen()) == 1 << o2::aod::hf_cand_bplus::DecayType::BplusToD0Pi) {
+    if (std::abs(candidate.flagMcMatchGen()) == 1 << o2::aod::hf_cand_bplus::DecayType::BplusToD0Pi) { // check this!!
       return true;
     } else {
       return false;
@@ -296,7 +296,7 @@ bool isHFDaughterTrack(T& track, U& candidate, V const& /*tracks*/)
       return false;
     }
   } else if constexpr (isBplusCandidate<U>()) {
-    if (candidate.template prong0_as<o2::aod::HfCand2Prong>().template prong0_as<V>().globalIndex() == track.globalIndex() || candidate.template prong0_as<o2::aod::HfCand2Prong>().template prong1_as<V>().globalIndex() == track.globalIndex() || candidate.template prong1_as<V>().globalIndex() == track.globalIndex()) {
+    if (candidate.prong0Id() == track.globalIndex() || candidate.prong1Id() == track.globalIndex() || candidate.prong2Id() == track.globalIndex()) {
       return true;
     } else {
       return false;
@@ -382,15 +382,7 @@ auto slicedPerHFCollision(T const& table, U const& /*candidates*/, V const& coll
 template <typename T>
 int getHFCandidateCollisionId(T const& candidate)
 {
-  if constexpr (isD0Candidate<T>()) {
-    return candidate.hfCollBaseId();
-  } else if constexpr (isLcCandidate<T>()) {
-    return candidate.hfCollBaseId();
-  } else if constexpr (isBplusCandidate<T>()) {
-    return candidate.hfCollBaseId();
-  } else {
-    return -1;
-  }
+  return candidate.hfCollBaseId();
 }
 
 /**
@@ -401,15 +393,7 @@ int getHFCandidateCollisionId(T const& candidate)
 template <typename T>
 int getHFMcCandidateCollisionId(T const& candidate)
 {
-  if constexpr (isD0McCandidate<T>()) {
-    return candidate.hfMcCollBaseId();
-  } else if constexpr (isLcMcCandidate<T>()) {
-    return candidate.hfMcCollBaseId();
-  } else if constexpr (isBplusMcCandidate<T>()) {
-    return candidate.hfMcCollBaseId();
-  } else {
-    return -1;
-  }
+  return candidate.hfMcCollBaseId();
 }
 
 /**
@@ -422,11 +406,9 @@ int getHFCandidatePDG(T const& /*candidate*/)
 {
   if constexpr (isD0Candidate<T>() || isD0McCandidate<T>()) {
     return static_cast<int>(o2::constants::physics::Pdg::kD0);
-  }
-  if constexpr (isLcCandidate<T>() || isLcMcCandidate<T>()) {
+  } else if constexpr (isLcCandidate<T>() || isLcMcCandidate<T>()) {
     return static_cast<int>(o2::constants::physics::Pdg::kLambdaCPlus);
-  }
-  if constexpr (isBplusCandidate<T>() || isBplusMcCandidate<T>()) {
+  } else if constexpr (isBplusCandidate<T>() || isBplusMcCandidate<T>()) {
     return static_cast<int>(o2::constants::physics::Pdg::kBPlus);
   } else {
     return 0;
@@ -441,11 +423,9 @@ int getHFTablePDG()
 {
   if constexpr (isD0Table<T>() || isD0McTable<T>()) {
     return static_cast<int>(o2::constants::physics::Pdg::kD0);
-  }
-  if constexpr (isLcTable<T>() || isLcMcTable<T>()) {
+  } else if constexpr (isLcTable<T>() || isLcMcTable<T>()) {
     return static_cast<int>(o2::constants::physics::Pdg::kLambdaCPlus);
-  }
-  if constexpr (isBplusTable<T>() || isBplusMcTable<T>()) {
+  } else if constexpr (isBplusTable<T>() || isBplusMcTable<T>()) {
     return static_cast<int>(o2::constants::physics::Pdg::kBPlus);
   } else {
     return 0;
@@ -462,11 +442,9 @@ float getHFCandidatePDGMass(T const& /*candidate*/)
 {
   if constexpr (isD0Candidate<T>() || isD0McCandidate<T>()) {
     return static_cast<float>(o2::constants::physics::MassD0);
-  }
-  if constexpr (isLcCandidate<T>() || isLcMcCandidate<T>()) {
+  } else if constexpr (isLcCandidate<T>() || isLcMcCandidate<T>()) {
     return static_cast<float>(o2::constants::physics::MassLambdaCPlus);
-  }
-  if constexpr (isBplusCandidate<T>() || isBplusMcCandidate<T>()) {
+  } else if constexpr (isBplusCandidate<T>() || isBplusMcCandidate<T>()) {
     return static_cast<float>(o2::constants::physics::MassBPlus);
   } else {
     return -1.0;
@@ -482,11 +460,9 @@ float getHFTablePDGMass()
 {
   if constexpr (isD0Table<T>() || isD0McTable<T>()) {
     return static_cast<float>(o2::constants::physics::MassD0);
-  }
-  if constexpr (isLcTable<T>() || isLcMcTable<T>()) {
+  } else if constexpr (isLcTable<T>() || isLcMcTable<T>()) {
     return static_cast<float>(o2::constants::physics::MassLambdaCPlus);
-  }
-  if constexpr (isBplusTable<T>() || isBplusMcTable<T>()) {
+  } else if constexpr (isBplusTable<T>() || isBplusMcTable<T>()) {
     return static_cast<float>(o2::constants::physics::MassBPlus);
   } else {
     return -1.0;
@@ -501,74 +477,26 @@ float getHFTablePDGMass()
 template <typename T>
 float getHFCandidateInvariantMass(T const& candidate)
 {
-  if constexpr (isD0Candidate<T>()) {
-    return candidate.m();
-  }
-  if constexpr (isLcCandidate<T>()) {
-    return candidate.m();
-  }
-  if constexpr (isBplusCandidate<T>()) {
-    return candidate.m();
-  } else {
-    return -1.0;
-  }
+  return candidate.m();
 }
 
 template <typename T, typename U>
-void fillD0CollisionTable(T const& collision, U& D0CollisionTable, int32_t& D0CollisionTableIndex)
+void fillHFCollisionTable(T const& collision, U& HFCollisionTable, int32_t& HFCollisionTableIndex)
 {
-  D0CollisionTable(collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(), collision.centFT0A(), collision.centFT0C(), collision.centFT0M(), collision.centFV0A(), collision.multZeqNTracksPV());
-  D0CollisionTableIndex = D0CollisionTable.lastIndex();
+  HFCollisionTable(collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(), collision.centFT0A(), collision.centFT0C(), collision.centFT0M(), collision.centFV0A(), collision.multZeqNTracksPV());
+  HFCollisionTableIndex = HFCollisionTable.lastIndex();
 }
 
 template <typename T, typename U>
-void fillLcCollisionTable(T const& collision, U& LcCollisionTable, int32_t& LcCollisionTableIndex)
+void fillHFMcCollisionTable(T const& mcCollision, U& HFMcCollisionTable, int32_t& HFMcCollisionTableIndex)
 {
-  LcCollisionTable(collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(), collision.centFT0A(), collision.centFT0C(), collision.centFT0M(), collision.centFV0A(), collision.multZeqNTracksPV());
-  LcCollisionTableIndex = LcCollisionTable.lastIndex();
+  HFMcCollisionTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ());
+  HFMcCollisionTableIndex = HFMcCollisionTable.lastIndex();
 }
 
-template <typename T, typename U, typename V>
-void fillHFCollisionTable(T const& collision, U const& /*candidates*/, V& HFCollisionTable, int32_t& HFCollisionTableIndex)
+template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O>
+void fillD0CandidateTable(T const& candidate, U& D0ParTable, V& D0ParETable, M& D0SelectionFlagTable, N& D0MlTable, O& D0MCDTable)
 {
-  if constexpr (isD0Table<U>()) {
-    fillD0CollisionTable(collision, HFCollisionTable, HFCollisionTableIndex);
-  }
-  if constexpr (isLcTable<U>()) {
-    fillLcCollisionTable(collision, HFCollisionTable, HFCollisionTableIndex);
-  }
-}
-
-template <typename T, typename U>
-void fillD0McCollisionTable(T const& mcCollision, U& D0McCollisionTable, int32_t& D0McCollisionTableIndex)
-{
-  D0McCollisionTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ());
-  D0McCollisionTableIndex = D0McCollisionTable.lastIndex();
-}
-
-template <typename T, typename U>
-void fillLcMcCollisionTable(T const& mcCollision, U& LcMcCollisionTable, int32_t& LcMcCollisionTableIndex)
-{
-  LcMcCollisionTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.centFT0M());
-  LcMcCollisionTableIndex = LcMcCollisionTable.lastIndex();
-}
-
-template <typename T, typename U, typename V>
-void fillHFMcCollisionTable(T const& mcCollision, U const& /*candidates*/, V& HFMcCollisionTable, int32_t& HFMcCollisionTableIndex)
-{
-  if constexpr (isD0McTable<U>()) {
-    fillD0McCollisionTable(mcCollision, HFMcCollisionTable, HFMcCollisionTableIndex);
-  }
-  if constexpr (isLcMcTable<U>()) {
-    fillLcMcCollisionTable(mcCollision, HFMcCollisionTable, HFMcCollisionTableIndex);
-  }
-}
-
-template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O, typename P>
-void fillD0CandidateTable(T const& candidate, int32_t collisionIndex, U& D0BaseTable, V& D0ParTable, M& D0ParETable, N& D0SelectionFlagTable, O& D0MlTable, P& D0MCDTable, int32_t& D0CandidateTableIndex)
-{
-  D0BaseTable(collisionIndex, candidate.pt(), candidate.eta(), candidate.phi(), candidate.m(), candidate.y());
-
   D0ParTable(
     candidate.chi2PCA(),
     candidate.cpa(),
@@ -620,22 +548,20 @@ void fillD0CandidateTable(T const& candidate, int32_t collisionIndex, U& D0BaseT
     candidate.ct());
 
   D0SelectionFlagTable(candidate.candidateSelFlag());
-  if constexpr (isMc) {
-    D0MCDTable(candidate.flagMcMatchRec(), candidate.originMcRec());
-  }
 
   std::vector<float> mlScoresVector;
   auto mlScoresSpan = candidate.mlScores();
   std::copy(mlScoresSpan.begin(), mlScoresSpan.end(), std::back_inserter(mlScoresVector));
   D0MlTable(mlScoresVector);
 
-  D0CandidateTableIndex = D0BaseTable.lastIndex();
+  if constexpr (isMc) {
+    D0MCDTable(candidate.flagMcMatchRec(), candidate.originMcRec());
+  }
 }
 
-template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O, typename P>
-void fillLcCandidateTable(T const& candidate, int32_t collisionIndex, U& LcBaseTable, V& LcParTable, M& LcParETable, N& LcSelectionFlagTable, O& LcMlTable, P& LcMCDTable, int32_t& LcCandidateTableIndex)
+template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O>
+void fillLcCandidateTable(T const& candidate, U& LcParTable, V& LcParETable, M& LcSelectionFlagTable, N& LcMlTable, O& LcMCDTable)
 {
-  LcBaseTable(collisionIndex, candidate.pt(), candidate.eta(), candidate.phi(), candidate.m(), candidate.y());
 
   LcParTable(
     candidate.chi2PCA(),
@@ -696,51 +622,115 @@ void fillLcCandidateTable(T const& candidate, int32_t collisionIndex, U& LcBaseT
     candidate.ct());
 
   LcSelectionFlagTable(candidate.candidateSelFlag());
-  if constexpr (isMc) {
-    LcMCDTable(candidate.flagMcMatchRec(), candidate.originMcRec(), candidate.isCandidateSwapped());
-  }
 
   std::vector<float> mlScoresVector;
   auto mlScoresSpan = candidate.mlScores();
   std::copy(mlScoresSpan.begin(), mlScoresSpan.end(), std::back_inserter(mlScoresVector));
   LcMlTable(mlScoresVector);
 
-  LcCandidateTableIndex = LcBaseTable.lastIndex();
+  if constexpr (isMc) {
+    LcMCDTable(candidate.flagMcMatchRec(), candidate.originMcRec(), candidate.isCandidateSwapped());
+  }
 }
 
+// need to update this
 template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O, typename P>
-void fillHFCandidateTable(T const& candidate, int32_t collisionIndex, U& HFBaseTable, V& HFParTable, M& HFParETable, N& HFSelectionFlagTable, O& HFMlTable, P& HFMCDTable, int32_t& HFCandidateTableIndex)
+void fillBplusCandidateTable(T const& candidate, U& BplusParTable, V& BplusParETable, M& BplusParD0Table, N& BplusMlTable, O& BplusMlD0Table, P& BplusMCDTable)
 {
-  if constexpr (isD0Candidate<T>()) {
-    fillD0CandidateTable<isMc>(candidate, collisionIndex, HFBaseTable, HFParTable, HFParETable, HFSelectionFlagTable, HFMlTable, HFMCDTable, HFCandidateTableIndex);
-  }
-  if constexpr (isLcCandidate<T>()) {
-    fillLcCandidateTable<isMc>(candidate, collisionIndex, HFBaseTable, HFParTable, HFParETable, HFSelectionFlagTable, HFMlTable, HFMCDTable, HFCandidateTableIndex);
+
+  BplusParTable(
+    candidate.chi2PCA(),
+    candidate.cpa(),
+    candidate.cpaXY(),
+    candidate.decayLength(),
+    candidate.decayLengthXY(),
+    candidate.decayLengthNormalised(),
+    candidate.decayLengthXYNormalised(),
+    candidate.ptProng0(),
+    candidate.ptProng1(),
+    candidate.impactParameter0(),
+    candidate.impactParameter1(),
+    candidate.impactParameterNormalised0(),
+    candidate.impactParameterNormalised1(),
+    candidate.nSigTpcPiExpPi(),
+    candidate.nSigTofPiExpPi(),
+    candidate.nSigTpcTofPiExpPi(),
+    candidate.nSigTpcKaExpPi(),
+    candidate.nSigTofKaExpPi(),
+    candidate.nSigTpcTofKaExpPi(),
+    candidate.maxNormalisedDeltaIP(),
+    candidate.impactParameterProduct());
+
+  BplusParETable(
+    candidate.xSecondaryVertex(),
+    candidate.ySecondaryVertex(),
+    candidate.zSecondaryVertex(),
+    candidate.errorDecayLength(),
+    candidate.errorDecayLengthXY(),
+    candidate.rSecondaryVertex(),
+    candidate.pProng1(),
+    candidate.pxProng1(),
+    candidate.pyProng1(),
+    candidate.pzProng1(),
+    candidate.errorImpactParameter1(),
+    candidate.cosThetaStar(),
+    candidate.ct());
+
+  BplusParD0Table(
+    candidate.cpaCharm(),
+    candidate.decayLengthCharm(),
+    candidate.impactParameter0Charm(),
+    candidate.impactParameter1Charm(),
+    candidate.impactParameterProductCharm(),
+    candidate.nSigTpcPiExpPiCharm(),
+    candidate.nSigTofPiExpPiCharm(),
+    candidate.nSigTpcTofPiExpPiCharm(),
+    candidate.nSigTpcKaExpPiCharm(),
+    candidate.nSigTofKaExpPiCharm(),
+    candidate.nSigTpcTofKaExpPiCharm(),
+    candidate.nSigTpcPiExpKaCharm(),
+    candidate.nSigTofPiExpKaCharm(),
+    candidate.nSigTpcTofPiExpKaCharm(),
+    candidate.nSigTpcKaExpKaCharm(),
+    candidate.nSigTofKaExpKaCharm(),
+    candidate.nSigTpcTofKaExpKaCharm());
+
+  // BplusSelectionFlagTable(candidate.candidateSelFlag());
+
+  BplusMlTable(candidate.mlScoreSig());
+
+  std::vector<float> mlScoresCharmVector;
+  auto mlScoresCharmSpan = candidate.mlScoresCharm();
+  std::copy(mlScoresCharmSpan.begin(), mlScoresCharmSpan.end(), std::back_inserter(mlScoresCharmVector));
+  BplusMlD0Table(mlScoresCharmVector);
+
+  if constexpr (isMc) {
+    BplusMCDTable(candidate.flagMcMatchRec(), candidate.originMcRec());
   }
 }
 
-template <typename T, typename U>
-void fillD0CandidateMcTable(T const& candidate, int32_t mcCollisionIndex, U& D0PBaseTable, int32_t& D0CandidateTableIndex)
-{
-  D0PBaseTable(mcCollisionIndex, candidate.pt(), candidate.eta(), candidate.phi(), candidate.y(), candidate.flagMcMatchGen(), candidate.originMcGen());
-  D0CandidateTableIndex = D0PBaseTable.lastIndex();
-}
-template <typename T, typename U>
-void fillLcCandidateMcTable(T const& candidate, int32_t mcCollisionIndex, U& LcPBaseTable, int32_t& LcCandidateTableIndex)
+template <bool isMc, typename T, typename U, typename V, typename M, typename N, typename O, typename P, typename Q, typename S>
+void fillHFCandidateTable(T const& candidate, int32_t collisionIndex, U& HFBaseTable, V& HFParTable, M& HFParETable, N& HFParDaughterTable, O& HFSelectionFlagTable, P& HFMlTable, Q& HFMlDaughterTable, S& HFMCDTable, int32_t& HFCandidateTableIndex)
 {
-  LcPBaseTable(mcCollisionIndex, candidate.pt(), candidate.eta(), candidate.phi(), candidate.y(), candidate.flagMcMatchGen(), candidate.originMcGen());
-  LcCandidateTableIndex = LcPBaseTable.lastIndex();
+  HFBaseTable(collisionIndex, candidate.pt(), candidate.eta(), candidate.phi(), candidate.m(), candidate.y());
+  HFCandidateTableIndex = HFBaseTable.lastIndex();
+
+  if constexpr (isD0Candidate<T>()) {
+    fillD0CandidateTable<isMc>(candidate, HFParTable, HFParETable, HFSelectionFlagTable, HFMlTable, HFMCDTable);
+  }
+  if constexpr (isLcCandidate<T>()) {
+    fillLcCandidateTable<isMc>(candidate, HFParTable, HFParETable, HFSelectionFlagTable, HFMlTable, HFMCDTable);
+  }
+  if constexpr (isBplusCandidate<T>()) {
+    fillBplusCandidateTable<isMc>(candidate, HFParTable, HFParETable, HFParDaughterTable, HFMlTable, HFMlDaughterTable, HFMCDTable);
+  }
 }
 
 template <typename T, typename U>
 void fillHFCandidateMcTable(T const& candidate, int32_t mcCollisionIndex, U& BaseMcTable, int32_t& candidateTableIndex)
 {
-  if constexpr (isD0McCandidate<T>()) {
-    fillD0CandidateMcTable(candidate, mcCollisionIndex, BaseMcTable, candidateTableIndex);
-  }
-  if constexpr (isLcMcCandidate<T>()) {
-    fillLcCandidateMcTable(candidate, mcCollisionIndex, BaseMcTable, candidateTableIndex);
-  }
+  BaseMcTable(mcCollisionIndex, candidate.pt(), candidate.eta(), candidate.phi(), candidate.y(), candidate.flagMcMatchGen(), candidate.originMcGen());
+  candidateTableIndex = BaseMcTable.lastIndex();
 }
 
 }; // namespace jethfutilities
diff --git a/PWGJE/DataModel/Jet.h b/PWGJE/DataModel/Jet.h
index 0ba6ff484d4..61b94aa04b5 100644
--- a/PWGJE/DataModel/Jet.h
+++ b/PWGJE/DataModel/Jet.h
@@ -179,8 +179,8 @@ DECLARE_JET_TABLES_LEVELS(Charged, JTrackSub, HfD0Bases, HfD0PBases, "C");
 DECLARE_JET_TABLES_LEVELS(Full, JTrackSub, HfD0Bases, HfD0PBases, "F");
 DECLARE_JET_TABLES_LEVELS(Neutral, JTrackSub, HfD0Bases, HfD0PBases, "N");
 DECLARE_JET_TABLES_LEVELS(D0Charged, JTrackD0Sub, HfD0Bases, HfD0PBases, "D0");
-DECLARE_JET_TABLES_LEVELS(LcCharged, JTrackLcSub, Hf3PBases, Hf3PPBases, "Lc");
-DECLARE_JET_TABLES_LEVELS(BplusCharged, JTrackBplusSub, HfCandBplus, HfD0PBases, "BPl");
+DECLARE_JET_TABLES_LEVELS(LcCharged, JTrackLcSub, HfLcBases, HfLcPBases, "Lc");
+DECLARE_JET_TABLES_LEVELS(BplusCharged, JTrackBplusSub, HfBplusBases, HfBplusPBases, "BP");
 DECLARE_JET_TABLES_LEVELS(V0Charged, JTrackSub, V0Cores, JV0Mcs, "V0");
 DECLARE_JET_TABLES_LEVELS(DielectronCharged, JTrackSub, Dielectrons, JDielectronMcs, "DIEL");
 
@@ -219,19 +219,21 @@ using JetParticlesSubD0 = JMcParticleD0Subs;
 using McCollisionsD0 = o2::soa::Join<HfD0McCollBases, JD0McCollisionIds>;
 using CandidatesD0MCP = o2::soa::Join<HfD0PBases, JD0PIds>;
 
-using CollisionsLc = o2::soa::Join<Hf3PCollBases, JLcCollisionIds>;
-using CandidatesLcData = o2::soa::Join<Hf3PBases, Hf3PPars, Hf3PParEs, Hf3PSels, Hf3PMls, JLcIds>;
-using CandidatesLcMCD = o2::soa::Join<Hf3PBases, Hf3PPars, Hf3PParEs, Hf3PSels, Hf3PMls, Hf3PMcs, JLcIds>;
+using CollisionsLc = o2::soa::Join<HfLcCollBases, JLcCollisionIds>;
+using CandidatesLcData = o2::soa::Join<HfLcBases, HfLcPars, HfLcParEs, HfLcSels, HfLcMls, JLcIds>;
+using CandidatesLcMCD = o2::soa::Join<HfLcBases, HfLcPars, HfLcParEs, HfLcSels, HfLcMls, HfLcMcs, JLcIds>;
 using JetTracksSubLc = JTrackLcSubs;
 using JetParticlesSubLc = JMcParticleLcSubs;
-using McCollisionsLc = o2::soa::Join<Hf3PMcCollBases, JLcMcCollisionIds>;
-using CandidatesLcMCP = o2::soa::Join<Hf3PPBases, JLcPIds>;
+using McCollisionsLc = o2::soa::Join<HfLcMcCollBases, JLcMcCollisionIds>;
+using CandidatesLcMCP = o2::soa::Join<HfLcPBases, JLcPIds>;
 
-using CandidatesBplusData = o2::soa::Join<HfCandBplus, HfSelBplusToD0Pi>;
-using CandidatesBplusMCD = o2::soa::Join<HfCandBplus, HfSelBplusToD0Pi, HfCandBplusMcRec>;
+using CollisionsBplus = o2::soa::Join<HfBplusCollBases, JBplusCollisionIds>; // fix this!!
+using CandidatesBplusData = o2::soa::Join<HfBplusBases, HfBplusPars, HfBplusParEs, HfBplusParD0s, HfBplusMls, HfBplusMlD0s, JBplusIds>;
+using CandidatesBplusMCD = o2::soa::Join<HfBplusBases, HfBplusPars, HfBplusParEs, HfBplusParD0s, HfBplusMls, HfBplusMlD0s, HfBplusMcs, JBplusIds>;
 using JetTracksSubBplus = JTrackBplusSubs;
 using JetParticlesSubBplus = JMcParticleBplusSubs;
-using CandidatesBplusMCP = o2::soa::Join<JMcParticles, HfCandBplusMcGen>;
+using McCollisionsBplus = o2::soa::Join<HfBplusMcCollBases, JBplusMcCollisionIds>;
+using CandidatesBplusMCP = o2::soa::Join<HfBplusPBases, JBplusPIds>;
 
 using CandidatesV0Data = o2::soa::Join<V0Cores, JV0Ids>;
 using CandidatesV0MCD = o2::soa::Join<V0Cores, V0MCCores, JV0Ids>;
diff --git a/PWGJE/DataModel/JetReducedDataDQ.h b/PWGJE/DataModel/JetReducedDataDQ.h
index 8641b3d612e..a5779ebd3b4 100644
--- a/PWGJE/DataModel/JetReducedDataDQ.h
+++ b/PWGJE/DataModel/JetReducedDataDQ.h
@@ -115,35 +115,37 @@ DECLARE_SOA_COLUMN(DummyDQ, dummyDQ, bool);
 
 } // namespace jdummydq
 DECLARE_SOA_TABLE(JDielectron1Dummys, "AOD", "JDIEL1DUMMY",
-                  o2::soa::Index<>,
                   jdummydq::DummyDQ,
                   o2::soa::Marker<1>);
 
 DECLARE_SOA_TABLE(JDielectron2Dummys, "AOD", "JDIEL2DUMMY",
-                  o2::soa::Index<>,
                   jdummydq::DummyDQ,
                   o2::soa::Marker<2>);
 
 DECLARE_SOA_TABLE(JDielectron3Dummys, "AOD", "JDIEL3DUMMY",
-                  o2::soa::Index<>,
                   jdummydq::DummyDQ,
                   o2::soa::Marker<3>);
 
 DECLARE_SOA_TABLE(JDielectron4Dummys, "AOD", "JDIEL4DUMMY",
-                  o2::soa::Index<>,
                   jdummydq::DummyDQ,
                   o2::soa::Marker<4>);
 
 DECLARE_SOA_TABLE(JDielectron5Dummys, "AOD", "JDIEL5DUMMY",
-                  o2::soa::Index<>,
                   jdummydq::DummyDQ,
                   o2::soa::Marker<5>);
 
 DECLARE_SOA_TABLE(JDielectron6Dummys, "AOD", "JDIEL6DUMMY",
-                  o2::soa::Index<>,
                   jdummydq::DummyDQ,
                   o2::soa::Marker<6>);
 
+DECLARE_SOA_TABLE(JDielectron7Dummys, "AOD", "JDIEL7DUMMY",
+                  jdummydq::DummyDQ,
+                  o2::soa::Marker<7>);
+
+DECLARE_SOA_TABLE(JDielectron8Dummys, "AOD", "JDIEL8DUMMY",
+                  jdummydq::DummyDQ,
+                  o2::soa::Marker<8>);
+
 } // namespace o2::aod
 
 #endif // PWGJE_DATAMODEL_JETREDUCEDDATADQ_H_
diff --git a/PWGJE/DataModel/JetReducedDataHF.h b/PWGJE/DataModel/JetReducedDataHF.h
index 1c196c173d9..c00a89e029e 100644
--- a/PWGJE/DataModel/JetReducedDataHF.h
+++ b/PWGJE/DataModel/JetReducedDataHF.h
@@ -50,6 +50,19 @@ DECLARE_SOA_TABLE_STAGED(JD0PIds, "JD0PID",
                          jd0indices::JMcCollisionId,
                          jd0indices::JMcParticleId);
 
+namespace jdummyd0
+{
+DECLARE_SOA_COLUMN(DummyD0, dummyD0, bool);
+} // namespace jdummyd0
+
+DECLARE_SOA_TABLE(JDumD0ParDaus, "AOD", "JDUMD0PARDAU",
+                  jdummyd0::DummyD0,
+                  o2::soa::Marker<1>);
+
+DECLARE_SOA_TABLE(JDumD0MlDaus, "AOD", "JDumD0MLDAU",
+                  jdummyd0::DummyD0,
+                  o2::soa::Marker<2>);
+
 namespace jlcindices
 {
 DECLARE_SOA_INDEX_COLUMN(JCollision, collision);
@@ -76,6 +89,56 @@ DECLARE_SOA_TABLE_STAGED(JLcPIds, "JLCPID",
                          jlcindices::JMcCollisionId,
                          jlcindices::JMcParticleId);
 
+namespace jdummylc
+{
+
+DECLARE_SOA_COLUMN(DummyLc, dummyLc, bool);
+
+} // namespace jdummylc
+DECLARE_SOA_TABLE(JDumLcParDaus, "AOD", "JDUMLCPARDAU",
+                  jdummylc::DummyLc,
+                  o2::soa::Marker<1>);
+
+DECLARE_SOA_TABLE(JDumLcMlDaus, "AOD", "JDUMLCMLDAU",
+                  jdummylc::DummyLc,
+                  o2::soa::Marker<2>);
+
+namespace jbplusindices
+{
+DECLARE_SOA_INDEX_COLUMN(JCollision, collision);
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, JTracks, "_0");
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, JTracks, "_1");
+DECLARE_SOA_INDEX_COLUMN_FULL(Prong2, prong2, int, JTracks, "_2");
+DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
+DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
+} // namespace jbplusindices
+
+DECLARE_SOA_TABLE_STAGED(JBplusCollisionIds, "JBPCOLLID",
+                         jbplusindices::JCollisionId);
+
+DECLARE_SOA_TABLE_STAGED(JBplusMcCollisionIds, "JBPMCCOLLID",
+                         jbplusindices::JMcCollisionId);
+
+DECLARE_SOA_TABLE_STAGED(JBplusIds, "JBPID",
+                         jbplusindices::JCollisionId,
+                         jbplusindices::Prong0Id,
+                         jbplusindices::Prong1Id,
+                         jbplusindices::Prong2Id);
+
+DECLARE_SOA_TABLE_STAGED(JBplusPIds, "JBPPID",
+                         jbplusindices::JMcCollisionId,
+                         jbplusindices::JMcParticleId);
+
+namespace jdummybplus
+{
+
+DECLARE_SOA_COLUMN(DummyBplus, dummyBplus, bool);
+
+} // namespace jdummybplus
+DECLARE_SOA_TABLE(JDumBplusSels, "AOD", "JDUMBPUSSEL",
+                  jdummybplus::DummyBplus,
+                  o2::soa::Marker<1>);
+
 } // namespace o2::aod
 
 #endif // PWGJE_DATAMODEL_JETREDUCEDDATAHF_H_
diff --git a/PWGJE/DataModel/JetSubstructure.h b/PWGJE/DataModel/JetSubstructure.h
index 2e5d03f46d0..9b606b8dcfd 100644
--- a/PWGJE/DataModel/JetSubstructure.h
+++ b/PWGJE/DataModel/JetSubstructure.h
@@ -122,8 +122,8 @@ DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!
 
 JETSUBSTRUCTURE_TABLES_DEF(C, "C", CJetCOs, "CJETCO", CEWSJetCOs, "CEWSJETCO", CMCDJetCOs, "CMCDJETCO", CMCPJetCOs, "CMCPJETCO");
 JETSUBSTRUCTURE_TABLES_DEF(D0C, "D0C", HfD0Bases, "HFD0BASE", HfD0Bases, "HFD0BASE", HfD0Bases, "HFD0BASE", HfD0PBases, "HFD0PBASE");
-JETSUBSTRUCTURE_TABLES_DEF(LcC, "LCC", Hf3PBases, "HF3PBASE", Hf3PBases, "HF3PBASE", Hf3PBases, "HF3PBASE", Hf3PPBases, "HF3PPBASE");
-JETSUBSTRUCTURE_TABLES_DEF(BplusC, "BPLUSC", HfD0Bases, "HFD0BASE", HfD0Bases, "HFD0BASE", HfD0Bases, "HFD0BASE", HfD0PBases, "HFD0PBASE");
+JETSUBSTRUCTURE_TABLES_DEF(LcC, "LCC", HfLcBases, "HFLcBASE", HfLcBases, "HFLcBASE", HfLcBases, "HFLcBASE", HfLcPBases, "HFLcPBASE");
+JETSUBSTRUCTURE_TABLES_DEF(BplusC, "BPC", HfBplusBases, "HFBPBASE", HfBplusBases, "HFBPBASE", HfBplusBases, "HFBPBASE", HfBplusPBases, "HFBPPBASE");
 JETSUBSTRUCTURE_TABLES_DEF(DielectronC, "DIELC", Dielectrons, "RTDIELECTRON", Dielectrons, "RTDIELECTRON", Dielectrons, "RTDIELECTRON", JDielectronMcs, "JDIELMC");
 
 } // namespace o2::aod
diff --git a/PWGJE/DataModel/JetSubtraction.h b/PWGJE/DataModel/JetSubtraction.h
index 1992283865c..3adadad0362 100644
--- a/PWGJE/DataModel/JetSubtraction.h
+++ b/PWGJE/DataModel/JetSubtraction.h
@@ -54,22 +54,22 @@ DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfD0PBases, "_0");
 
 namespace bkglc
 {
-DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, Hf3PBases, "_0");
+DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfLcBases, "_0");
 } // namespace bkglc
 
 namespace bkglcmc
 {
-DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, Hf3PPBases, "_0");
+DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfLcPBases, "_0");
 } // namespace bkglcmc
 
 namespace bkgbplus
 {
-DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfCandBplus, "_0");
+DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfBplusBases, "_0");
 } // namespace bkgbplus
 
 namespace bkgbplusmc
 {
-DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfCandBplusMcGen, "_0"); // change this!!
+DECLARE_SOA_INDEX_COLUMN_FULL(Candidate, candidate, int, HfCandBplusMcGen, "_0"); // fix this!!
 } // namespace bkgbplusmc
 
 namespace bkgdielectron
@@ -117,13 +117,13 @@ DECLARE_SOA_TABLE(BkgLcMcRhos, "AOD", "BkgLcMcRho",
                   bkgrho::RhoM,
                   o2::soa::Marker<5>);
 
-DECLARE_SOA_TABLE(BkgBplusRhos, "AOD", "BkgBPlRho",
+DECLARE_SOA_TABLE(BkgBplusRhos, "AOD", "BkgRho",
                   o2::soa::Index<>,
                   bkgrho::Rho,
                   bkgrho::RhoM,
                   o2::soa::Marker<6>);
 
-DECLARE_SOA_TABLE(BkgBplusMcRhos, "AOD", "BkgBPlMcRho",
+DECLARE_SOA_TABLE(BkgBplusMcRhos, "AOD", "BkgBPMcRho",
                   o2::soa::Index<>,
                   bkgrho::Rho,
                   bkgrho::RhoM,
@@ -246,7 +246,7 @@ DECLARE_SOA_TABLE(JMcParticleLcSubs, "AOD", "JMcPartLcSubs",
 
 using JMcParticleLcSub = JMcParticleLcSubs::iterator;
 
-DECLARE_SOA_TABLE(JTrackBplusSubs, "AOD", "JTrackBPlSubs",
+DECLARE_SOA_TABLE(JTrackBplusSubs, "AOD", "JTrackBPSubs",
                   o2::soa::Index<>,
                   bkgbplus::CandidateId,
                   jtrack::Pt,
@@ -261,7 +261,7 @@ DECLARE_SOA_TABLE(JTrackBplusSubs, "AOD", "JTrackBPlSubs",
 
 using JTrackBplusSub = JTrackBplusSubs::iterator;
 
-DECLARE_SOA_TABLE(JMcParticleBplusSubs, "AOD", "JMcPartBPlSubs",
+DECLARE_SOA_TABLE(JMcParticleBplusSubs, "AOD", "JMcPartBPSubs",
                   o2::soa::Index<>,
                   bkgbplusmc::CandidateId,
                   jmcparticle::Pt,
diff --git a/PWGJE/JetFinders/CMakeLists.txt b/PWGJE/JetFinders/CMakeLists.txt
index 9be82d6180b..ba4dbb132fc 100644
--- a/PWGJE/JetFinders/CMakeLists.txt
+++ b/PWGJE/JetFinders/CMakeLists.txt
@@ -89,6 +89,21 @@ o2physics_add_dpl_workflow(jet-finder-lc-mcp-charged
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(jet-finder-bplus-data-charged
+                    SOURCES jetFinderBplusDataCharged.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
+                    COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(jet-finder-bplus-mcd-charged
+                    SOURCES jetFinderBplusMCDCharged.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
+                    COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(jet-finder-bplus-mcp-charged
+                    SOURCES jetFinderBplusMCPCharged.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(jet-finder-v0-data-charged
                     SOURCES jetFinderV0DataCharged.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
diff --git a/PWGJE/JetFinders/jetFinderBplusDataCharged.cxx b/PWGJE/JetFinders/jetFinderBplusDataCharged.cxx
new file mode 100644
index 00000000000..402527211fb
--- /dev/null
+++ b/PWGJE/JetFinders/jetFinderBplusDataCharged.cxx
@@ -0,0 +1,29 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet finder B+ data charged task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/JetFinders/jetFinderHF.cxx"
+
+using JetFinderBplusDataCharged = JetFinderHFTask<aod::CandidatesBplusData, aod::CandidatesBplusMCD, aod::CandidatesBplusMCP, aod::JetTracksSubBplus, aod::JetParticlesSubBplus, aod::BplusChargedJets, aod::BplusChargedJetConstituents, aod::BplusChargedEventWiseSubtractedJets, aod::BplusChargedEventWiseSubtractedJetConstituents>;
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+
+  tasks.emplace_back(adaptAnalysisTask<JetFinderBplusDataCharged>(cfgc,
+                                                                  SetDefaultProcesses{{{"processChargedJetsData", true}}},
+                                                                  TaskName{"jet-finder-bplus-data-charged"}));
+
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/JetFinders/jetFinderBplusMCDCharged.cxx b/PWGJE/JetFinders/jetFinderBplusMCDCharged.cxx
new file mode 100644
index 00000000000..4eed52e30b3
--- /dev/null
+++ b/PWGJE/JetFinders/jetFinderBplusMCDCharged.cxx
@@ -0,0 +1,29 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet finder B+ mcd charged task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/JetFinders/jetFinderHF.cxx"
+
+using JetFinderBplusMCDetectorLevelCharged = JetFinderHFTask<aod::CandidatesBplusData, aod::CandidatesBplusMCD, aod::CandidatesBplusMCP, aod::JetTracksSubBplus, aod::JetParticlesSubBplus, aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents, aod::BplusChargedMCDetectorLevelEventWiseSubtractedJets, aod::BplusChargedMCDetectorLevelEventWiseSubtractedJetConstituents>;
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+
+  tasks.emplace_back(adaptAnalysisTask<JetFinderBplusMCDetectorLevelCharged>(cfgc,
+                                                                             SetDefaultProcesses{{{"processChargedJetsMCD", true}}},
+                                                                             TaskName{"jet-finder-bplus-mcd-charged"}));
+
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/JetFinders/jetFinderBplusMCPCharged.cxx b/PWGJE/JetFinders/jetFinderBplusMCPCharged.cxx
new file mode 100644
index 00000000000..83a1e7c9d60
--- /dev/null
+++ b/PWGJE/JetFinders/jetFinderBplusMCPCharged.cxx
@@ -0,0 +1,29 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet finder B+ mcp charged task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/JetFinders/jetFinderHF.cxx"
+
+using JetFinderBplusMCParticleLevelCharged = JetFinderHFTask<aod::CandidatesBplusData, aod::CandidatesBplusMCD, aod::CandidatesBplusMCP, aod::JetTracksSubBplus, aod::JetParticlesSubBplus, aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents, aod::BplusChargedMCParticleLevelEventWiseSubtractedJets, aod::BplusChargedMCParticleLevelEventWiseSubtractedJetConstituents>;
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+
+  tasks.emplace_back(adaptAnalysisTask<JetFinderBplusMCParticleLevelCharged>(cfgc,
+                                                                             SetDefaultProcesses{{{"processChargedJetsMCP", true}}},
+                                                                             TaskName{"jet-finder-bplus-mcp-charged"}));
+
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/JetFinders/jetFinderHF.cxx b/PWGJE/JetFinders/jetFinderHF.cxx
index 3117ac42f29..53b6114cbe7 100644
--- a/PWGJE/JetFinders/jetFinderHF.cxx
+++ b/PWGJE/JetFinders/jetFinderHF.cxx
@@ -26,22 +26,6 @@ using namespace o2::analysis;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-/*
-void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
-{
-  std::vector<ConfigParamSpec> hfjetworkflows{{"d0-data-charged", VariantType::Int, 1, {"D0 jets charged data"}},
-                                       {"d0-mcd-charged", VariantType::Int, 0, {"D0 jets charged MCD"}},
-                                       {"d0-mcp-charged", VariantType::Int, 0, {"D0 jets charged MCD"}},
-                                       {"bplus-data-charged", VariantType::Int, 0, {"B+ jets charged MCD"}},
-                                       {"bplus-mcd-charged", VariantType::Int, 0, {"B+ jets charged MCD"}},
-                                       {"bplus-mcp-charged", VariantType::Int, 0, {"B+ jets charged MCD"}},
-                                       {"lc-data-charged", VariantType::Int, 0, {"Lc jets charged MCD"}},
-                                       {"lc-mcd-charged", VariantType::Int, 0, {"Lc jets charged MCD"}},
-                                       {"lc-mcp-charged", VariantType::Int, 0, {"Lc jets charged MCD"}}};
-  std::swap(workflowOptions, hfjetworkflows);
-}
-*/
-
 // NB: runDataProcessing.h must be included after customize!
 #include "Framework/runDataProcessing.h"
 
diff --git a/PWGJE/TableProducer/CMakeLists.txt b/PWGJE/TableProducer/CMakeLists.txt
index 8efe1878755..4e8141566f3 100644
--- a/PWGJE/TableProducer/CMakeLists.txt
+++ b/PWGJE/TableProducer/CMakeLists.txt
@@ -38,6 +38,11 @@ o2physics_add_dpl_workflow(jet-deriveddata-producer-dummy-lc
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(jet-deriveddata-producer-dummy-bplus
+                    SOURCES derivedDataProducerDummyBplus.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(jet-deriveddata-producer-dummy-dielectron
                     SOURCES derivedDataProducerDummyDielectron.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
diff --git a/PWGJE/TableProducer/Matching/CMakeLists.txt b/PWGJE/TableProducer/Matching/CMakeLists.txt
index 5cb655eae3a..a3848f352e7 100644
--- a/PWGJE/TableProducer/Matching/CMakeLists.txt
+++ b/PWGJE/TableProducer/Matching/CMakeLists.txt
@@ -38,6 +38,11 @@ o2physics_add_dpl_workflow(jet-matching-mc-lc-ch
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(jet-matching-mc-bplus-ch
+                    SOURCES jetMatchingMCBplusCharged.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(jet-matching-mc-dielectron-ch
                     SOURCES jetMatchingMCDielectronCharged.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
@@ -63,6 +68,11 @@ o2physics_add_dpl_workflow(jet-matching-mc-sub-lc-ch
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(jet-matching-mc-sub-bplus-ch
+                    SOURCES jetMatchingMCSubBplusCharged.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(jet-matching-mc-sub-dielectron-ch
                     SOURCES jetMatchingMCSubDielectronCharged.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
@@ -83,6 +93,11 @@ o2physics_add_dpl_workflow(jet-matching-sub-lc-ch
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(jet-matching-sub-bplus-ch
+                    SOURCES jetMatchingSubBplusCharged.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(jet-matching-sub-dielectron-ch
                     SOURCES jetMatchingSubDielectronCharged.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
diff --git a/PWGJE/TableProducer/Matching/jetMatchingMC.cxx b/PWGJE/TableProducer/Matching/jetMatchingMC.cxx
index 39688616eba..ef56702af09 100644
--- a/PWGJE/TableProducer/Matching/jetMatchingMC.cxx
+++ b/PWGJE/TableProducer/Matching/jetMatchingMC.cxx
@@ -102,11 +102,3 @@ struct JetMatchingMc {
   }
   PROCESS_SWITCH(JetMatchingMc, processJets, "Perform jet matching", true);
 };
-
-/*using BplusChargedJetMatching = JetMatchingMc<soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>,
-                                              soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>,
-                                              aod::BplusChargedMCDetectorLevelJetsMatchedToBplusChargedMCParticleLevelJets,
-                                              aod::BplusChargedMCParticleLevelJetsMatchedToBplusChargedMCDetectorLevelJets,
-                                              aod::CandidatesBplusMCD,
-                                              aod::CandidatesBplusMCP,
-                                              aod::JDummys>>;*/
diff --git a/PWGJE/TableProducer/Matching/jetMatchingMCBplusCharged.cxx b/PWGJE/TableProducer/Matching/jetMatchingMCBplusCharged.cxx
new file mode 100644
index 00000000000..8a5705f273f
--- /dev/null
+++ b/PWGJE/TableProducer/Matching/jetMatchingMCBplusCharged.cxx
@@ -0,0 +1,31 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet matching mc B+ charged task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/TableProducer/Matching/jetMatchingMC.cxx"
+
+using BplusChargedJetMatchingMC = JetMatchingMc<soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>,
+                                                soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>,
+                                                aod::BplusChargedMCDetectorLevelJetsMatchedToBplusChargedMCParticleLevelJets,
+                                                aod::BplusChargedMCParticleLevelJetsMatchedToBplusChargedMCDetectorLevelJets,
+                                                aod::CandidatesBplusMCD,
+                                                aod::CandidatesBplusMCP,
+                                                aod::JDummys>;
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+  tasks.emplace_back(adaptAnalysisTask<BplusChargedJetMatchingMC>(cfgc, TaskName{"jet-matching-mc-bplus-ch"}));
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/TableProducer/Matching/jetMatchingMCSub.cxx b/PWGJE/TableProducer/Matching/jetMatchingMCSub.cxx
index 26dc0a63b53..9db070ec7b6 100644
--- a/PWGJE/TableProducer/Matching/jetMatchingMCSub.cxx
+++ b/PWGJE/TableProducer/Matching/jetMatchingMCSub.cxx
@@ -90,9 +90,3 @@ struct JetMatchingMcSub {
   }
   PROCESS_SWITCH(JetMatchingMcSub, processJets, "Perform jet matching", true);
 };
-
-/*using BplusChargedJetMatching = JetMatchingMcSub<soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>,
-                                                 soa::Join<aod::BplusChargedMCDetectorLevelEventWiseSubtractedJets, aod::BplusChargedMCDetectorLevelEventWiseSubtractedJetConstituents>,
-                                                 aod::BplusChargedMCDetectorLevelJetsMatchedToBplusChargedMCDetectorLevelEventWiseSubtractedJets,
-                                                 aod::BplusChargedMCDetectorLevelEventWiseSubtractedJetsMatchedToBplusChargedMCDetectorLevelJets,
-                                                 aod::CandidatesBplusMCD>;*/
diff --git a/PWGJE/TableProducer/Matching/jetMatchingMCSubBplusCharged.cxx b/PWGJE/TableProducer/Matching/jetMatchingMCSubBplusCharged.cxx
new file mode 100644
index 00000000000..86db7221aa6
--- /dev/null
+++ b/PWGJE/TableProducer/Matching/jetMatchingMCSubBplusCharged.cxx
@@ -0,0 +1,29 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet matching mc subtracted B+ charged task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/TableProducer/Matching/jetMatchingMCSub.cxx"
+
+using D0ChargedJetMatchingMCSub = JetMatchingMcSub<soa::Join<aod::D0ChargedMCDetectorLevelJets, aod::D0ChargedMCDetectorLevelJetConstituents>,
+                                                   soa::Join<aod::D0ChargedMCDetectorLevelEventWiseSubtractedJets, aod::D0ChargedMCDetectorLevelEventWiseSubtractedJetConstituents>,
+                                                   aod::D0ChargedMCDetectorLevelJetsMatchedToD0ChargedMCDetectorLevelEventWiseSubtractedJets,
+                                                   aod::D0ChargedMCDetectorLevelEventWiseSubtractedJetsMatchedToD0ChargedMCDetectorLevelJets,
+                                                   aod::CandidatesD0MCD>;
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+  tasks.emplace_back(adaptAnalysisTask<D0ChargedJetMatchingMCSub>(cfgc, TaskName{"jet-matching-mc-sub-d0-ch"}));
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/TableProducer/Matching/jetMatchingSub.cxx b/PWGJE/TableProducer/Matching/jetMatchingSub.cxx
index 7c31ba437d7..36e809b5129 100644
--- a/PWGJE/TableProducer/Matching/jetMatchingSub.cxx
+++ b/PWGJE/TableProducer/Matching/jetMatchingSub.cxx
@@ -88,10 +88,3 @@ struct JetMatchingSub {
   }
   PROCESS_SWITCH(JetMatchingSub, processJets, "Perform jet matching", true);
 };
-
-/*using BplusChargedJetMatching = JetMatchingSub<soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents>,
-                                               soa::Join<aod::BplusChargedEventWiseSubtractedJets, aod::BplusChargedEventWiseSubtractedJetConstituents>,
-                                               aod::BplusChargedJetsMatchedToBplusChargedEventWiseSubtractedJets,
-                                               aod::BplusChargedEventWiseSubtractedJetsMatchedToBplusChargedJets,
-                                               aod::JTrackBplusSubs,
-                                               aod::CandidatesBplusData>;*/
diff --git a/PWGJE/TableProducer/Matching/jetMatchingSubBplusCharged.cxx b/PWGJE/TableProducer/Matching/jetMatchingSubBplusCharged.cxx
new file mode 100644
index 00000000000..a24b7c6de6f
--- /dev/null
+++ b/PWGJE/TableProducer/Matching/jetMatchingSubBplusCharged.cxx
@@ -0,0 +1,30 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet matching subtracted B+ charged task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/TableProducer/Matching/jetMatchingSub.cxx"
+
+using BplusChargedJetMatchingSub = JetMatchingSub<soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents>,
+                                                  soa::Join<aod::BplusChargedEventWiseSubtractedJets, aod::BplusChargedEventWiseSubtractedJetConstituents>,
+                                                  aod::BplusChargedJetsMatchedToBplusChargedEventWiseSubtractedJets,
+                                                  aod::BplusChargedEventWiseSubtractedJetsMatchedToBplusChargedJets,
+                                                  aod::JTrackBplusSubs,
+                                                  aod::CandidatesBplusData>;
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+  tasks.emplace_back(adaptAnalysisTask<BplusChargedJetMatchingSub>(cfgc, TaskName{"jet-matching-sub-bplus-ch"}));
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/TableProducer/derivedDataProducer.cxx b/PWGJE/TableProducer/derivedDataProducer.cxx
index e0fcdc959ea..0167ceeed5b 100644
--- a/PWGJE/TableProducer/derivedDataProducer.cxx
+++ b/PWGJE/TableProducer/derivedDataProducer.cxx
@@ -89,6 +89,10 @@ struct JetDerivedDataProducerTask {
   Produces<aod::JLcMcCollisionIds> jLcMcCollisionIdsTable;
   Produces<aod::JLcIds> jLcIdsTable;
   Produces<aod::JLcPIds> jLcParticleIdsTable;
+  Produces<aod::JBplusCollisionIds> jBplusCollisionIdsTable;
+  Produces<aod::JBplusMcCollisionIds> jBplusMcCollisionIdsTable;
+  Produces<aod::JBplusIds> jBplusIdsTable;
+  Produces<aod::JBplusPIds> jBplusParticleIdsTable;
   Produces<aod::JV0Ids> jV0IdsTable;
   Produces<aod::JV0McCollisions> jV0McCollisionsTable;
   Produces<aod::JV0McCollisionIds> jV0McCollisionIdsTable;
@@ -429,19 +433,19 @@ struct JetDerivedDataProducerTask {
   }
   PROCESS_SWITCH(JetDerivedDataProducerTask, processD0MC, "produces derived index for D0 particles", false);
 
-  void processLcCollisions(aod::Hf3PCollIds::iterator const& LcCollision)
+  void processLcCollisions(aod::HfLcCollIds::iterator const& LcCollision)
   {
     jLcCollisionIdsTable(LcCollision.collisionId());
   }
   PROCESS_SWITCH(JetDerivedDataProducerTask, processLcCollisions, "produces derived index for Lc collisions", false);
 
-  void processLcMcCollisions(aod::Hf3PMcCollIds::iterator const& LcMcCollision)
+  void processLcMcCollisions(aod::HfLcMcCollIds::iterator const& LcMcCollision)
   {
     jLcMcCollisionIdsTable(LcMcCollision.mcCollisionId());
   }
   PROCESS_SWITCH(JetDerivedDataProducerTask, processLcMcCollisions, "produces derived index for Lc MC collisions", false);
 
-  void processLc(aod::Hf3PIds::iterator const& Lc, aod::Tracks const&)
+  void processLc(aod::HfLcIds::iterator const& Lc, aod::Tracks const&)
   {
     auto JProng0ID = trackCollisionMapping.find({Lc.prong0Id(), Lc.prong0_as<aod::Tracks>().collisionId()});
     auto JProng1ID = trackCollisionMapping.find({Lc.prong1Id(), Lc.prong1_as<aod::Tracks>().collisionId()});
@@ -455,12 +459,44 @@ struct JetDerivedDataProducerTask {
   }
   PROCESS_SWITCH(JetDerivedDataProducerTask, processLc, "produces derived index for Lc candidates", false);
 
-  void processLcMC(aod::Hf3PPIds::iterator const& Lc)
+  void processLcMC(aod::HfLcPIds::iterator const& Lc)
   {
     jLcParticleIdsTable(Lc.mcCollisionId(), Lc.mcParticleId());
   }
   PROCESS_SWITCH(JetDerivedDataProducerTask, processLcMC, "produces derived index for Lc particles", false);
 
+  void processBplusCollisions(aod::HfBplusCollIds::iterator const& BplusCollision)
+  {
+    jBplusCollisionIdsTable(BplusCollision.collisionId());
+  }
+  PROCESS_SWITCH(JetDerivedDataProducerTask, processBplusCollisions, "produces derived index for Bplus collisions", false);
+
+  void processBplusMcCollisions(aod::HfBplusMcCollIds::iterator const& BplusMcCollision)
+  {
+    jBplusMcCollisionIdsTable(BplusMcCollision.mcCollisionId());
+  }
+  PROCESS_SWITCH(JetDerivedDataProducerTask, processBplusMcCollisions, "produces derived index for Bplus MC collisions", false);
+
+  void processBplus(aod::HfBplusIds::iterator const& Bplus, aod::Tracks const&)
+  {
+    auto JProng0ID = trackCollisionMapping.find({Bplus.prong0Id(), Bplus.prong0_as<aod::Tracks>().collisionId()});
+    auto JProng1ID = trackCollisionMapping.find({Bplus.prong1Id(), Bplus.prong1_as<aod::Tracks>().collisionId()});
+    auto JProng2ID = trackCollisionMapping.find({Bplus.prong2Id(), Bplus.prong2_as<aod::Tracks>().collisionId()});
+    if (withCollisionAssociator) {
+      JProng0ID = trackCollisionMapping.find({Bplus.prong0Id(), Bplus.collisionId()});
+      JProng1ID = trackCollisionMapping.find({Bplus.prong1Id(), Bplus.collisionId()});
+      JProng2ID = trackCollisionMapping.find({Bplus.prong2Id(), Bplus.collisionId()});
+    }
+    jBplusIdsTable(Bplus.collisionId(), JProng0ID->second, JProng1ID->second, JProng2ID->second);
+  }
+  PROCESS_SWITCH(JetDerivedDataProducerTask, processBplus, "produces derived index for Bplus candidates", false);
+
+  void processBplusMC(aod::HfBplusPIds::iterator const& Bplus)
+  {
+    jBplusParticleIdsTable(Bplus.mcCollisionId(), Bplus.mcParticleId());
+  }
+  PROCESS_SWITCH(JetDerivedDataProducerTask, processBplusMC, "produces derived index for Bplus particles", false);
+
   void processV0(aod::V0Indices::iterator const& V0, aod::Tracks const&)
   {
     auto JPosTrackID = trackCollisionMapping.find({V0.posTrackId(), V0.posTrack_as<aod::Tracks>().collisionId()});
diff --git a/PWGJE/TableProducer/derivedDataProducerDummy.cxx b/PWGJE/TableProducer/derivedDataProducerDummy.cxx
index efbd1fa4cf5..da60109d94f 100644
--- a/PWGJE/TableProducer/derivedDataProducerDummy.cxx
+++ b/PWGJE/TableProducer/derivedDataProducerDummy.cxx
@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-// temporary task to produce HF tables needed when making inclusive derived data - should become obsolete when tables are able to be prouduced based on a configurable
+// temporary task to produce HF and DQ tables needed when making inclusive derived data - should become obsolete when tables are able to be prouduced based on a configurable
 //
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>
 
@@ -38,16 +38,28 @@ struct JetDerivedDataProducerDummyTask {
   Produces<aod::HfD0McCollBases> d0McCollisionsTable;
   Produces<aod::HfD0PBases> d0ParticlesTable;
 
-  Produces<aod::Hf3PCollBases> lcCollisionsTable;
-  Produces<aod::Hf3PMcRCollIds> lcCollisionsMatchingTable;
-  Produces<aod::Hf3PBases> lcsTable;
-  Produces<aod::Hf3PPars> lcParsTable;
-  Produces<aod::Hf3PParEs> lcParExtrasTable;
-  Produces<aod::Hf3PSels> lcSelsTable;
-  Produces<aod::Hf3PMls> lcMlsTable;
-  Produces<aod::Hf3PMcs> lcMcsTable;
-  Produces<aod::Hf3PMcCollBases> lcMcCollisionsTable;
-  Produces<aod::Hf3PPBases> lcParticlesTable;
+  Produces<aod::HfLcCollBases> lcCollisionsTable;
+  Produces<aod::HfLcMcRCollIds> lcCollisionsMatchingTable;
+  Produces<aod::HfLcBases> lcsTable;
+  Produces<aod::HfLcPars> lcParsTable;
+  Produces<aod::HfLcParEs> lcParExtrasTable;
+  Produces<aod::HfLcSels> lcSelsTable;
+  Produces<aod::HfLcMls> lcMlsTable;
+  Produces<aod::HfLcMcs> lcMcsTable;
+  Produces<aod::HfLcMcCollBases> lcMcCollisionsTable;
+  Produces<aod::HfLcPBases> lcParticlesTable;
+
+  Produces<aod::HfBplusCollBases> bplusCollisionsTable;
+  Produces<aod::HfBplusMcRCollIds> bplusCollisionsMatchingTable;
+  Produces<aod::HfBplusBases> bplussTable;
+  Produces<aod::HfBplusPars> bplusParsTable;
+  Produces<aod::HfBplusParEs> bplusParExtrasTable;
+  Produces<aod::HfBplusParD0s> bplusParD0sTable;
+  Produces<aod::HfBplusMls> bplusMlsTable;
+  Produces<aod::HfBplusMlD0s> bplusMlD0sTable;
+  Produces<aod::HfBplusMcs> bplusMcsTable;
+  Produces<aod::HfBplusMcCollBases> bplusMcCollisionsTable;
+  Produces<aod::HfBplusPBases> bplusParticlesTable;
 
   Produces<aod::ReducedEvents> dielectronCollisionsTable;
   Produces<aod::Dielectrons> dielectronTable;
diff --git a/PWGJE/TableProducer/derivedDataProducerDummyBplus.cxx b/PWGJE/TableProducer/derivedDataProducerDummyBplus.cxx
new file mode 100644
index 00000000000..8f3e238710a
--- /dev/null
+++ b/PWGJE/TableProducer/derivedDataProducerDummyBplus.cxx
@@ -0,0 +1,69 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// temporary task to produce HF and DQ tables needed when making B+ jet derived data - should become obsolete when tables are able to be prouduced based on a configurable
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/ASoA.h"
+#include "Framework/runDataProcessing.h"
+#include "PWGJE/DataModel/JetReducedData.h"
+#include "PWGHF/DataModel/DerivedTables.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+using namespace o2;
+using namespace o2::framework;
+using namespace o2::framework::expressions;
+
+struct JetDerivedDataProducerDummyTask {
+
+  Produces<aod::HfD0CollBases> d0CollisionsTable;
+  Produces<aod::HfD0McRCollIds> d0CollisionsMatchingTable;
+  Produces<aod::HfD0Bases> d0sTable;
+  Produces<aod::HfD0Pars> d0ParsTable;
+  Produces<aod::HfD0ParEs> d0ParExtrasTable;
+  Produces<aod::HfD0Sels> d0SelsTable;
+  Produces<aod::HfD0Mls> d0MlsTable;
+  Produces<aod::HfD0Mcs> d0McsTable;
+  Produces<aod::HfD0McCollBases> d0McCollisionsTable;
+  Produces<aod::HfD0PBases> d0ParticlesTable;
+
+  Produces<aod::HfLcCollBases> lcCollisionsTable;
+  Produces<aod::HfLcMcRCollIds> lcCollisionsMatchingTable;
+  Produces<aod::HfLcBases> lcsTable;
+  Produces<aod::HfLcPars> lcParsTable;
+  Produces<aod::HfLcParEs> lcParExtrasTable;
+  Produces<aod::HfLcSels> lcSelsTable;
+  Produces<aod::HfLcMls> lcMlsTable;
+  Produces<aod::HfLcMcs> lcMcsTable;
+  Produces<aod::HfLcMcCollBases> lcMcCollisionsTable;
+  Produces<aod::HfLcPBases> lcParticlesTable;
+
+  Produces<aod::ReducedEvents> dielectronCollisionsTable;
+  Produces<aod::Dielectrons> dielectronTable;
+
+  void init(InitContext const&)
+  {
+  }
+
+  void processDummy(aod::JDummys const&)
+  {
+  }
+  PROCESS_SWITCH(JetDerivedDataProducerDummyTask, processDummy, "leaves all tables empty", true);
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{
+    adaptAnalysisTask<JetDerivedDataProducerDummyTask>(cfgc, TaskName{"jet-deriveddata-producer-dummy"})};
+}
diff --git a/PWGJE/TableProducer/derivedDataProducerDummyD0.cxx b/PWGJE/TableProducer/derivedDataProducerDummyD0.cxx
index 8b02d7cdeab..c28b0e44dfe 100644
--- a/PWGJE/TableProducer/derivedDataProducerDummyD0.cxx
+++ b/PWGJE/TableProducer/derivedDataProducerDummyD0.cxx
@@ -27,16 +27,28 @@ using namespace o2::framework::expressions;
 
 struct JetDerivedDataProducerDummyD0Task {
 
-  Produces<aod::Hf3PCollBases> lcCollisionsTable;
-  Produces<aod::Hf3PMcRCollIds> lcCollisionsMatchingTable;
-  Produces<aod::Hf3PBases> lcsTable;
-  Produces<aod::Hf3PPars> lcParsTable;
-  Produces<aod::Hf3PParEs> lcParExtrasTable;
-  Produces<aod::Hf3PSels> lcSelsTable;
-  Produces<aod::Hf3PMls> lcMlsTable;
-  Produces<aod::Hf3PMcs> lcMcsTable;
-  Produces<aod::Hf3PMcCollBases> lcMcCollisionsTable;
-  Produces<aod::Hf3PPBases> lcParticlesTable;
+  Produces<aod::HfLcCollBases> lcCollisionsTable;
+  Produces<aod::HfLcMcRCollIds> lcCollisionsMatchingTable;
+  Produces<aod::HfLcBases> lcsTable;
+  Produces<aod::HfLcPars> lcParsTable;
+  Produces<aod::HfLcParEs> lcParExtrasTable;
+  Produces<aod::HfLcSels> lcSelsTable;
+  Produces<aod::HfLcMls> lcMlsTable;
+  Produces<aod::HfLcMcs> lcMcsTable;
+  Produces<aod::HfLcMcCollBases> lcMcCollisionsTable;
+  Produces<aod::HfLcPBases> lcParticlesTable;
+
+  Produces<aod::HfBplusCollBases> bplusCollisionsTable;
+  Produces<aod::HfBplusMcRCollIds> bplusCollisionsMatchingTable;
+  Produces<aod::HfBplusBases> bplussTable;
+  Produces<aod::HfBplusPars> bplusParsTable;
+  Produces<aod::HfBplusParEs> bplusParExtrasTable;
+  Produces<aod::HfBplusParD0s> bplusParD0sTable;
+  Produces<aod::HfBplusMls> bplusMlsTable;
+  Produces<aod::HfBplusMlD0s> bplusMlD0sTable;
+  Produces<aod::HfBplusMcs> bplusMcsTable;
+  Produces<aod::HfBplusMcCollBases> bplusMcCollisionsTable;
+  Produces<aod::HfBplusPBases> bplusParticlesTable;
 
   Produces<aod::ReducedEvents> dielectronCollisionsTable;
   Produces<aod::Dielectrons> dielectronTable;
diff --git a/PWGJE/TableProducer/derivedDataProducerDummyDielectron.cxx b/PWGJE/TableProducer/derivedDataProducerDummyDielectron.cxx
index 784fa3e4826..9df74703902 100644
--- a/PWGJE/TableProducer/derivedDataProducerDummyDielectron.cxx
+++ b/PWGJE/TableProducer/derivedDataProducerDummyDielectron.cxx
@@ -38,16 +38,28 @@ struct JetDerivedDataProducerDummyDielectronTask {
   Produces<aod::HfD0McCollBases> d0McCollisionsTable;
   Produces<aod::HfD0PBases> d0ParticlesTable;
 
-  Produces<aod::Hf3PCollBases> lcCollisionsTable;
-  Produces<aod::Hf3PMcRCollIds> lcCollisionsMatchingTable;
-  Produces<aod::Hf3PBases> lcsTable;
-  Produces<aod::Hf3PPars> lcParsTable;
-  Produces<aod::Hf3PParEs> lcParExtrasTable;
-  Produces<aod::Hf3PSels> lcSelsTable;
-  Produces<aod::Hf3PMls> lcMlsTable;
-  Produces<aod::Hf3PMcs> lcMcsTable;
-  Produces<aod::Hf3PMcCollBases> lcMcCollisionsTable;
-  Produces<aod::Hf3PPBases> lcParticlesTable;
+  Produces<aod::HfLcCollBases> lcCollisionsTable;
+  Produces<aod::HfLcMcRCollIds> lcCollisionsMatchingTable;
+  Produces<aod::HfLcBases> lcsTable;
+  Produces<aod::HfLcPars> lcParsTable;
+  Produces<aod::HfLcParEs> lcParExtrasTable;
+  Produces<aod::HfLcSels> lcSelsTable;
+  Produces<aod::HfLcMls> lcMlsTable;
+  Produces<aod::HfLcMcs> lcMcsTable;
+  Produces<aod::HfLcMcCollBases> lcMcCollisionsTable;
+  Produces<aod::HfLcPBases> lcParticlesTable;
+
+  Produces<aod::HfBplusCollBases> bplusCollisionsTable;
+  Produces<aod::HfBplusMcRCollIds> bplusCollisionsMatchingTable;
+  Produces<aod::HfBplusBases> bplussTable;
+  Produces<aod::HfBplusPars> bplusParsTable;
+  Produces<aod::HfBplusParEs> bplusParExtrasTable;
+  Produces<aod::HfBplusParD0s> bplusParD0sTable;
+  Produces<aod::HfBplusMls> bplusMlsTable;
+  Produces<aod::HfBplusMlD0s> bplusMlD0sTable;
+  Produces<aod::HfBplusMcs> bplusMcsTable;
+  Produces<aod::HfBplusMcCollBases> bplusMcCollisionsTable;
+  Produces<aod::HfBplusPBases> bplusParticlesTable;
 
   void init(InitContext const&)
   {
diff --git a/PWGJE/TableProducer/derivedDataProducerDummyLc.cxx b/PWGJE/TableProducer/derivedDataProducerDummyLc.cxx
index 05e1384deac..5550e97a9ae 100644
--- a/PWGJE/TableProducer/derivedDataProducerDummyLc.cxx
+++ b/PWGJE/TableProducer/derivedDataProducerDummyLc.cxx
@@ -38,6 +38,18 @@ struct JetDerivedDataProducerDummyLcTask {
   Produces<aod::HfD0McCollBases> d0McCollisionsTable;
   Produces<aod::HfD0PBases> d0ParticlesTable;
 
+  Produces<aod::HfBplusCollBases> bplusCollisionsTable;
+  Produces<aod::HfBplusMcRCollIds> bplusCollisionsMatchingTable;
+  Produces<aod::HfBplusBases> bplussTable;
+  Produces<aod::HfBplusPars> bplusParsTable;
+  Produces<aod::HfBplusParEs> bplusParExtrasTable;
+  Produces<aod::HfBplusParD0s> bplusParD0sTable;
+  Produces<aod::HfBplusMls> bplusMlsTable;
+  Produces<aod::HfBplusMlD0s> bplusMlD0sTable;
+  Produces<aod::HfBplusMcs> bplusMcsTable;
+  Produces<aod::HfBplusMcCollBases> bplusMcCollisionsTable;
+  Produces<aod::HfBplusPBases> bplusParticlesTable;
+
   Produces<aod::ReducedEvents> dielectronCollisionsTable;
   Produces<aod::Dielectrons> dielectronTable;
 
diff --git a/PWGJE/TableProducer/derivedDataWriter.cxx b/PWGJE/TableProducer/derivedDataWriter.cxx
index eb5858184da..14702b97894 100644
--- a/PWGJE/TableProducer/derivedDataWriter.cxx
+++ b/PWGJE/TableProducer/derivedDataWriter.cxx
@@ -51,6 +51,9 @@ struct JetDerivedDataWriter {
     Configurable<float> thresholdChargedLcJetPtMin{"thresholdChargedLcJetPtMin", 0.0, "Minimum charged Lc jet pt to accept event"};
     Configurable<float> thresholdChargedEventWiseSubtractedLcJetPtMin{"thresholdChargedEventWiseSubtractedLcJetPtMin", 0.0, "Minimum charged event-wise subtracted Lc jet pt to accept event"};
     Configurable<float> thresholdChargedLcMCPJetPtMin{"thresholdChargedLcMCPJetPtMin", 0.0, "Minimum charged Lc mcp jet pt to accept event"};
+    Configurable<float> thresholdChargedBplusJetPtMin{"thresholdChargedBplusJetPtMin", 0.0, "Minimum charged Bplus jet pt to accept event"};
+    Configurable<float> thresholdChargedEventWiseSubtractedBplusJetPtMin{"thresholdChargedEventWiseSubtractedBplusJetPtMin", 0.0, "Minimum charged event-wise subtracted Bplus jet pt to accept event"};
+    Configurable<float> thresholdChargedBplusMCPJetPtMin{"thresholdChargedBplusMCPJetPtMin", 0.0, "Minimum charged Bplus mcp jet pt to accept event"};
     Configurable<float> thresholdChargedDielectronJetPtMin{"thresholdChargedDielectronJetPtMin", 0.0, "Minimum charged Dielectron jet pt to accept event"};
     Configurable<float> thresholdChargedEventWiseSubtractedDielectronJetPtMin{"thresholdChargedEventWiseSubtractedDielectronJetPtMin", 0.0, "Minimum charged event-wise subtracted Dielectron jet pt to accept event"};
     Configurable<float> thresholdChargedDielectronMCPJetPtMin{"thresholdChargedDielectronMCPJetPtMin", 0.0, "Minimum charged Dielectron mcp jet pt to accept event"};
@@ -67,9 +70,10 @@ struct JetDerivedDataWriter {
     Configurable<float> trackEtaSelectionMax{"trackEtaSelectionMax", 0.9, "only save tracks that have an eta smaller than this eta"};
     Configurable<bool> saveBCsTable{"saveBCsTable", true, "save the bunch crossing table to the output"};
     Configurable<bool> saveClustersTable{"saveClustersTable", false, "save the clusters table to the output"};
-    Configurable<bool> saveD0Table{"saveD0Table", false, "save the D0 table to the output"};
-    Configurable<bool> saveLcTable{"saveLcTable", false, "save the Lc table to the output"};
-    Configurable<bool> saveDielectronTable{"saveDielectronTable", false, "save the Dielectron table to the output"};
+    Configurable<bool> saveD0Table{"saveD0Table", false, "save the D0 tables to the output"};
+    Configurable<bool> saveLcTable{"saveLcTable", false, "save the Lc tables to the output"};
+    Configurable<bool> saveBplusTable{"saveBplusTable", false, "save the Bplus tables to the output"};
+    Configurable<bool> saveDielectronTable{"saveDielectronTable", false, "save the Dielectron tables to the output"};
 
     Configurable<std::string> triggerMasks{"triggerMasks", "", "possible JE Trigger masks: fJetChLowPt,fJetChHighPt,fTrackLowPt,fTrackHighPt,fJetD0ChLowPt,fJetD0ChHighPt,fJetLcChLowPt,fJetLcChHighPt,fEMCALReadout,fJetFullHighPt,fJetFullLowPt,fJetNeutralHighPt,fJetNeutralLowPt,fGammaVeryHighPtEMCAL,fGammaVeryHighPtDCAL,fGammaHighPtEMCAL,fGammaHighPtDCAL,fGammaLowPtEMCAL,fGammaLowPtDCAL,fGammaVeryLowPtEMCAL,fGammaVeryLowPtDCAL"};
   } config;
@@ -102,8 +106,10 @@ struct JetDerivedDataWriter {
     Produces<aod::StoredHfD0Bases> storedD0sTable;
     Produces<aod::StoredHfD0Pars> storedD0ParsTable;
     Produces<aod::StoredHfD0ParEs> storedD0ParExtrasTable;
+    Produces<aod::JDumD0ParDaus> storedD0ParDaughtersDummyTable;
     Produces<aod::StoredHfD0Sels> storedD0SelsTable;
     Produces<aod::StoredHfD0Mls> storedD0MlsTable;
+    Produces<aod::JDumD0MlDaus> storedD0MlDughtersDummyTable;
     Produces<aod::StoredHfD0Mcs> storedD0McsTable;
     Produces<aod::StoredJD0Ids> storedD0IdsTable;
     Produces<aod::StoredHfD0McCollBases> storedD0McCollisionsTable;
@@ -112,21 +118,40 @@ struct JetDerivedDataWriter {
     Produces<aod::StoredHfD0PBases> storedD0ParticlesTable;
     Produces<aod::StoredJD0PIds> storedD0ParticleIdsTable;
 
-    Produces<aod::StoredHf3PCollBases> storedLcCollisionsTable;
+    Produces<aod::StoredHfLcCollBases> storedLcCollisionsTable;
     Produces<aod::StoredJLcCollisionIds> storedLcCollisionIdsTable;
-    Produces<aod::StoredHf3PBases> storedLcsTable;
-    Produces<aod::StoredHf3PPars> storedLcParsTable;
-    Produces<aod::StoredHf3PParEs> storedLcParExtrasTable;
-    Produces<aod::StoredHf3PSels> storedLcSelsTable;
-    Produces<aod::StoredHf3PMls> storedLcMlsTable;
-    Produces<aod::StoredHf3PMcs> storedLcMcsTable;
+    Produces<aod::StoredHfLcBases> storedLcsTable;
+    Produces<aod::StoredHfLcPars> storedLcParsTable;
+    Produces<aod::StoredHfLcParEs> storedLcParExtrasTable;
+    Produces<aod::JDumLcParDaus> storedLcParDaughtersDummyTable;
+    Produces<aod::StoredHfLcSels> storedLcSelsTable;
+    Produces<aod::StoredHfLcMls> storedLcMlsTable;
+    Produces<aod::JDumLcMlDaus> storedLcMlDughtersDummyTable;
+    Produces<aod::StoredHfLcMcs> storedLcMcsTable;
     Produces<aod::StoredJLcIds> storedLcIdsTable;
-    Produces<aod::StoredHf3PMcCollBases> storedLcMcCollisionsTable;
+    Produces<aod::StoredHfLcMcCollBases> storedLcMcCollisionsTable;
     Produces<aod::StoredJLcMcCollisionIds> storedLcMcCollisionIdsTable;
-    Produces<aod::StoredHf3PMcRCollIds> storedLcMcCollisionsMatchingTable;
-    Produces<aod::StoredHf3PPBases> storedLcParticlesTable;
+    Produces<aod::StoredHfLcMcRCollIds> storedLcMcCollisionsMatchingTable;
+    Produces<aod::StoredHfLcPBases> storedLcParticlesTable;
     Produces<aod::StoredJLcPIds> storedLcParticleIdsTable;
 
+    Produces<aod::StoredHfBplusCollBases> storedBplusCollisionsTable;
+    Produces<aod::StoredJBplusCollisionIds> storedBplusCollisionIdsTable;
+    Produces<aod::StoredHfBplusBases> storedBplussTable;
+    Produces<aod::StoredHfBplusPars> storedBplusParsTable;
+    Produces<aod::StoredHfBplusParEs> storedBplusParExtrasTable;
+    Produces<aod::StoredHfBplusParD0s> storedBplusParD0sTable;
+    Produces<aod::JDumBplusSels> storedBplusSelsDummyTable;
+    Produces<aod::StoredHfBplusMls> storedBplusMlsTable;
+    Produces<aod::StoredHfBplusMlD0s> storedBplusMlD0sTable;
+    Produces<aod::StoredHfBplusMcs> storedBplusMcsTable;
+    Produces<aod::StoredJBplusIds> storedBplusIdsTable;
+    Produces<aod::StoredHfBplusMcCollBases> storedBplusMcCollisionsTable;
+    Produces<aod::StoredJBplusMcCollisionIds> storedBplusMcCollisionIdsTable;
+    Produces<aod::StoredHfBplusMcRCollIds> storedBplusMcCollisionsMatchingTable;
+    Produces<aod::StoredHfBplusPBases> storedBplusParticlesTable;
+    Produces<aod::StoredJBplusPIds> storedBplusParticleIdsTable;
+
     Produces<aod::StoredReducedEvents> storedDielectronCollisionsTable;
     Produces<aod::StoredJDielectronCollisionIds> storedDielectronCollisionIdsTable;
     Produces<aod::StoredDielectrons> storedDielectronsTable;
@@ -143,13 +168,16 @@ struct JetDerivedDataWriter {
   Preslice<soa::Join<aod::JTracks, aod::JTrackExtras, aod::JTrackPIs, aod::JMcTrackLbs>> TracksPerCollision = aod::jtrack::collisionId;
   Preslice<soa::Join<aod::JClusters, aod::JClusterPIs, aod::JClusterTracks>> ClustersPerCollision = aod::jcluster::collisionId;
   Preslice<soa::Join<aod::McCollisionsD0, aod::HfD0McRCollIds>> D0McCollisionsPerMcCollision = aod::jd0indices::mcCollisionId;
-  Preslice<soa::Join<aod::McCollisionsLc, aod::Hf3PMcRCollIds>> LcMcCollisionsPerMcCollision = aod::jlcindices::mcCollisionId;
+  Preslice<soa::Join<aod::McCollisionsLc, aod::HfLcMcRCollIds>> LcMcCollisionsPerMcCollision = aod::jlcindices::mcCollisionId;
+  Preslice<soa::Join<aod::McCollisionsBplus, aod::HfBplusMcRCollIds>> BplusMcCollisionsPerMcCollision = aod::jbplusindices::mcCollisionId;
   Preslice<aod::McCollisionsDielectron> DielectronMcCollisionsPerMcCollision = aod::jdielectronindices::mcCollisionId;
   Preslice<aod::CollisionsD0> D0CollisionsPerCollision = aod::jd0indices::collisionId;
   Preslice<aod::CollisionsLc> LcCollisionsPerCollision = aod::jlcindices::collisionId;
+  Preslice<aod::CollisionsBplus> BplusCollisionsPerCollision = aod::jbplusindices::collisionId;
   Preslice<aod::CollisionsDielectron> DielectronCollisionsPerCollision = aod::jdielectronindices::collisionId;
   Preslice<aod::CandidatesD0MCD> D0sPerCollision = aod::jd0indices::collisionId;
   Preslice<aod::CandidatesLcMCD> LcsPerCollision = aod::jlcindices::collisionId;
+  Preslice<aod::CandidatesBplusMCD> BplussPerCollision = aod::jbplusindices::collisionId;
   Preslice<aod::CandidatesDielectronMCD> DielectronsPerCollision = aod::jdielectronindices::collisionId;
   PresliceUnsorted<aod::JEMCTracks> EMCTrackPerTrack = aod::jemctrack::trackId;
 
@@ -277,6 +305,12 @@ struct JetDerivedDataWriter {
       selectionObjectPtMin = config.thresholdChargedEventWiseSubtractedLcJetPtMin;
     } else if constexpr (std::is_same_v<std::decay_t<T>, aod::LcChargedMCParticleLevelJets>) {
       selectionObjectPtMin = config.thresholdChargedLcMCPJetPtMin;
+    } else if constexpr (std::is_same_v<std::decay_t<T>, aod::BplusChargedJets> || std::is_same_v<std::decay_t<T>, aod::BplusChargedMCDetectorLevelJets>) {
+      selectionObjectPtMin = config.thresholdChargedBplusJetPtMin;
+    } else if constexpr (std::is_same_v<std::decay_t<T>, aod::BplusChargedEventWiseSubtractedJets> || std::is_same_v<std::decay_t<T>, aod::BplusChargedMCDetectorLevelEventWiseSubtractedJets>) {
+      selectionObjectPtMin = config.thresholdChargedEventWiseSubtractedBplusJetPtMin;
+    } else if constexpr (std::is_same_v<std::decay_t<T>, aod::BplusChargedMCParticleLevelJets>) {
+      selectionObjectPtMin = config.thresholdChargedBplusMCPJetPtMin;
     } else if constexpr (std::is_same_v<std::decay_t<T>, aod::DielectronChargedJets> || std::is_same_v<std::decay_t<T>, aod::DielectronChargedMCDetectorLevelJets>) {
       selectionObjectPtMin = config.thresholdChargedDielectronJetPtMin;
     } else if constexpr (std::is_same_v<std::decay_t<T>, aod::DielectronChargedEventWiseSubtractedJets> || std::is_same_v<std::decay_t<T>, aod::DielectronChargedMCDetectorLevelEventWiseSubtractedJets>) {
@@ -346,6 +380,11 @@ struct JetDerivedDataWriter {
   PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::LcChargedMCDetectorLevelJets>, processSelectingLcChargedMCDJets, "process Lc charged mcd jets", false);
   PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::LcChargedMCDetectorLevelEventWiseSubtractedJets>, processSelectingLcChargedMCDetectorLevelEventWiseSubtractedJets, "process Lc event-wise subtracted charged mcd jets", false);
   PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::LcChargedMCParticleLevelJets>, processSelectingLcChargedMCPJets, "process Lc charged mcp jets", false);
+  PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::BplusChargedJets>, processSelectingBplusChargedJets, "process Bplus charged jets", false);
+  PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::BplusChargedEventWiseSubtractedJets>, processSelectingBplusChargedEventWiseSubtractedJets, "process Bplus event-wise subtracted charged jets", false);
+  PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::BplusChargedMCDetectorLevelJets>, processSelectingBplusChargedMCDJets, "process Bplus charged mcd jets", false);
+  PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::BplusChargedMCDetectorLevelEventWiseSubtractedJets>, processSelectingBplusChargedMCDetectorLevelEventWiseSubtractedJets, "process Bplus event-wise subtracted charged mcd jets", false);
+  PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::BplusChargedMCParticleLevelJets>, processSelectingBplusChargedMCPJets, "process Bplus charged mcp jets", false);
   PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::DielectronChargedJets>, processSelectingDielectronChargedJets, "process Dielectron charged jets", false);
   PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::DielectronChargedEventWiseSubtractedJets>, processSelectingDielectronChargedEventWiseSubtractedJets, "process Dielectron event-wise subtracted charged jets", false);
   PROCESS_SWITCH_FULL(JetDerivedDataWriter, processSelectionObjects<aod::DielectronChargedMCDetectorLevelJets>, processSelectingDielectronChargedMCDJets, "process Dielectron charged mcd jets", false);
@@ -363,7 +402,7 @@ struct JetDerivedDataWriter {
   }
   PROCESS_SWITCH(JetDerivedDataWriter, processStoreDummyTable, "write out dummy output table", true);
 
-  void processStoreData(soa::Join<aod::JCollisions, aod::JCollisionPIs, aod::JCollisionBCs, aod::JEMCCollisionLbs>::iterator const& collision, soa::Join<aod::JBCs, aod::JBCPIs> const&, soa::Join<aod::JTracks, aod::JTrackExtras, aod::JTrackPIs> const& tracks, aod::JEMCTracks const& emcTracks, soa::Join<aod::JClusters, aod::JClusterPIs, aod::JClusterTracks> const& clusters, aod::CollisionsD0 const& D0Collisions, aod::CandidatesD0Data const& D0s, aod::CollisionsLc const& LcCollisions, aod::CandidatesLcData const& Lcs, aod::CollisionsDielectron const& DielectronCollisions, aod::CandidatesDielectronData const& Dielectrons)
+  void processStoreData(soa::Join<aod::JCollisions, aod::JCollisionPIs, aod::JCollisionBCs, aod::JEMCCollisionLbs>::iterator const& collision, soa::Join<aod::JBCs, aod::JBCPIs> const&, soa::Join<aod::JTracks, aod::JTrackExtras, aod::JTrackPIs> const& tracks, aod::JEMCTracks const& emcTracks, soa::Join<aod::JClusters, aod::JClusterPIs, aod::JClusterTracks> const& clusters, aod::CollisionsD0 const& D0Collisions, aod::CandidatesD0Data const& D0s, aod::CollisionsLc const& LcCollisions, aod::CandidatesLcData const& Lcs, aod::CollisionsBplus const& BplusCollisions, aod::CandidatesBplusData const& Bpluss, aod::CollisionsDielectron const& DielectronCollisions, aod::CandidatesDielectronData const& Dielectrons)
   {
     std::map<int32_t, int32_t> bcMapping;
     std::map<int32_t, int32_t> trackMapping;
@@ -429,12 +468,12 @@ struct JetDerivedDataWriter {
       if (config.saveD0Table) {
         int32_t collisionD0Index = -1;
         for (const auto& D0Collision : D0Collisions) { // should only ever be one
-          jethfutilities::fillD0CollisionTable(D0Collision, products.storedD0CollisionsTable, collisionD0Index);
+          jethfutilities::fillHFCollisionTable(D0Collision, products.storedD0CollisionsTable, collisionD0Index);
           products.storedD0CollisionIdsTable(products.storedJCollisionsTable.lastIndex());
         }
         for (const auto& D0 : D0s) {
           int32_t D0Index = -1;
-          jethfutilities::fillD0CandidateTable<false>(D0, collisionD0Index, products.storedD0sTable, products.storedD0ParsTable, products.storedD0ParExtrasTable, products.storedD0SelsTable, products.storedD0MlsTable, products.storedD0McsTable, D0Index);
+          jethfutilities::fillHFCandidateTable<false>(D0, collisionD0Index, products.storedD0sTable, products.storedD0ParsTable, products.storedD0ParExtrasTable, products.storedD0ParDaughtersDummyTable, products.storedD0SelsTable, products.storedD0MlsTable, products.storedD0MlDughtersDummyTable, products.storedD0McsTable, D0Index);
 
           int32_t prong0Id = -1;
           int32_t prong1Id = -1;
@@ -453,12 +492,12 @@ struct JetDerivedDataWriter {
       if (config.saveLcTable) {
         int32_t collisionLcIndex = -1;
         for (const auto& LcCollision : LcCollisions) { // should only ever be one
-          jethfutilities::fillLcCollisionTable(LcCollision, products.storedLcCollisionsTable, collisionLcIndex);
+          jethfutilities::fillHFCollisionTable(LcCollision, products.storedLcCollisionsTable, collisionLcIndex);
           products.storedLcCollisionIdsTable(products.storedJCollisionsTable.lastIndex());
         }
         for (const auto& Lc : Lcs) {
           int32_t LcIndex = -1;
-          jethfutilities::fillLcCandidateTable<false>(Lc, collisionLcIndex, products.storedLcsTable, products.storedLcParsTable, products.storedLcParExtrasTable, products.storedLcSelsTable, products.storedLcMlsTable, products.storedLcMcsTable, LcIndex);
+          jethfutilities::fillHFCandidateTable<false>(Lc, collisionLcIndex, products.storedLcsTable, products.storedLcParsTable, products.storedLcParExtrasTable, products.storedLcParDaughtersDummyTable, products.storedLcSelsTable, products.storedLcMlsTable, products.storedLcMlDughtersDummyTable, products.storedLcMcsTable, LcIndex);
 
           int32_t prong0Id = -1;
           int32_t prong1Id = -1;
@@ -478,6 +517,34 @@ struct JetDerivedDataWriter {
           products.storedLcIdsTable(products.storedJCollisionsTable.lastIndex(), prong0Id, prong1Id, prong2Id);
         }
       }
+      if (config.saveBplusTable) {
+        int32_t collisionBplusIndex = -1;
+        for (const auto& BplusCollision : BplusCollisions) {                                                              // should only ever be one
+          jethfutilities::fillHFCollisionTable(BplusCollision, products.storedBplusCollisionsTable, collisionBplusIndex); // fix this!!!
+          products.storedBplusCollisionIdsTable(products.storedJCollisionsTable.lastIndex());
+        }
+        for (const auto& Bplus : Bpluss) {
+          int32_t BplusIndex = -1;
+          jethfutilities::fillHFCandidateTable<false>(Bplus, collisionBplusIndex, products.storedBplussTable, products.storedBplusParsTable, products.storedBplusParExtrasTable, products.storedBplusParD0sTable, products.storedBplusSelsDummyTable, products.storedBplusMlsTable, products.storedBplusMlD0sTable, products.storedBplusMcsTable, BplusIndex); // fix this
+
+          int32_t prong0Id = -1;
+          int32_t prong1Id = -1;
+          int32_t prong2Id = -1;
+          auto JtrackIndex = trackMapping.find(Bplus.prong0Id());
+          if (JtrackIndex != trackMapping.end()) {
+            prong0Id = JtrackIndex->second;
+          }
+          JtrackIndex = trackMapping.find(Bplus.prong1Id());
+          if (JtrackIndex != trackMapping.end()) {
+            prong1Id = JtrackIndex->second;
+          }
+          JtrackIndex = trackMapping.find(Bplus.prong2Id());
+          if (JtrackIndex != trackMapping.end()) {
+            prong2Id = JtrackIndex->second;
+          }
+          products.storedBplusIdsTable(products.storedJCollisionsTable.lastIndex(), prong0Id, prong1Id, prong2Id);
+        }
+      }
       if (config.saveDielectronTable) {
         int32_t collisionDielectronIndex = -1;
         for (const auto& DielectronCollision : DielectronCollisions) { // should only ever be one
@@ -507,13 +574,14 @@ struct JetDerivedDataWriter {
   // to run after all jet selections
   PROCESS_SWITCH(JetDerivedDataWriter, processStoreData, "write out data output tables", false);
 
-  void processStoreMC(soa::Join<aod::JMcCollisions, aod::JMcCollisionPIs> const& mcCollisions, soa::Join<aod::JCollisions, aod::JCollisionPIs, aod::JCollisionBCs, aod::JMcCollisionLbs, aod::JEMCCollisionLbs> const& collisions, soa::Join<aod::JBCs, aod::JBCPIs> const&, soa::Join<aod::JTracks, aod::JTrackExtras, aod::JTrackPIs, aod::JMcTrackLbs> const& tracks, aod::JEMCTracks const& emcTracks, soa::Join<aod::JClusters, aod::JClusterPIs, aod::JClusterTracks, aod::JMcClusterLbs> const& clusters, soa::Join<aod::JMcParticles, aod::JMcParticlePIs> const& particles, aod::CollisionsD0 const& D0Collisions, aod::CandidatesD0MCD const& D0s, soa::Join<aod::McCollisionsD0, aod::HfD0McRCollIds> const& D0McCollisions, aod::CandidatesD0MCP const& D0Particles, aod::CollisionsLc const& LcCollisions, aod::CandidatesLcMCD const& Lcs, soa::Join<aod::McCollisionsLc, aod::Hf3PMcRCollIds> const& LcMcCollisions, aod::CandidatesLcMCP const& LcParticles, aod::CollisionsDielectron const& DielectronCollisions, aod::CandidatesDielectronMCD const& Dielectrons, aod::McCollisionsDielectron const& DielectronMcCollisions, aod::CandidatesDielectronMCP const& DielectronParticles)
+  void processStoreMC(soa::Join<aod::JMcCollisions, aod::JMcCollisionPIs> const& mcCollisions, soa::Join<aod::JCollisions, aod::JCollisionPIs, aod::JCollisionBCs, aod::JMcCollisionLbs, aod::JEMCCollisionLbs> const& collisions, soa::Join<aod::JBCs, aod::JBCPIs> const&, soa::Join<aod::JTracks, aod::JTrackExtras, aod::JTrackPIs, aod::JMcTrackLbs> const& tracks, aod::JEMCTracks const& emcTracks, soa::Join<aod::JClusters, aod::JClusterPIs, aod::JClusterTracks, aod::JMcClusterLbs> const& clusters, soa::Join<aod::JMcParticles, aod::JMcParticlePIs> const& particles, aod::CollisionsD0 const& D0Collisions, aod::CandidatesD0MCD const& D0s, soa::Join<aod::McCollisionsD0, aod::HfD0McRCollIds> const& D0McCollisions, aod::CandidatesD0MCP const& D0Particles, aod::CollisionsLc const& LcCollisions, aod::CandidatesLcMCD const& Lcs, soa::Join<aod::McCollisionsLc, aod::HfLcMcRCollIds> const& LcMcCollisions, aod::CandidatesLcMCP const& LcParticles, aod::CollisionsBplus const& BplusCollisions, aod::CandidatesBplusMCD const& Bpluss, soa::Join<aod::McCollisionsBplus, aod::HfBplusMcRCollIds> const& BplusMcCollisions, aod::CandidatesBplusMCP const& BplusParticles, aod::CollisionsDielectron const& DielectronCollisions, aod::CandidatesDielectronMCD const& Dielectrons, aod::McCollisionsDielectron const& DielectronMcCollisions, aod::CandidatesDielectronMCP const& DielectronParticles)
   {
     std::map<int32_t, int32_t> bcMapping;
     std::map<int32_t, int32_t> paticleMapping;
     std::map<int32_t, int32_t> mcCollisionMapping;
     std::map<int32_t, int32_t> D0CollisionMapping;
     std::map<int32_t, int32_t> LcCollisionMapping;
+    std::map<int32_t, int32_t> BplusCollisionMapping;
     int particleTableIndex = 0;
     for (auto mcCollision : mcCollisions) {
       bool collisionSelected = false;
@@ -571,12 +639,12 @@ struct JetDerivedDataWriter {
           const auto d0McCollisionsPerMcCollision = D0McCollisions.sliceBy(D0McCollisionsPerMcCollision, mcCollision.globalIndex());
           int32_t mcCollisionD0Index = -1;
           for (const auto& d0McCollisionPerMcCollision : d0McCollisionsPerMcCollision) { // should only ever be one
-            jethfutilities::fillD0McCollisionTable(d0McCollisionPerMcCollision, products.storedD0McCollisionsTable, mcCollisionD0Index);
+            jethfutilities::fillHFMcCollisionTable(d0McCollisionPerMcCollision, products.storedD0McCollisionsTable, mcCollisionD0Index);
             products.storedD0McCollisionIdsTable(products.storedJMcCollisionsTable.lastIndex());
           }
           for (const auto& D0Particle : D0Particles) {
             int32_t D0ParticleIndex = -1;
-            jethfutilities::fillD0CandidateMcTable(D0Particle, mcCollisionD0Index, products.storedD0ParticlesTable, D0ParticleIndex);
+            jethfutilities::fillHFCandidateMcTable(D0Particle, mcCollisionD0Index, products.storedD0ParticlesTable, D0ParticleIndex);
             int32_t D0ParticleId = -1;
             auto JParticleIndex = paticleMapping.find(D0Particle.mcParticleId());
             if (JParticleIndex != paticleMapping.end()) {
@@ -590,12 +658,12 @@ struct JetDerivedDataWriter {
           const auto lcMcCollisionsPerMcCollision = LcMcCollisions.sliceBy(LcMcCollisionsPerMcCollision, mcCollision.globalIndex());
           int32_t mcCollisionLcIndex = -1;
           for (const auto& lcMcCollisionPerMcCollision : lcMcCollisionsPerMcCollision) { // should only ever be one
-            jethfutilities::fillLcMcCollisionTable(lcMcCollisionPerMcCollision, products.storedLcMcCollisionsTable, mcCollisionLcIndex);
+            jethfutilities::fillHFMcCollisionTable(lcMcCollisionPerMcCollision, products.storedLcMcCollisionsTable, mcCollisionLcIndex);
             products.storedLcMcCollisionIdsTable(products.storedJMcCollisionsTable.lastIndex());
           }
           for (const auto& LcParticle : LcParticles) {
             int32_t LcParticleIndex = -1;
-            jethfutilities::fillLcCandidateMcTable(LcParticle, mcCollisionLcIndex, products.storedLcParticlesTable, LcParticleIndex);
+            jethfutilities::fillHFCandidateMcTable(LcParticle, mcCollisionLcIndex, products.storedLcParticlesTable, LcParticleIndex);
             int32_t LcParticleId = -1;
             auto JParticleIndex = paticleMapping.find(LcParticle.mcParticleId());
             if (JParticleIndex != paticleMapping.end()) {
@@ -604,6 +672,24 @@ struct JetDerivedDataWriter {
             products.storedLcParticleIdsTable(products.storedJMcCollisionsTable.lastIndex(), LcParticleId);
           }
         }
+        if (config.saveBplusTable) {
+          const auto lcMcCollisionsPerMcCollision = BplusMcCollisions.sliceBy(BplusMcCollisionsPerMcCollision, mcCollision.globalIndex());
+          int32_t mcCollisionBplusIndex = -1;
+          for (const auto& lcMcCollisionPerMcCollision : lcMcCollisionsPerMcCollision) { // should only ever be one
+            jethfutilities::fillHFMcCollisionTable(lcMcCollisionPerMcCollision, products.storedBplusMcCollisionsTable, mcCollisionBplusIndex);
+            products.storedBplusMcCollisionIdsTable(products.storedJMcCollisionsTable.lastIndex());
+          }
+          for (const auto& BplusParticle : BplusParticles) {
+            int32_t BplusParticleIndex = -1;
+            jethfutilities::fillHFCandidateMcTable(BplusParticle, mcCollisionBplusIndex, products.storedBplusParticlesTable, BplusParticleIndex);
+            int32_t BplusParticleId = -1;
+            auto JParticleIndex = paticleMapping.find(BplusParticle.mcParticleId());
+            if (JParticleIndex != paticleMapping.end()) {
+              BplusParticleId = JParticleIndex->second;
+            }
+            products.storedBplusParticleIdsTable(products.storedJMcCollisionsTable.lastIndex(), BplusParticleId);
+          }
+        }
         if (config.saveDielectronTable) {
           const auto dielectronMcCollisionsPerMcCollision = DielectronMcCollisions.sliceBy(DielectronMcCollisionsPerMcCollision, mcCollision.globalIndex());
           int32_t mcCollisionDielectronIndex = -1;
@@ -752,14 +838,14 @@ struct JetDerivedDataWriter {
             const auto d0CollisionsPerCollision = D0Collisions.sliceBy(D0CollisionsPerCollision, collision.globalIndex());
             int32_t collisionD0Index = -1;
             for (const auto& d0CollisionPerCollision : d0CollisionsPerCollision) { // should only ever be one
-              jethfutilities::fillD0CollisionTable(d0CollisionPerCollision, products.storedD0CollisionsTable, collisionD0Index);
+              jethfutilities::fillHFCollisionTable(d0CollisionPerCollision, products.storedD0CollisionsTable, collisionD0Index);
               products.storedD0CollisionIdsTable(products.storedJCollisionsTable.lastIndex());
               D0CollisionMapping.insert(std::make_pair(d0CollisionPerCollision.globalIndex(), products.storedD0CollisionsTable.lastIndex()));
             }
             const auto d0sPerCollision = D0s.sliceBy(D0sPerCollision, collision.globalIndex());
             for (const auto& D0 : d0sPerCollision) {
               int32_t D0Index = -1;
-              jethfutilities::fillD0CandidateTable<true>(D0, collisionD0Index, products.storedD0sTable, products.storedD0ParsTable, products.storedD0ParExtrasTable, products.storedD0SelsTable, products.storedD0MlsTable, products.storedD0McsTable, D0Index);
+              jethfutilities::fillHFCandidateTable<true>(D0, collisionD0Index, products.storedD0sTable, products.storedD0ParsTable, products.storedD0ParExtrasTable, products.storedD0ParDaughtersDummyTable, products.storedD0SelsTable, products.storedD0MlsTable, products.storedD0MlDughtersDummyTable, products.storedD0McsTable, D0Index);
 
               int32_t prong0Id = -1;
               int32_t prong1Id = -1;
@@ -779,14 +865,14 @@ struct JetDerivedDataWriter {
             const auto lcCollisionsPerCollision = LcCollisions.sliceBy(LcCollisionsPerCollision, collision.globalIndex());
             int32_t collisionLcIndex = -1;
             for (const auto& lcCollisionPerCollision : lcCollisionsPerCollision) { // should only ever be one
-              jethfutilities::fillLcCollisionTable(lcCollisionPerCollision, products.storedLcCollisionsTable, collisionLcIndex);
+              jethfutilities::fillHFCollisionTable(lcCollisionPerCollision, products.storedLcCollisionsTable, collisionLcIndex);
               products.storedLcCollisionIdsTable(products.storedJCollisionsTable.lastIndex());
               LcCollisionMapping.insert(std::make_pair(lcCollisionPerCollision.globalIndex(), products.storedLcCollisionsTable.lastIndex()));
             }
             const auto lcsPerCollision = Lcs.sliceBy(LcsPerCollision, collision.globalIndex());
             for (const auto& Lc : lcsPerCollision) {
               int32_t LcIndex = -1;
-              jethfutilities::fillLcCandidateTable<true>(Lc, collisionLcIndex, products.storedLcsTable, products.storedLcParsTable, products.storedLcParExtrasTable, products.storedLcSelsTable, products.storedLcMlsTable, products.storedLcMcsTable, LcIndex);
+              jethfutilities::fillHFCandidateTable<true>(Lc, collisionLcIndex, products.storedLcsTable, products.storedLcParsTable, products.storedLcParExtrasTable, products.storedLcParDaughtersDummyTable, products.storedLcSelsTable, products.storedLcMlsTable, products.storedLcMlDughtersDummyTable, products.storedLcMcsTable, LcIndex);
 
               int32_t prong0Id = -1;
               int32_t prong1Id = -1;
@@ -807,6 +893,38 @@ struct JetDerivedDataWriter {
             }
           }
 
+          if (config.saveBplusTable) {
+            const auto lcCollisionsPerCollision = BplusCollisions.sliceBy(BplusCollisionsPerCollision, collision.globalIndex());
+            int32_t collisionBplusIndex = -1;
+            for (const auto& lcCollisionPerCollision : lcCollisionsPerCollision) { // should only ever be one
+              jethfutilities::fillHFCollisionTable(lcCollisionPerCollision, products.storedBplusCollisionsTable, collisionBplusIndex);
+              products.storedBplusCollisionIdsTable(products.storedJCollisionsTable.lastIndex());
+              BplusCollisionMapping.insert(std::make_pair(lcCollisionPerCollision.globalIndex(), products.storedBplusCollisionsTable.lastIndex()));
+            }
+            const auto lcsPerCollision = Bpluss.sliceBy(BplussPerCollision, collision.globalIndex());
+            for (const auto& Bplus : lcsPerCollision) {
+              int32_t BplusIndex = -1;
+              jethfutilities::fillHFCandidateTable<true>(Bplus, collisionBplusIndex, products.storedBplussTable, products.storedBplusParsTable, products.storedBplusParExtrasTable, products.storedBplusParD0sTable, products.storedBplusSelsDummyTable, products.storedBplusMlsTable, products.storedBplusMlD0sTable, products.storedBplusMcsTable, BplusIndex); // fix me!!
+
+              int32_t prong0Id = -1;
+              int32_t prong1Id = -1;
+              int32_t prong2Id = -1;
+              auto JtrackIndex = trackMapping.find(Bplus.prong0Id());
+              if (JtrackIndex != trackMapping.end()) {
+                prong0Id = JtrackIndex->second;
+              }
+              JtrackIndex = trackMapping.find(Bplus.prong1Id());
+              if (JtrackIndex != trackMapping.end()) {
+                prong1Id = JtrackIndex->second;
+              }
+              JtrackIndex = trackMapping.find(Bplus.prong2Id());
+              if (JtrackIndex != trackMapping.end()) {
+                prong2Id = JtrackIndex->second;
+              }
+              products.storedBplusIdsTable(products.storedJCollisionsTable.lastIndex(), prong0Id, prong1Id, prong2Id);
+            }
+          }
+
           if (config.saveDielectronTable) {
             const auto dielectronCollisionsPerCollision = DielectronCollisions.sliceBy(DielectronCollisionsPerCollision, collision.globalIndex());
             int32_t collisionDielectronIndex = -1;
@@ -862,6 +980,20 @@ struct JetDerivedDataWriter {
             products.storedLcMcCollisionsMatchingTable(lcCollisionIDs);
           }
         }
+
+        if (config.saveBplusTable) {
+          const auto lcMcCollisionsPerMcCollision = BplusMcCollisions.sliceBy(BplusMcCollisionsPerMcCollision, mcCollision.globalIndex());
+          for (const auto& lcMcCollisionPerMcCollision : lcMcCollisionsPerMcCollision) { // should just be one
+            std::vector<int32_t> lcCollisionIDs;
+            for (auto const& lcCollisionPerMcCollision : lcMcCollisionPerMcCollision.template hfCollBases_as<aod::CollisionsBplus>()) {
+              auto lcCollisionIndex = BplusCollisionMapping.find(lcCollisionPerMcCollision.globalIndex());
+              if (lcCollisionIndex != BplusCollisionMapping.end()) {
+                lcCollisionIDs.push_back(lcCollisionIndex->second);
+              }
+            }
+            products.storedBplusMcCollisionsMatchingTable(lcCollisionIDs);
+          }
+        }
       }
     }
   }
@@ -869,7 +1001,7 @@ struct JetDerivedDataWriter {
   // to run after all jet selections
   PROCESS_SWITCH(JetDerivedDataWriter, processStoreMC, "write out data output tables for mc", false);
 
-  void processStoreMCP(soa::Join<aod::JMcCollisions, aod::JMcCollisionPIs> const& mcCollisions, soa::Join<aod::JMcParticles, aod::JMcParticlePIs> const& particles, aod::McCollisionsD0 const& D0McCollisions, aod::CandidatesD0MCP const& D0Particles, aod::McCollisionsLc const& LcMcCollisions, aod::CandidatesLcMCP const& LcParticles, aod::McCollisionsDielectron const& DielectronMcCollisions, aod::CandidatesDielectronMCP const& DielectronParticles)
+  void processStoreMCP(soa::Join<aod::JMcCollisions, aod::JMcCollisionPIs> const& mcCollisions, soa::Join<aod::JMcParticles, aod::JMcParticlePIs> const& particles, aod::McCollisionsD0 const& D0McCollisions, aod::CandidatesD0MCP const& D0Particles, aod::McCollisionsLc const& LcMcCollisions, aod::CandidatesLcMCP const& LcParticles, aod::McCollisionsBplus const& BplusMcCollisions, aod::CandidatesBplusMCP const& BplusParticles, aod::McCollisionsDielectron const& DielectronMcCollisions, aod::CandidatesDielectronMCP const& DielectronParticles)
   {
 
     int particleTableIndex = 0;
@@ -918,12 +1050,12 @@ struct JetDerivedDataWriter {
           const auto d0McCollisionsPerMcCollision = D0McCollisions.sliceBy(D0McCollisionsPerMcCollision, mcCollision.globalIndex());
           int32_t mcCollisionD0Index = -1;
           for (const auto& d0McCollisionPerMcCollision : d0McCollisionsPerMcCollision) { // should only ever be one
-            jethfutilities::fillD0McCollisionTable(d0McCollisionPerMcCollision, products.storedD0McCollisionsTable, mcCollisionD0Index);
+            jethfutilities::fillHFMcCollisionTable(d0McCollisionPerMcCollision, products.storedD0McCollisionsTable, mcCollisionD0Index);
             products.storedD0McCollisionIdsTable(products.storedJMcCollisionsTable.lastIndex());
           }
           for (const auto& D0Particle : D0Particles) {
             int32_t D0ParticleIndex = -1;
-            jethfutilities::fillD0CandidateMcTable(D0Particle, mcCollisionD0Index, products.storedD0ParticlesTable, D0ParticleIndex);
+            jethfutilities::fillHFCandidateMcTable(D0Particle, mcCollisionD0Index, products.storedD0ParticlesTable, D0ParticleIndex);
             int32_t D0ParticleId = -1;
             auto JParticleIndex = paticleMapping.find(D0Particle.mcParticleId());
             if (JParticleIndex != paticleMapping.end()) {
@@ -936,12 +1068,12 @@ struct JetDerivedDataWriter {
           const auto lcMcCollisionsPerMcCollision = LcMcCollisions.sliceBy(LcMcCollisionsPerMcCollision, mcCollision.globalIndex());
           int32_t mcCollisionLcIndex = -1;
           for (const auto& lcMcCollisionPerMcCollision : lcMcCollisionsPerMcCollision) { // should only ever be one
-            jethfutilities::fillLcMcCollisionTable(lcMcCollisionPerMcCollision, products.storedLcMcCollisionsTable, mcCollisionLcIndex);
+            jethfutilities::fillHFMcCollisionTable(lcMcCollisionPerMcCollision, products.storedLcMcCollisionsTable, mcCollisionLcIndex);
             products.storedLcMcCollisionIdsTable(products.storedJMcCollisionsTable.lastIndex());
           }
           for (const auto& LcParticle : LcParticles) {
             int32_t LcParticleIndex = -1;
-            jethfutilities::fillLcCandidateMcTable(LcParticle, mcCollisionLcIndex, products.storedLcParticlesTable, LcParticleIndex);
+            jethfutilities::fillHFCandidateMcTable(LcParticle, mcCollisionLcIndex, products.storedLcParticlesTable, LcParticleIndex);
             int32_t LcParticleId = -1;
             auto JParticleIndex = paticleMapping.find(LcParticle.mcParticleId());
             if (JParticleIndex != paticleMapping.end()) {
@@ -950,6 +1082,24 @@ struct JetDerivedDataWriter {
             products.storedLcParticleIdsTable(products.storedJMcCollisionsTable.lastIndex(), LcParticleId);
           }
         }
+        if (config.saveBplusTable) {
+          const auto lcMcCollisionsPerMcCollision = BplusMcCollisions.sliceBy(BplusMcCollisionsPerMcCollision, mcCollision.globalIndex());
+          int32_t mcCollisionBplusIndex = -1;
+          for (const auto& lcMcCollisionPerMcCollision : lcMcCollisionsPerMcCollision) { // should only ever be one
+            jethfutilities::fillHFMcCollisionTable(lcMcCollisionPerMcCollision, products.storedBplusMcCollisionsTable, mcCollisionBplusIndex);
+            products.storedBplusMcCollisionIdsTable(products.storedJMcCollisionsTable.lastIndex());
+          }
+          for (const auto& BplusParticle : BplusParticles) {
+            int32_t BplusParticleIndex = -1;
+            jethfutilities::fillHFCandidateMcTable(BplusParticle, mcCollisionBplusIndex, products.storedBplusParticlesTable, BplusParticleIndex);
+            int32_t BplusParticleId = -1;
+            auto JParticleIndex = paticleMapping.find(BplusParticle.mcParticleId());
+            if (JParticleIndex != paticleMapping.end()) {
+              BplusParticleId = JParticleIndex->second;
+            }
+            products.storedBplusParticleIdsTable(products.storedJMcCollisionsTable.lastIndex(), BplusParticleId);
+          }
+        }
         if (config.saveDielectronTable) {
           const auto dielectronMcCollisionsPerMcCollision = DielectronMcCollisions.sliceBy(DielectronMcCollisionsPerMcCollision, mcCollision.globalIndex());
           int32_t mcCollisionDielectronIndex = -1;
diff --git a/PWGJE/TableProducer/eventwiseConstituentSubtractor.cxx b/PWGJE/TableProducer/eventwiseConstituentSubtractor.cxx
index 18b1249ed95..f1dae6bb061 100644
--- a/PWGJE/TableProducer/eventwiseConstituentSubtractor.cxx
+++ b/PWGJE/TableProducer/eventwiseConstituentSubtractor.cxx
@@ -163,7 +163,7 @@ struct eventWiseConstituentSubtractorTask {
     analyseHFMc(tracks, candidates, particleSubtractedLcTable);
   }
   PROCESS_SWITCH(eventWiseConstituentSubtractorTask, processLcMcCollisions, "Fill table of subtracted tracks for collisions with Lc MCP candidates", false);
-  /*
+
     void processBplusCollisions(aod::JetCollision const&, soa::Filtered<aod::JetTracks> const& tracks, soa::Join<aod::CandidatesBplusData, aod::BkgBplusRhos> const& candidates)
     {
       analyseHF(tracks, candidates, trackSubtractedBplusTable);
@@ -175,7 +175,7 @@ struct eventWiseConstituentSubtractorTask {
       analyseHFMc(tracks, candidates, particleSubtractedBplusTable);
     }
     PROCESS_SWITCH(eventWiseConstituentSubtractorTask, processBplusMcCollisions, "Fill table of subtracted tracks for collisions with Bplus MCP candidates", false);
-  */
+
   void processDielectronCollisions(aod::JetCollision const&, soa::Filtered<aod::JetTracks> const& tracks, soa::Join<aod::CandidatesDielectronData, aod::BkgDielectronRhos> const& candidates)
   {
     analyseHF(tracks, candidates, trackSubtractedDielectronTable);
diff --git a/PWGJE/TableProducer/rhoEstimator.cxx b/PWGJE/TableProducer/rhoEstimator.cxx
index 83429af3f5b..ff0072f7052 100644
--- a/PWGJE/TableProducer/rhoEstimator.cxx
+++ b/PWGJE/TableProducer/rhoEstimator.cxx
@@ -152,7 +152,7 @@ struct RhoEstimatorTask {
     }
   }
   PROCESS_SWITCH(RhoEstimatorTask, processLcMcCollisions, "Fill rho tables for collisions with Lc MCP candidates", false);
-  /*
+
     void processBplusCollisions(aod::JetCollision const&, soa::Filtered<aod::JetTracks> const& tracks, aod::CandidatesBplusData const& candidates)
     {
       inputParticles.clear();
@@ -178,7 +178,7 @@ struct RhoEstimatorTask {
       }
     }
     PROCESS_SWITCH(RhoEstimatorTask, processBplusMcCollisions, "Fill rho tables for collisions with Bplus MCP candidates", false);
-  */
+
   void processDielectronCollisions(aod::JetCollision const&, soa::Filtered<aod::JetTracks> const& tracks, aod::CandidatesDielectronData const& candidates)
   {
     inputParticles.clear();
diff --git a/PWGJE/Tasks/CMakeLists.txt b/PWGJE/Tasks/CMakeLists.txt
index 50f9600c2ed..4582452a7ab 100644
--- a/PWGJE/Tasks/CMakeLists.txt
+++ b/PWGJE/Tasks/CMakeLists.txt
@@ -60,6 +60,10 @@ if(FastJet_FOUND)
                         SOURCES jetSubstructureLc.cxx
                         PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
                         COMPONENT_NAME Analysis)
+o2physics_add_dpl_workflow(jet-substructure-bplus
+                        SOURCES jetSubstructureBplus.cxx
+                        PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
+                        COMPONENT_NAME Analysis)
     o2physics_add_dpl_workflow(jet-substructure-dielectron
                         SOURCES jetSubstructureDielectron.cxx
                         PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
@@ -72,6 +76,10 @@ if(FastJet_FOUND)
                         SOURCES jetSubstructureLcOutput.cxx
                         PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
                         COMPONENT_NAME Analysis)
+    o2physics_add_dpl_workflow(jet-substructure-bplus-output
+                        SOURCES jetSubstructureBplusOutput.cxx
+                        PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
+                        COMPONENT_NAME Analysis)
     o2physics_add_dpl_workflow(jet-substructure-dielectron-output
                         SOURCES jetSubstructureDielectronOutput.cxx
                         PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
@@ -104,6 +112,10 @@ if(FastJet_FOUND)
                         SOURCES jetFinderLcQA.cxx
                         PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
                         COMPONENT_NAME Analysis)
+    o2physics_add_dpl_workflow(jet-finder-bplus-qa
+                        SOURCES jetFinderBplusQA.cxx
+                        PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
+                        COMPONENT_NAME Analysis)
     o2physics_add_dpl_workflow(jet-finder-dielectron-qa
                         SOURCES jetFinderDielectronQA.cxx
                         PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
diff --git a/PWGJE/Tasks/jetFinderBplusQA.cxx b/PWGJE/Tasks/jetFinderBplusQA.cxx
new file mode 100644
index 00000000000..4b7c42b4580
--- /dev/null
+++ b/PWGJE/Tasks/jetFinderBplusQA.cxx
@@ -0,0 +1,27 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet finder B+ charged QA task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/Tasks/jetFinderHFQA.cxx"
+
+using JetFinderBplusQATask = JetFinderHFQATask<aod::BplusChargedJets, aod::BplusChargedJetConstituents, aod::BplusChargedJetsMatchedToBplusChargedEventWiseSubtractedJets, aod::CandidatesBplusData, aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents, aod::BplusChargedMCDetectorLevelJetsMatchedToBplusChargedMCParticleLevelJets, aod::BplusChargedMCDetectorLevelJetEventWeights, aod::CandidatesBplusMCD, aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents, aod::BplusChargedMCParticleLevelJetsMatchedToBplusChargedMCDetectorLevelJets, aod::BplusChargedMCParticleLevelJetEventWeights, aod::BplusChargedEventWiseSubtractedJets, aod::BplusChargedEventWiseSubtractedJetConstituents, aod::BplusChargedEventWiseSubtractedJetsMatchedToBplusChargedJets, aod::CandidatesBplusMCP, aod::JTrackBplusSubs, aod::BkgBplusRhos>;
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+  tasks.emplace_back(adaptAnalysisTask<JetFinderBplusQATask>(cfgc,
+                                                             SetDefaultProcesses{},
+                                                             TaskName{"jet-finder-charged-bplus-qa"}));
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/Tasks/jetSubstructureBplus.cxx b/PWGJE/Tasks/jetSubstructureBplus.cxx
new file mode 100644
index 00000000000..61228fe5b19
--- /dev/null
+++ b/PWGJE/Tasks/jetSubstructureBplus.cxx
@@ -0,0 +1,27 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet substructure B+ charged task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/Tasks/jetSubstructureHF.cxx"
+
+using JetSubstructureBplus = JetSubstructureHFTask<soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents>, soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>, soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>, soa::Join<aod::BplusChargedEventWiseSubtractedJets, aod::BplusChargedEventWiseSubtractedJetConstituents>, aod::CandidatesBplusData, aod::CandidatesBplusMCP, aod::BplusCJetSSs, aod::BplusCMCDJetSSs, aod::BplusCMCPJetSSs, aod::BplusCEWSJetSSs, aod::JTrackBplusSubs>;
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+  tasks.emplace_back(adaptAnalysisTask<JetSubstructureBplus>(cfgc,
+                                                             SetDefaultProcesses{},
+                                                             TaskName{"jet-substructure-bplus"}));
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/Tasks/jetSubstructureBplusOutput.cxx b/PWGJE/Tasks/jetSubstructureBplusOutput.cxx
new file mode 100644
index 00000000000..89c0b94560f
--- /dev/null
+++ b/PWGJE/Tasks/jetSubstructureBplusOutput.cxx
@@ -0,0 +1,26 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// jet substructure output B+ charged task
+//
+/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
+
+#include "PWGJE/Tasks/jetSubstructureHFOutput.cxx"
+
+using JetSubstructureOutputBplus = JetSubstructureHFOutputTask<aod::CollisionsBplus, soa::Join<aod::McCollisionsBplus, aod::HfBplusMcRCollIds>, aod::CandidatesBplusData, aod::CandidatesBplusMCD, aod::CandidatesBplusMCP, aod::JTrackBplusSubs, soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents, aod::BplusCJetSSs>, soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents, aod::BplusCJetSSs, aod::BplusChargedJetsMatchedToBplusChargedEventWiseSubtractedJets>, aod::BplusCJetCOs, aod::BplusCJetOs, aod::BplusCJetSSOs, aod::BplusCJetMOs, soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents, aod::BplusCMCDJetSSs, aod::BplusChargedMCDetectorLevelJetsMatchedToBplusChargedMCParticleLevelJets>, aod::BplusCMCDJetCOs, aod::BplusCMCDJetOs, aod::BplusCMCDJetSSOs, aod::BplusCMCDJetMOs, soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents, aod::BplusCMCPJetSSs, aod::BplusChargedMCParticleLevelJetsMatchedToBplusChargedMCDetectorLevelJets>, aod::BplusCMCPJetCOs, aod::BplusCMCPJetOs, aod::BplusCMCPJetSSOs, aod::BplusCMCPJetMOs, soa::Join<aod::BplusChargedEventWiseSubtractedJets, aod::BplusChargedEventWiseSubtractedJetConstituents, aod::BplusCEWSJetSSs, aod::BplusChargedEventWiseSubtractedJetsMatchedToBplusChargedJets>, aod::BplusCEWSJetCOs, aod::BplusCEWSJetOs, aod::BplusCEWSJetSSOs, aod::BplusCEWSJetMOs, aod::StoredHfBplusCollBase, aod::StoredHfBplusBases, aod::StoredHfBplusPars, aod::StoredHfBplusParEs, aod::StoredHfBplusParD0s, aod::JDumBplusSels, aod::StoredHfBplusMls, aod::StoredHfBplusMlD0s, aod::StoredHfBplusMcs, aod::StoredHfBplusMcCollBases, aod::StoredHfBplusMcRCollIds, aod::StoredHfBplusPBases>; // all the 3P tables have been made into Bplus but they might be made common
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  std::vector<o2::framework::DataProcessorSpec> tasks;
+  tasks.emplace_back(adaptAnalysisTask<JetSubstructureOutputBplus>(cfgc, SetDefaultProcesses{}, TaskName{"jet-substructure-bplus-output"}));
+
+  return WorkflowSpec{tasks};
+}
diff --git a/PWGJE/Tasks/jetSubstructureD0Output.cxx b/PWGJE/Tasks/jetSubstructureD0Output.cxx
index d53894fba01..7eb6b474eaf 100644
--- a/PWGJE/Tasks/jetSubstructureD0Output.cxx
+++ b/PWGJE/Tasks/jetSubstructureD0Output.cxx
@@ -15,7 +15,7 @@
 
 #include "PWGJE/Tasks/jetSubstructureHFOutput.cxx"
 
-using JetSubstructureOutputD0 = JetSubstructureHFOutputTask<aod::CollisionsD0, soa::Join<aod::McCollisionsD0, aod::HfD0McRCollIds>, aod::CandidatesD0Data, aod::CandidatesD0MCD, aod::CandidatesD0MCP, aod::JTrackD0Subs, soa::Join<aod::D0ChargedJets, aod::D0ChargedJetConstituents, aod::D0CJetSSs>, soa::Join<aod::D0ChargedJets, aod::D0ChargedJetConstituents, aod::D0CJetSSs, aod::D0ChargedJetsMatchedToD0ChargedEventWiseSubtractedJets>, aod::D0CJetCOs, aod::D0CJetOs, aod::D0CJetSSOs, aod::D0CJetMOs, soa::Join<aod::D0ChargedMCDetectorLevelJets, aod::D0ChargedMCDetectorLevelJetConstituents, aod::D0CMCDJetSSs, aod::D0ChargedMCDetectorLevelJetsMatchedToD0ChargedMCParticleLevelJets>, aod::D0CMCDJetCOs, aod::D0CMCDJetOs, aod::D0CMCDJetSSOs, aod::D0CMCDJetMOs, soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents, aod::D0CMCPJetSSs, aod::D0ChargedMCParticleLevelJetsMatchedToD0ChargedMCDetectorLevelJets>, aod::D0CMCPJetCOs, aod::D0CMCPJetOs, aod::D0CMCPJetSSOs, aod::D0CMCPJetMOs, soa::Join<aod::D0ChargedEventWiseSubtractedJets, aod::D0ChargedEventWiseSubtractedJetConstituents, aod::D0CEWSJetSSs, aod::D0ChargedEventWiseSubtractedJetsMatchedToD0ChargedJets>, aod::D0CEWSJetCOs, aod::D0CEWSJetOs, aod::D0CEWSJetSSOs, aod::D0CEWSJetMOs, aod::StoredHfD0CollBase, aod::StoredHfD0Bases, aod::StoredHfD0Pars, aod::StoredHfD0ParEs, aod::StoredHfD0Sels, aod::StoredHfD0Mls, aod::StoredHfD0Mcs, aod::StoredHfD0McCollBases, aod::StoredHfD0McRCollIds, aod::StoredHfD0PBases>;
+using JetSubstructureOutputD0 = JetSubstructureHFOutputTask<aod::CollisionsD0, soa::Join<aod::McCollisionsD0, aod::HfD0McRCollIds>, aod::CandidatesD0Data, aod::CandidatesD0MCD, aod::CandidatesD0MCP, aod::JTrackD0Subs, soa::Join<aod::D0ChargedJets, aod::D0ChargedJetConstituents, aod::D0CJetSSs>, soa::Join<aod::D0ChargedJets, aod::D0ChargedJetConstituents, aod::D0CJetSSs, aod::D0ChargedJetsMatchedToD0ChargedEventWiseSubtractedJets>, aod::D0CJetCOs, aod::D0CJetOs, aod::D0CJetSSOs, aod::D0CJetMOs, soa::Join<aod::D0ChargedMCDetectorLevelJets, aod::D0ChargedMCDetectorLevelJetConstituents, aod::D0CMCDJetSSs, aod::D0ChargedMCDetectorLevelJetsMatchedToD0ChargedMCParticleLevelJets>, aod::D0CMCDJetCOs, aod::D0CMCDJetOs, aod::D0CMCDJetSSOs, aod::D0CMCDJetMOs, soa::Join<aod::D0ChargedMCParticleLevelJets, aod::D0ChargedMCParticleLevelJetConstituents, aod::D0CMCPJetSSs, aod::D0ChargedMCParticleLevelJetsMatchedToD0ChargedMCDetectorLevelJets>, aod::D0CMCPJetCOs, aod::D0CMCPJetOs, aod::D0CMCPJetSSOs, aod::D0CMCPJetMOs, soa::Join<aod::D0ChargedEventWiseSubtractedJets, aod::D0ChargedEventWiseSubtractedJetConstituents, aod::D0CEWSJetSSs, aod::D0ChargedEventWiseSubtractedJetsMatchedToD0ChargedJets>, aod::D0CEWSJetCOs, aod::D0CEWSJetOs, aod::D0CEWSJetSSOs, aod::D0CEWSJetMOs, aod::StoredHfD0CollBase, aod::StoredHfD0Bases, aod::StoredHfD0Pars, aod::StoredHfD0ParEs, aod::JDumD0ParDaus, aod::StoredHfD0Sels, aod::StoredHfD0Mls, aod::JDumD0MlDaus, aod::StoredHfD0Mcs, aod::StoredHfD0McCollBases, aod::StoredHfD0McRCollIds, aod::StoredHfD0PBases>;
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/PWGJE/Tasks/jetSubstructureDielectronOutput.cxx b/PWGJE/Tasks/jetSubstructureDielectronOutput.cxx
index 2e1e7eb12df..76cdd6e7643 100644
--- a/PWGJE/Tasks/jetSubstructureDielectronOutput.cxx
+++ b/PWGJE/Tasks/jetSubstructureDielectronOutput.cxx
@@ -15,7 +15,7 @@
 
 #include "PWGJE/Tasks/jetSubstructureHFOutput.cxx"
 
-using JetSubstructureOutputDielectron = JetSubstructureHFOutputTask<aod::CollisionsDielectron, aod::McCollisionsDielectron, aod::CandidatesDielectronData, aod::CandidatesDielectronMCD, aod::CandidatesDielectronMCP, aod::JTrackDielectronSubs, soa::Join<aod::DielectronChargedJets, aod::DielectronChargedJetConstituents, aod::DielectronCJetSSs>, soa::Join<aod::DielectronChargedJets, aod::DielectronChargedJetConstituents, aod::DielectronCJetSSs, aod::DielectronChargedJetsMatchedToDielectronChargedEventWiseSubtractedJets>, aod::DielectronCJetCOs, aod::DielectronCJetOs, aod::DielectronCJetSSOs, aod::DielectronCJetMOs, soa::Join<aod::DielectronChargedMCDetectorLevelJets, aod::DielectronChargedMCDetectorLevelJetConstituents, aod::DielectronCMCDJetSSs, aod::DielectronChargedMCDetectorLevelJetsMatchedToDielectronChargedMCParticleLevelJets>, aod::DielectronCMCDJetCOs, aod::DielectronCMCDJetOs, aod::DielectronCMCDJetSSOs, aod::DielectronCMCDJetMOs, soa::Join<aod::DielectronChargedMCParticleLevelJets, aod::DielectronChargedMCParticleLevelJetConstituents, aod::DielectronCMCPJetSSs, aod::DielectronChargedMCParticleLevelJetsMatchedToDielectronChargedMCDetectorLevelJets>, aod::DielectronCMCPJetCOs, aod::DielectronCMCPJetOs, aod::DielectronCMCPJetSSOs, aod::DielectronCMCPJetMOs, soa::Join<aod::DielectronChargedEventWiseSubtractedJets, aod::DielectronChargedEventWiseSubtractedJetConstituents, aod::DielectronCEWSJetSSs, aod::DielectronChargedEventWiseSubtractedJetsMatchedToDielectronChargedJets>, aod::DielectronCEWSJetCOs, aod::DielectronCEWSJetOs, aod::DielectronCEWSJetSSOs, aod::DielectronCEWSJetMOs, aod::StoredReducedEvents, aod::StoredDielectrons, aod::JDielectron1Dummys, aod::JDielectron2Dummys, aod::JDielectron3Dummys, aod::JDielectron4Dummys, aod::JDielectron5Dummys, aod::StoredJDielectronMcCollisions, aod::JDielectron6Dummys, aod::StoredJDielectronMcs>;
+using JetSubstructureOutputDielectron = JetSubstructureHFOutputTask<aod::CollisionsDielectron, aod::McCollisionsDielectron, aod::CandidatesDielectronData, aod::CandidatesDielectronMCD, aod::CandidatesDielectronMCP, aod::JTrackDielectronSubs, soa::Join<aod::DielectronChargedJets, aod::DielectronChargedJetConstituents, aod::DielectronCJetSSs>, soa::Join<aod::DielectronChargedJets, aod::DielectronChargedJetConstituents, aod::DielectronCJetSSs, aod::DielectronChargedJetsMatchedToDielectronChargedEventWiseSubtractedJets>, aod::DielectronCJetCOs, aod::DielectronCJetOs, aod::DielectronCJetSSOs, aod::DielectronCJetMOs, soa::Join<aod::DielectronChargedMCDetectorLevelJets, aod::DielectronChargedMCDetectorLevelJetConstituents, aod::DielectronCMCDJetSSs, aod::DielectronChargedMCDetectorLevelJetsMatchedToDielectronChargedMCParticleLevelJets>, aod::DielectronCMCDJetCOs, aod::DielectronCMCDJetOs, aod::DielectronCMCDJetSSOs, aod::DielectronCMCDJetMOs, soa::Join<aod::DielectronChargedMCParticleLevelJets, aod::DielectronChargedMCParticleLevelJetConstituents, aod::DielectronCMCPJetSSs, aod::DielectronChargedMCParticleLevelJetsMatchedToDielectronChargedMCDetectorLevelJets>, aod::DielectronCMCPJetCOs, aod::DielectronCMCPJetOs, aod::DielectronCMCPJetSSOs, aod::DielectronCMCPJetMOs, soa::Join<aod::DielectronChargedEventWiseSubtractedJets, aod::DielectronChargedEventWiseSubtractedJetConstituents, aod::DielectronCEWSJetSSs, aod::DielectronChargedEventWiseSubtractedJetsMatchedToDielectronChargedJets>, aod::DielectronCEWSJetCOs, aod::DielectronCEWSJetOs, aod::DielectronCEWSJetSSOs, aod::DielectronCEWSJetMOs, aod::StoredReducedEvents, aod::StoredDielectrons, aod::JDielectron1Dummys, aod::JDielectron2Dummys, aod::JDielectron3Dummys, aod::JDielectron4Dummys, aod::JDielectron5Dummys, aod::JDielectron6Dummys, aod::JDielectron7Dummys, aod::StoredJDielectronMcCollisions, aod::JDielectron8Dummys, aod::StoredJDielectronMcs>;
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
diff --git a/PWGJE/Tasks/jetSubstructureHF.cxx b/PWGJE/Tasks/jetSubstructureHF.cxx
index 16bcd3acd13..2ad5ddb4bac 100644
--- a/PWGJE/Tasks/jetSubstructureHF.cxx
+++ b/PWGJE/Tasks/jetSubstructureHF.cxx
@@ -291,4 +291,3 @@ struct JetSubstructureHFTask {
   }
   PROCESS_SWITCH(JetSubstructureHFTask, processChargedJetsMCP, "HF jet substructure on MC particle level", false);
 };
-// using JetSubstructureBplus = JetSubstructureHFTask<soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents>,soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents>,soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents>,soa::Join<aod::BplusChargedEventWiseSubtractedJets, aod::BplusChargedEventWiseSubtractedJetConstituents>, aod::CandidatesBplusData, aod::CandidatesBplusMCP, aod::BplusCJetSSs,aod::BplusCMCDJetSSs,aod::BplusCMCPJetSSs, aod::BplusCEWSJetSSs, aod::JTrackBplusSubs>;
diff --git a/PWGJE/Tasks/jetSubstructureHFOutput.cxx b/PWGJE/Tasks/jetSubstructureHFOutput.cxx
index f0ca793c4a9..d651f2d8e5b 100644
--- a/PWGJE/Tasks/jetSubstructureHFOutput.cxx
+++ b/PWGJE/Tasks/jetSubstructureHFOutput.cxx
@@ -42,7 +42,7 @@ using namespace o2::framework::expressions;
 // NB: runDataProcessing.h must be included after customize!
 #include "Framework/runDataProcessing.h"
 
-template <typename CandidateCollisionTable, typename CandidateMcCollisionTable, typename CandidateTable, typename CandidateTableMCD, typename CandidateTableMCP, typename TracksSub, typename JetTableData, typename JetMatchedTableData, typename OutputCollisionTableData, typename OutputTableData, typename SubstructureOutputTableData, typename MatchingOutputTableData, typename JetTableMCD, typename OutputCollisionTableMCD, typename OutputTableMCD, typename SubstructureOutputTableMCD, typename MatchingOutputTableMCD, typename JetTableMCP, typename OutputCollisionTableMCP, typename OutputTableMCP, typename SubstructureOutputTableMCP, typename MatchingOutputTableMCP, typename JetTableDataSub, typename OutputCollisionTableDataSub, typename OutputTableDataSub, typename SubstructureOutputTableDataSub, typename MatchingOutputTableDataSub, typename CandidateCollisionOutputTable, typename CandidateOutputTable, typename CandidateParOutputTable, typename CandidateParExtraOutputTable, typename CandidateSelOutputTable, typename CandidateMlOutputTable, typename CandidateMCDOutputTable, typename CandidateMcCollisionOutputTable, typename CandidateMcCollisionMatchingOutputTable, typename CandidateMCPOutputTable>
+template <typename CandidateCollisionTable, typename CandidateMcCollisionTable, typename CandidateTable, typename CandidateTableMCD, typename CandidateTableMCP, typename TracksSub, typename JetTableData, typename JetMatchedTableData, typename OutputCollisionTableData, typename OutputTableData, typename SubstructureOutputTableData, typename MatchingOutputTableData, typename JetTableMCD, typename OutputCollisionTableMCD, typename OutputTableMCD, typename SubstructureOutputTableMCD, typename MatchingOutputTableMCD, typename JetTableMCP, typename OutputCollisionTableMCP, typename OutputTableMCP, typename SubstructureOutputTableMCP, typename MatchingOutputTableMCP, typename JetTableDataSub, typename OutputCollisionTableDataSub, typename OutputTableDataSub, typename SubstructureOutputTableDataSub, typename MatchingOutputTableDataSub, typename CandidateCollisionOutputTable, typename CandidateOutputTable, typename CandidateParOutputTable, typename CandidateParExtraOutputTable, typename CandidateParDaughterOutputTable, typename CandidateSelOutputTable, typename CandidateMlOutputTable, typename CandidateMlDaughterOutputTable, typename CandidateMCDOutputTable, typename CandidateMcCollisionOutputTable, typename CandidateMcCollisionMatchingOutputTable, typename CandidateMCPOutputTable>
 struct JetSubstructureHFOutputTask {
 
   Produces<OutputCollisionTableData> collisionOutputTableData;
@@ -65,8 +65,10 @@ struct JetSubstructureHFOutputTask {
   Produces<CandidateOutputTable> candidateTable;
   Produces<CandidateParOutputTable> candidateParsTable;
   Produces<CandidateParExtraOutputTable> candidateParExtrasTable;
+  Produces<CandidateParDaughterOutputTable> candidateParsDaughterTable;
   Produces<CandidateSelOutputTable> candidateSelsTable;
   Produces<CandidateMlOutputTable> candidateMlsTable;
+  Produces<CandidateMlDaughterOutputTable> candidateMlsDaughterTable;
   Produces<CandidateMCDOutputTable> candidateMcsTable;
   Produces<CandidateMcCollisionOutputTable> hfMcCollisionsTable;
   Produces<CandidateMcCollisionMatchingOutputTable> hfMcCollisionsMatchingTable;
@@ -102,9 +104,11 @@ struct JetSubstructureHFOutputTask {
   PresliceUnsorted<soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>> CollisionsPerMcCollision = aod::jmccollisionlb::mcCollisionId;
   PresliceOptional<aod::CollisionsD0> D0CollisionsPerCollision = aod::jd0indices::collisionId;
   PresliceOptional<aod::CollisionsLc> LcCollisionsPerCollision = aod::jlcindices::collisionId;
+  PresliceOptional<aod::CollisionsBplus> BplusCollisionsPerCollision = aod::jbplusindices::collisionId;
   PresliceOptional<aod::CollisionsDielectron> DielectronCollisionsPerCollision = aod::jdielectronindices::collisionId;
   PresliceOptional<soa::Join<aod::McCollisionsD0, aod::HfD0McRCollIds>> D0McCollisionsPerMcCollision = aod::jd0indices::mcCollisionId;
-  PresliceOptional<soa::Join<aod::McCollisionsLc, aod::Hf3PMcRCollIds>> LcMcCollisionsPerMcCollision = aod::jlcindices::mcCollisionId;
+  PresliceOptional<soa::Join<aod::McCollisionsLc, aod::HfLcMcRCollIds>> LcMcCollisionsPerMcCollision = aod::jlcindices::mcCollisionId;
+  PresliceOptional<soa::Join<aod::McCollisionsBplus, aod::HfBplusMcRCollIds>> BplusMcCollisionsPerMcCollision = aod::jbplusindices::mcCollisionId;
   PresliceOptional<aod::McCollisionsDielectron> DielectronMcCollisionsPerMcCollision = aod::jdielectronindices::mcCollisionId;
 
   void init(InitContext const&)
@@ -207,7 +211,7 @@ struct JetSubstructureHFOutputTask {
             if (hfCollisionIndex != candidateCollisionMapping.end()) {
               candidateCollisionIndex = hfCollisionIndex->second;
             }
-            jetcandidateutilities::fillCandidateTable<isMCD>(candidate, candidateCollisionIndex, candidateTable, candidateParsTable, candidateParExtrasTable, candidateSelsTable, candidateMlsTable, candidateMcsTable, candidateIndex);
+            jetcandidateutilities::fillCandidateTable<isMCD>(candidate, candidateCollisionIndex, candidateTable, candidateParsTable, candidateParExtrasTable, candidateParsDaughterTable, candidateSelsTable, candidateMlsTable, candidateMlsDaughterTable, candidateMcsTable, candidateIndex);
           }
           candidateMap.insert(std::make_pair(candidate.globalIndex(), candidateIndex));
         }
@@ -322,7 +326,7 @@ struct JetSubstructureHFOutputTask {
     if constexpr (!isMCPOnly) {
       for (const auto& collision : collisions) {
         if (collisionFlag[collision.globalIndex()]) {
-          const auto hfCollisionsPerCollision = jetcandidateutilities::slicedPerCandidateCollision(hfCollisions, candidates, collision, D0CollisionsPerCollision, LcCollisionsPerCollision, D0CollisionsPerCollision, DielectronCollisionsPerCollision); // add Bplus later
+          const auto hfCollisionsPerCollision = jetcandidateutilities::slicedPerCandidateCollision(hfCollisions, candidates, collision, D0CollisionsPerCollision, LcCollisionsPerCollision, BplusCollisionsPerCollision, DielectronCollisionsPerCollision); // add Bplus later
           int32_t candidateCollisionIndex = -1;
           for (const auto& hfCollisionPerCollision : hfCollisionsPerCollision) { // should only ever be one
             auto hfCollisionTableIndex = candidateCollisionMapping.find(hfCollisionPerCollision.globalIndex());
@@ -338,7 +342,7 @@ struct JetSubstructureHFOutputTask {
     if constexpr (isMC) {
       for (const auto& mcCollision : mcCollisions) {
         if (mcCollisionFlag[mcCollision.globalIndex()]) {
-          const auto hfMcCollisionsPerMcCollision = jetcandidateutilities::slicedPerCandidateCollision(hfMcCollisions, candidatesMCP, mcCollision, D0McCollisionsPerMcCollision, LcMcCollisionsPerMcCollision, D0McCollisionsPerMcCollision, DielectronMcCollisionsPerMcCollision); // add Bplus later
+          const auto hfMcCollisionsPerMcCollision = jetcandidateutilities::slicedPerCandidateCollision(hfMcCollisions, candidatesMCP, mcCollision, D0McCollisionsPerMcCollision, LcMcCollisionsPerMcCollision, BplusMcCollisionsPerMcCollision, DielectronMcCollisionsPerMcCollision); // add Bplus later
           int32_t candidateMcCollisionIndex = -1;
           for (const auto& hfMcCollisionPerMcCollision : hfMcCollisionsPerMcCollision) { // should only ever be one
             auto hfMcCollisionTableIndex = candidateMcCollisionMapping.find(hfMcCollisionPerMcCollision.globalIndex());
@@ -499,4 +503,3 @@ struct JetSubstructureHFOutputTask {
   }
   PROCESS_SWITCH(JetSubstructureHFOutputTask, processOutputMatchingMC, "jet matching output MC", false);
 };
-// using JetSubstructureOutputBplus = JetSubstructureHFOutputTask<aod::HfBplusCollBases, soa::Join<aod::StoredHfBplusMcCollBases, aod::JBplusMcCollisionIds, aod::HfBplusMcRCollIds>, aod::CandidatesBplusData, aod::CandidatesBplusMCD, aod::CandidatesBplusMCP, aod::JTrackBplusSubs, soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents, aod::BplusCJetSSs>, soa::Join<aod::BplusChargedJets, aod::BplusChargedJetConstituents, aod::BplusCJetSSs, aod::BplusChargedJetsMatchedToBplusChargedEventWiseSubtractedJets>, aod::BplusCJetCOs, aod::BplusCJetOs, aod::BplusCJetSSOs, aod::BplusCJetMOs, soa::Join<aod::BplusChargedMCDetectorLevelJets, aod::BplusChargedMCDetectorLevelJetConstituents, aod::BplusCMCDJetSSs, aod::BplusChargedMCDetectorLevelJetsMatchedToBplusChargedMCParticleLevelJets>, aod::BplusCMCDJetCOs, aod::BplusCMCDJetOs, aod::BplusCMCDJetSSOs,  aod::BplusCMCDJetMOs, soa::Join<aod::BplusChargedMCParticleLevelJets, aod::BplusChargedMCParticleLevelJetConstituents, aod::BplusCMCPJetSSs, aod::BplusChargedMCParticleLevelJetsMatchedToBplusChargedMCDetectorLevelJets>, aod::BplusCMCPJetCOs, aod::BplusCMCPJetOs, aod::BplusCMCPJetSSOs, aod::BplusCMCPJetMOs, soa::Join<aod::BplusChargedEventWiseSubtractedJets, aod::BplusChargedEventWiseSubtractedJetConstituents, aod::BplusCEWSJetSSs, aod::BplusChargedEventWiseSubtractedJetsMatchedToBplusChargedJets>, aod::BplusCEWSJetCOs, aod::BplusCEWSJetOs, aod::BplusCEWSJetSSOs, aod::BplusCEWSJetMOs, aod::StoredHfBplusCollBase, aod::StoredHfBplusBases, aod::StoredHfBplusPars, aod::StoredHfBplusParEs, aod::StoredHfBplusSels, aod::StoredHfBplusMls, aod::StoredHfBplusMcs, aod::StoredHfBplusPBases>;
diff --git a/PWGJE/Tasks/jetSubstructureLcOutput.cxx b/PWGJE/Tasks/jetSubstructureLcOutput.cxx
index 34361a1148e..dad7b2a52b5 100644
--- a/PWGJE/Tasks/jetSubstructureLcOutput.cxx
+++ b/PWGJE/Tasks/jetSubstructureLcOutput.cxx
@@ -15,7 +15,7 @@
 
 #include "PWGJE/Tasks/jetSubstructureHFOutput.cxx"
 
-using JetSubstructureOutputLc = JetSubstructureHFOutputTask<aod::CollisionsLc, soa::Join<aod::McCollisionsLc, aod::Hf3PMcRCollIds>, aod::CandidatesLcData, aod::CandidatesLcMCD, aod::CandidatesLcMCP, aod::JTrackLcSubs, soa::Join<aod::LcChargedJets, aod::LcChargedJetConstituents, aod::LcCJetSSs>, soa::Join<aod::LcChargedJets, aod::LcChargedJetConstituents, aod::LcCJetSSs, aod::LcChargedJetsMatchedToLcChargedEventWiseSubtractedJets>, aod::LcCJetCOs, aod::LcCJetOs, aod::LcCJetSSOs, aod::LcCJetMOs, soa::Join<aod::LcChargedMCDetectorLevelJets, aod::LcChargedMCDetectorLevelJetConstituents, aod::LcCMCDJetSSs, aod::LcChargedMCDetectorLevelJetsMatchedToLcChargedMCParticleLevelJets>, aod::LcCMCDJetCOs, aod::LcCMCDJetOs, aod::LcCMCDJetSSOs, aod::LcCMCDJetMOs, soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents, aod::LcCMCPJetSSs, aod::LcChargedMCParticleLevelJetsMatchedToLcChargedMCDetectorLevelJets>, aod::LcCMCPJetCOs, aod::LcCMCPJetOs, aod::LcCMCPJetSSOs, aod::LcCMCPJetMOs, soa::Join<aod::LcChargedEventWiseSubtractedJets, aod::LcChargedEventWiseSubtractedJetConstituents, aod::LcCEWSJetSSs, aod::LcChargedEventWiseSubtractedJetsMatchedToLcChargedJets>, aod::LcCEWSJetCOs, aod::LcCEWSJetOs, aod::LcCEWSJetSSOs, aod::LcCEWSJetMOs, aod::StoredHf3PCollBase, aod::StoredHf3PBases, aod::StoredHf3PPars, aod::StoredHf3PParEs, aod::StoredHf3PSels, aod::StoredHf3PMls, aod::StoredHf3PMcs, aod::StoredHf3PMcCollBases, aod::StoredHf3PMcRCollIds, aod::StoredHf3PPBases>;
+using JetSubstructureOutputLc = JetSubstructureHFOutputTask<aod::CollisionsLc, soa::Join<aod::McCollisionsLc, aod::HfLcMcRCollIds>, aod::CandidatesLcData, aod::CandidatesLcMCD, aod::CandidatesLcMCP, aod::JTrackLcSubs, soa::Join<aod::LcChargedJets, aod::LcChargedJetConstituents, aod::LcCJetSSs>, soa::Join<aod::LcChargedJets, aod::LcChargedJetConstituents, aod::LcCJetSSs, aod::LcChargedJetsMatchedToLcChargedEventWiseSubtractedJets>, aod::LcCJetCOs, aod::LcCJetOs, aod::LcCJetSSOs, aod::LcCJetMOs, soa::Join<aod::LcChargedMCDetectorLevelJets, aod::LcChargedMCDetectorLevelJetConstituents, aod::LcCMCDJetSSs, aod::LcChargedMCDetectorLevelJetsMatchedToLcChargedMCParticleLevelJets>, aod::LcCMCDJetCOs, aod::LcCMCDJetOs, aod::LcCMCDJetSSOs, aod::LcCMCDJetMOs, soa::Join<aod::LcChargedMCParticleLevelJets, aod::LcChargedMCParticleLevelJetConstituents, aod::LcCMCPJetSSs, aod::LcChargedMCParticleLevelJetsMatchedToLcChargedMCDetectorLevelJets>, aod::LcCMCPJetCOs, aod::LcCMCPJetOs, aod::LcCMCPJetSSOs, aod::LcCMCPJetMOs, soa::Join<aod::LcChargedEventWiseSubtractedJets, aod::LcChargedEventWiseSubtractedJetConstituents, aod::LcCEWSJetSSs, aod::LcChargedEventWiseSubtractedJetsMatchedToLcChargedJets>, aod::LcCEWSJetCOs, aod::LcCEWSJetOs, aod::LcCEWSJetSSOs, aod::LcCEWSJetMOs, aod::StoredHfLcCollBase, aod::StoredHfLcBases, aod::StoredHfLcPars, aod::StoredHfLcParEs, aod::JDumLcParDaus, aod::StoredHfLcSels, aod::StoredHfLcMls, aod::JDumLcMlDaus, aod::StoredHfLcMcs, aod::StoredHfLcMcCollBases, aod::StoredHfLcMcRCollIds, aod::StoredHfLcPBases>;
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {