diff --git a/algo/detectors/tof/Clusterizer.h b/algo/detectors/tof/Clusterizer.h
index 4ef616a6adbe01ddeec6475d827c49d29b48a81a..28ad1dbe6a0bece29915c8e6bccd5d6705793430 100644
--- a/algo/detectors/tof/Clusterizer.h
+++ b/algo/detectors/tof/Clusterizer.h
@@ -30,23 +30,23 @@ namespace cbm::algo::tof
     /**
        ** @brief Constructor.
        **/
-    Clusterizer() {};
+    Clusterizer(std::unique_ptr<ClusterizerRpcPar> params) { fParams = *(std::move(params)); }
+
+    /**
+       ** @brief Default constructor.
+       **/
+    Clusterizer() = default;
 
     /**
        ** @brief Destructor.
        **/
-    ~Clusterizer() {};
+    ~Clusterizer() = default;
 
     /**
        ** @brief Build clusters out of ToF Digis and store the resulting info in a TofHit.
        **/
     resultType operator()(const std::vector<std::pair<CbmTofDigi, int32_t>>& digisIn);
 
-    /** @brief Set the parameter container
-     ** @param params Vectorer to parameter container
-     **/
-    void SetParams(std::unique_ptr<ClusterizerRpcPar> params) { fParams = *(std::move(params)); }
-
   private:
     typedef std::vector<std::pair<const CbmTofDigi*, int32_t>> inputType;
 
diff --git a/algo/detectors/tof/Hitfind.cxx b/algo/detectors/tof/Hitfind.cxx
index 251c38b006d44b7cae6fbf63724d24a49df560ef..bc9863ac069e2b82b2964f79e78a30073253895f 100644
--- a/algo/detectors/tof/Hitfind.cxx
+++ b/algo/detectors/tof/Hitfind.cxx
@@ -65,7 +65,7 @@ namespace cbm::algo::tof
             par->fChanPar[Ch].cell.sizeX    = rpcPar.cell.sizeX;
             par->fChanPar[Ch].cell.sizeY    = rpcPar.cell.sizeY;
           }
-          fAlgo[SmType][Sm * NbRpc + Rpc].SetParams(std::move(par));
+          fAlgo[SmType].emplace(std::make_pair(Sm * NbRpc + Rpc, tof::Clusterizer(std::move(par))));
         }
       }
     }