diff --git a/PWGDQ/Tasks/taskJpsiHf.cxx b/PWGDQ/Tasks/taskJpsiHf.cxx
index b41950b4056..2c5135e93ba 100644
--- a/PWGDQ/Tasks/taskJpsiHf.cxx
+++ b/PWGDQ/Tasks/taskJpsiHf.cxx
@@ -33,6 +33,7 @@
 
 #include <TH1.h>
 
+#include <algorithm>
 #include <array>
 #include <cstdlib>
 #include <memory>
@@ -55,10 +56,16 @@ static const std::vector<std::string> labelsPt{};
 static const std::vector<std::string> labelsCutsBdt = {"BDT background", "BDT prompt", "BDT nonprompt"};
 } // namespace bdtcuts
 
+enum class DmesonType {
+  D0,
+  Dplus
+};
+
 // Declarations of various short names
 using MyRedEvents = aod::RedJpDmColls;
 using MyRedPairCandidatesSelected = aod::RedJpDmDileptons;
 using MyRedD0CandidatesSelected = soa::Join<aod::RedJpDmDmesons, aod::RedJpDmD0Masss, aod::RedJpDmDmesBdts, aod::RedJpDmDmDau0s, aod::RedJpDmDmDau1s>;
+using MyRedDplusCandidatesSelected = soa::Join<aod::RedJpDmDmesons, aod::RedJpDmDmesMasss, aod::RedJpDmDplusBdts, aod::RedJpDmDmDau0s, aod::RedJpDmDmDau1s, aod::RedJpDmDmDau2s>;
 
 struct taskJPsiHf {
   //
@@ -80,7 +87,8 @@ struct taskJPsiHf {
 
   // Preslices for unsorted indexes
   PresliceUnsorted<MyRedPairCandidatesSelected> perCollisionDilepton = aod::jpsidmescorr::redJpDmCollId;
-  PresliceUnsorted<MyRedD0CandidatesSelected> perCollisionDmeson = aod::jpsidmescorr::redJpDmCollId;
+  PresliceUnsorted<MyRedD0CandidatesSelected> perCollisionD0 = aod::jpsidmescorr::redJpDmCollId;
+  PresliceUnsorted<MyRedDplusCandidatesSelected> perCollisionDplus = aod::jpsidmescorr::redJpDmCollId;
 
   // histogram for normalisation
   std::shared_ptr<TH1> hCollisions;
@@ -95,7 +103,7 @@ struct taskJPsiHf {
 
   // Template function to run pair - hadron combinations
   // TODO: generalise to all charm-hadron species
-  template <typename TEvent, typename TDqTrack, typename THfTrack>
+  template <DmesonType TDmeson, typename TEvent, typename TDqTrack, typename THfTrack>
   void runDileptonDmeson(TEvent const& /*event*/, TDqTrack const& dileptons, THfTrack const& dmesons)
   {
     float ptDilepton = -999;
@@ -123,29 +131,55 @@ struct taskJPsiHf {
           continue;
         }
 
-        auto minItsClsDmesDau = (dmeson.numItsClsDmesProng0() < dmeson.numItsClsDmesProng1()) ? dmeson.numItsClsDmesProng0() : dmeson.numItsClsDmesProng1();
-        auto minTpcCrossRowsDmesDau = (dmeson.numTpcCrossedRowsDmesProng0() < dmeson.numTpcCrossedRowsDmesProng1()) ? dmeson.numTpcCrossedRowsDmesProng0() : dmeson.numTpcCrossedRowsDmesProng1();
-        auto minPtDmesDau = (dmeson.ptDmesProng0() < dmeson.ptDmesProng1()) ? dmeson.ptDmesProng0() : dmeson.ptDmesProng1();
-        auto minAbsEtaDmesDau = (std::abs(dmeson.etaDmesProng0()) < std::abs(dmeson.etaDmesProng1())) ? std::abs(dmeson.etaDmesProng0()) : std::abs(dmeson.etaDmesProng1());
-
-        if (dmeson.massD0() > 0) {
-          rapDmeson = RecoDecay::y(std::array{dmeson.px(), dmeson.py(), dmeson.pz()}, constants::physics::MassD0);
-          deltaRap = rapDilepton - rapDmeson;
-          auto bdtBkg = dmeson.bdtBkgMassHypo0();
-          auto bdtPrompt = dmeson.bdtPromptMassHypo0();
-          auto bdtNonPrompt = dmeson.bdtNonpromptMassHypo0();
-          if ((dilepton.mass() > massDileptonCandMin && dilepton.mass() < massDileptonCandMax) && (dmeson.massD0() > massHfCandMin && dmeson.massD0() < massHfCandMax && bdtBkg < cutsDmesBdt->get(ptBinDmesForBdt, "BDT background") && bdtPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT prompt") && bdtNonPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT nonprompt"))) {
-            redDileptDimesAll(dilepton.mass(), dmeson.massD0(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, bdtBkg, bdtPrompt, bdtNonPrompt, minItsClsDmesDau, minTpcCrossRowsDmesDau, minPtDmesDau, minAbsEtaDmesDau);
+        int minItsClsDmesDau = 0;
+        int minTpcCrossRowsDmesDau = 0;
+        float minPtDmesDau = 0.f;
+        float minAbsEtaDmesDau = 0.f;
+        if constexpr (TDmeson == DmesonType::D0) {
+          minItsClsDmesDau = (dmeson.numItsClsDmesProng0() < dmeson.numItsClsDmesProng1()) ? dmeson.numItsClsDmesProng0() : dmeson.numItsClsDmesProng1();
+          minTpcCrossRowsDmesDau = (dmeson.numTpcCrossedRowsDmesProng0() < dmeson.numTpcCrossedRowsDmesProng1()) ? dmeson.numTpcCrossedRowsDmesProng0() : dmeson.numTpcCrossedRowsDmesProng1();
+          minPtDmesDau = (dmeson.ptDmesProng0() < dmeson.ptDmesProng1()) ? dmeson.ptDmesProng0() : dmeson.ptDmesProng1();
+          minAbsEtaDmesDau = (std::abs(dmeson.etaDmesProng0()) < std::abs(dmeson.etaDmesProng1())) ? std::abs(dmeson.etaDmesProng0()) : std::abs(dmeson.etaDmesProng1());
+        }
+        if constexpr (TDmeson == DmesonType::Dplus) {
+          minItsClsDmesDau = std::min({dmeson.numItsClsDmesProng0(), dmeson.numItsClsDmesProng1(), dmeson.numItsClsDmesProng2()});
+          minTpcCrossRowsDmesDau = std::min({dmeson.numTpcCrossedRowsDmesProng0(), dmeson.numTpcCrossedRowsDmesProng1(), dmeson.numTpcCrossedRowsDmesProng2()});
+          minPtDmesDau = std::min({dmeson.ptDmesProng0(), dmeson.ptDmesProng1(), dmeson.ptDmesProng2()});
+          minAbsEtaDmesDau = std::min({std::abs(dmeson.etaDmesProng0()), std::abs(dmeson.etaDmesProng1()), std::abs(dmeson.etaDmesProng2())});
+        }
+
+        if constexpr (TDmeson == DmesonType::D0) {
+          if (dmeson.massD0() > 0) {
+            rapDmeson = RecoDecay::y(std::array{dmeson.px(), dmeson.py(), dmeson.pz()}, constants::physics::MassD0);
+            deltaRap = rapDilepton - rapDmeson;
+            auto bdtBkg = dmeson.bdtBkgMassHypo0();
+            auto bdtPrompt = dmeson.bdtPromptMassHypo0();
+            auto bdtNonPrompt = dmeson.bdtNonpromptMassHypo0();
+            if ((dilepton.mass() > massDileptonCandMin && dilepton.mass() < massDileptonCandMax) && (dmeson.massD0() > massHfCandMin && dmeson.massD0() < massHfCandMax && bdtBkg < cutsDmesBdt->get(ptBinDmesForBdt, "BDT background") && bdtPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT prompt") && bdtNonPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT nonprompt"))) {
+              redDileptDimesAll(dilepton.mass(), dmeson.massD0(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, bdtBkg, bdtPrompt, bdtNonPrompt, minItsClsDmesDau, minTpcCrossRowsDmesDau, minPtDmesDau, minAbsEtaDmesDau);
+            }
+          }
+          if (dmeson.massD0bar() > 0) {
+            rapDmeson = RecoDecay::y(std::array{dmeson.px(), dmeson.py(), dmeson.pz()}, constants::physics::MassD0);
+            deltaRap = rapDilepton - rapDmeson;
+            auto bdtBkg = dmeson.bdtBkgMassHypo1();
+            auto bdtPrompt = dmeson.bdtPromptMassHypo1();
+            auto bdtNonPrompt = dmeson.bdtNonpromptMassHypo1();
+            if ((dilepton.mass() > massDileptonCandMin && dilepton.mass() < massDileptonCandMax) && (dmeson.massD0bar() > massHfCandMin && dmeson.massD0bar() < massHfCandMax && bdtBkg < cutsDmesBdt->get(ptBinDmesForBdt, "BDT background") && bdtPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT prompt") && bdtNonPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT nonprompt"))) {
+              redDileptDimesAll(dilepton.mass(), dmeson.massD0bar(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, bdtBkg, bdtPrompt, bdtNonPrompt, minItsClsDmesDau, minTpcCrossRowsDmesDau, minPtDmesDau, minAbsEtaDmesDau);
+            }
           }
         }
-        if (dmeson.massD0bar() > 0) {
-          rapDmeson = RecoDecay::y(std::array{dmeson.px(), dmeson.py(), dmeson.pz()}, constants::physics::MassD0);
-          deltaRap = rapDilepton - rapDmeson;
-          auto bdtBkg = dmeson.bdtBkgMassHypo1();
-          auto bdtPrompt = dmeson.bdtPromptMassHypo1();
-          auto bdtNonPrompt = dmeson.bdtNonpromptMassHypo1();
-          if ((dilepton.mass() > massDileptonCandMin && dilepton.mass() < massDileptonCandMax) && (dmeson.massD0bar() > massHfCandMin && dmeson.massD0bar() < massHfCandMax && bdtBkg < cutsDmesBdt->get(ptBinDmesForBdt, "BDT background") && bdtPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT prompt") && bdtNonPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT nonprompt"))) {
-            redDileptDimesAll(dilepton.mass(), dmeson.massD0bar(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, bdtBkg, bdtPrompt, bdtNonPrompt, minItsClsDmesDau, minTpcCrossRowsDmesDau, minPtDmesDau, minAbsEtaDmesDau);
+        if constexpr (TDmeson == DmesonType::Dplus) {
+          if (dmeson.massDmes() > 0) {
+            rapDmeson = RecoDecay::y(std::array{dmeson.px(), dmeson.py(), dmeson.pz()}, constants::physics::MassDPlus);
+            deltaRap = rapDilepton - rapDmeson;
+            auto bdtBkg = dmeson.bdtBkgMassHypo0();
+            auto bdtPrompt = dmeson.bdtPromptMassHypo0();
+            auto bdtNonPrompt = dmeson.bdtNonpromptMassHypo0();
+            if ((dilepton.mass() > massDileptonCandMin && dilepton.mass() < massDileptonCandMax) && (dmeson.massDmes() > massHfCandMin && dmeson.massDmes() < massHfCandMax && bdtBkg < cutsDmesBdt->get(ptBinDmesForBdt, "BDT background") && bdtPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT prompt") && bdtNonPrompt > cutsDmesBdt->get(ptBinDmesForBdt, "BDT nonprompt"))) {
+              redDileptDimesAll(dilepton.mass(), dmeson.massDmes(), ptDilepton, ptDmeson, rapDilepton, rapDmeson, phiDilepton, phiDmeson, deltaRap, deltaPhi, bdtBkg, bdtPrompt, bdtNonPrompt, minItsClsDmesDau, minTpcCrossRowsDmesDau, minPtDmesDau, minAbsEtaDmesDau);
+            }
           }
         }
       }
@@ -158,8 +192,19 @@ struct taskJPsiHf {
     for (auto& event : events) {
       hCollisions->Fill(1.f);
       auto groupedDileptonCandidates = dileptons.sliceBy(perCollisionDilepton, event.index());
-      auto groupedDmesonCandidates = dmesons.sliceBy(perCollisionDmeson, event.index());
-      runDileptonDmeson(event, groupedDileptonCandidates, groupedDmesonCandidates);
+      auto groupedDmesonCandidates = dmesons.sliceBy(perCollisionD0, event.index());
+      runDileptonDmeson<DmesonType::D0>(event, groupedDileptonCandidates, groupedDmesonCandidates);
+    }
+  }
+
+  void processRedJspiDplus(MyRedEvents const& events, MyRedPairCandidatesSelected const& dileptons, MyRedDplusCandidatesSelected const& dmesons)
+  {
+    // Fill the column of collisions with pairs
+    for (auto& event : events) {
+      hCollisions->Fill(1.f);
+      auto groupedDileptonCandidates = dileptons.sliceBy(perCollisionDilepton, event.index());
+      auto groupedDmesonCandidates = dmesons.sliceBy(perCollisionDplus, event.index());
+      runDileptonDmeson<DmesonType::Dplus>(event, groupedDileptonCandidates, groupedDmesonCandidates);
     }
   }
 
@@ -172,6 +217,7 @@ struct taskJPsiHf {
   }
 
   PROCESS_SWITCH(taskJPsiHf, processRedJspiD0, "Process J/psi - D0", true);
+  PROCESS_SWITCH(taskJPsiHf, processRedJspiDplus, "Process J/psi - Dplus", true);
   PROCESS_SWITCH(taskJPsiHf, processNormCounter, "Process normalization counter", true);
 };