@@ -9,6 +9,7 @@
 
 #pragma once
 #include <Array.hpp>
+#include <memory.hpp>
 
 namespace cpu
 {
@@ -103,7 +104,8 @@ void regions(Array<T> out, const Array<char> in, af_connectivity connectivity)
     T    *out_ptr = out.get();
 
     // Map labels
-    typedef typename std::map<T, LabelNode<T>* > label_map_t;
+    typedef typename std::unique_ptr< LabelNode<T> > UnqLabelPtr;
+    typedef typename std::map<T, UnqLabelPtr > label_map_t;
     typedef typename label_map_t::iterator label_map_iterator_t;
 
     label_map_t lmap;
@@ -134,18 +136,16 @@ void regions(Array<T> out, const Array<char> in, af_connectivity connectivity)
                     for (size_t k = 0; k < l.size(); k++) {
                         minl = min(l[k], minl);
                         label_map_iterator_t cur_map = lmap.find(l[k]);
-                        LabelNode<T> *node = cur_map->second;
+                        LabelNode<T> *node = cur_map->second.get();
                         // Group labels of the same region under a disjoint set
                         for (size_t m = k+1; m < l.size(); m++)
-                            setUnion(node, lmap.find(l[m])->second);
+                            setUnion(node, lmap.find(l[m])->second.get());
                     }
                     // Set label to smallest neighbor label
                     out_ptr[idx] = minl;
-                }
-                else {
+                } else {
                     // Insert new label in map
-                    LabelNode<T> *node = new LabelNode<T>(label);
-                    lmap.insert(std::pair<T, LabelNode<T>* >(label, node));
+                    lmap.insert(std::pair<T, UnqLabelPtr>(label, UnqLabelPtr(new LabelNode<T>(label))));
                     out_ptr[idx] = label++;
                 }
             }
@@ -162,7 +162,7 @@ void regions(Array<T> out, const Array<char> in, af_connectivity connectivity)
                 label_map_iterator_t cur_map = lmap.find(l);
 
                 if (cur_map != lmap.end()) {
-                    LabelNode<T>* node = cur_map->second;
+                    LabelNode<T>* node = cur_map->second.get();
 
                     LabelNode<T>* node_root = find(node);
                     out_ptr[idx] = node_root->getMinLabel();