diff --git a/python/aare/__init__.py b/python/aare/__init__.py
index 058d7cf..c9076cf 100644
--- a/python/aare/__init__.py
+++ b/python/aare/__init__.py
@@ -2,14 +2,14 @@
 from . import _aare
 
 
-from ._aare import File, RawMasterFile, RawSubFile
-from ._aare import Pedestal_d, Pedestal_f, ClusterFinder, VarClusterFinder
+# from ._aare import File, RawMasterFile, RawSubFile
+# from ._aare import Pedestal_d, Pedestal_f, ClusterFinder, VarClusterFinder
 from ._aare import DetectorType
-from ._aare import ClusterFile
+from ._aare import ClusterFile_Cluster3x3i as ClusterFile
 from ._aare import hitmap
 from ._aare import ROI
 
-from ._aare import ClusterFinderMT, ClusterCollector, ClusterFileSink, ClusterVector_i
+# from ._aare import ClusterFinderMT, ClusterCollector, ClusterFileSink, ClusterVector_i
 
 from ._aare import fit_gaus, fit_pol1
 from ._aare import Interpolator
diff --git a/python/src/cluster.hpp b/python/src/cluster.hpp
index fda80a7..30b80f0 100644
--- a/python/src/cluster.hpp
+++ b/python/src/cluster.hpp
@@ -63,8 +63,11 @@ void define_cluster(py::module &m, const std::string &typestr) {
             });
 }
 
-template <typename ClusterType>
+template <typename Type, uint8_t ClusterSizeX, uint8_t ClusterSizeY,
+          typename CoordType = uint16_t>
 void define_cluster_vector(py::module &m, const std::string &typestr) {
+    using ClusterType =
+        Cluster<Type, ClusterSizeX, ClusterSizeY, uint16_t, void>;
     auto class_name = fmt::format("ClusterVector_{}", typestr);
 
     py::class_<ClusterVector<ClusterType>>(m, class_name.c_str(),
diff --git a/python/src/module.cpp b/python/src/module.cpp
index 9d3866e..38d3681 100644
--- a/python/src/module.cpp
+++ b/python/src/module.cpp
@@ -36,12 +36,12 @@ PYBIND11_MODULE(_aare, m) {
     define_cluster_file_io_bindings<Cluster<float, 2, 2>>(m, "Cluster2x2f");
     define_cluster_file_io_bindings<Cluster<double, 2, 2>>(m, "Cluster2x2d");
 
-    define_cluster_vector<Cluster<int, 3, 3>>(m, "Cluster3x3i");
-    define_cluster_vector<Cluster<double, 3, 3>>(m, "Cluster3x3d");
-    define_cluster_vector<Cluster<float, 3, 3>>(m, "Cluster3x3f");
-    define_cluster_vector<Cluster<int, 2, 2>>(m, "Cluster2x2i");
-    define_cluster_vector<Cluster<double, 2, 2>>(m, "Cluster2x2d");
-    define_cluster_vector<Cluster<float, 2, 2>>(m, "Cluster2x2f");
+    define_cluster_vector<int, 3, 3, uint16_t>(m, "Cluster3x3i");
+    define_cluster_vector<double, 3, 3, uint16_t>(m, "Cluster3x3d");
+    define_cluster_vector<float, 3, 3, uint16_t>(m, "Cluster3x3f");
+    define_cluster_vector<int, 2, 2, uint16_t>(m, "Cluster2x2i");
+    define_cluster_vector<double, 2, 2, uint16_t>(m, "Cluster2x2d");
+    define_cluster_vector<float, 2, 2, uint16_t>(m, "Cluster2x2f");
 
     define_cluster_finder_bindings<Cluster<int, 3, 3>>(m, "Cluster3x3i");
     define_cluster_finder_bindings<Cluster<double, 3, 3>>(m, "Cluster3x3d");