diff --git a/openbr/core/core.cpp b/openbr/core/core.cpp
index 53b034c..e9782e4 100644
--- a/openbr/core/core.cpp
+++ b/openbr/core/core.cpp
@@ -160,7 +160,7 @@ struct AlgorithmCore
                                 data.removeAt(i);
                     const int numFiles = data.size();
 
-                    enroll(data);
+                    data >> *transform;
 
                     g->writeBlock(data);
                     const FileList newFiles = data.files();
@@ -184,9 +184,10 @@ struct AlgorithmCore
         return fileList;
     }
 
-    void enroll(TemplateList &data)
+    void enroll(Template &data)
     {
-        data >> *transform;
+        if (transform.isNull()) qFatal("Null transform.");
+        data = (data >> *transform);
     }
 
     void retrieveOrEnroll(const File &file, QScopedPointer<Gallery> &gallery, FileList &galleryFiles)
@@ -376,12 +377,9 @@ FileList br::Enroll(const File &input, const File &gallery)
     return AlgorithmManager::getAlgorithm(gallery.get<QString>("algorithm"))->enroll(input, gallery);
 }
 
-void br::Enroll(const Template &tmpl)
+void br::Enroll(Template &tmpl)
 {
-    QList<Template> tmpls;
-    tmpls.append(tmpl);
-    TemplateList tl(tmpls);
-    AlgorithmManager::getAlgorithm(tmpl.file.get<QString>("algorithm"))->enroll(tl);
+    AlgorithmManager::getAlgorithm(tmpl.file.get<QString>("algorithm"))->enroll(tmpl);
 }
 
 void br::Compare(const File &targetGallery, const File &queryGallery, const File &output)
diff --git a/openbr/openbr.cpp b/openbr/openbr.cpp
index b5c1d70..c9f5fc1 100644
--- a/openbr/openbr.cpp
+++ b/openbr/openbr.cpp
@@ -308,26 +308,26 @@ br_template br_load_img(const char *data)
     return (br_template)tmpl;
 }
 
-const unsigned char *br_unload_img(br_template tmpl)
+unsigned char *br_unload_img(br_template tmpl)
 {
-    Template *t = (Template*)tmpl;
+    Template *t = reinterpret_cast<Template*>(tmpl);
     return t->m().data;
 }
 
 int br_img_rows(br_template tmpl)
 {
-    Template *t = (Template*)tmpl;
+    Template *t = reinterpret_cast<Template*>(tmpl);
     return t->m().rows;
 }
 
 int br_img_cols(br_template tmpl)
 {
-    Template *t = (Template*)tmpl;
+    Template *t = reinterpret_cast<Template*>(tmpl);
     return t->m().cols;
 }
 
 void br_enroll_template(br_template tmpl)
 {
-    Template *t = (Template*)tmpl;
+    Template *t = reinterpret_cast<Template*>(tmpl);
     Enroll(*t);
 }
diff --git a/openbr/openbr.h b/openbr/openbr.h
index 175a384..bdbed31 100644
--- a/openbr/openbr.h
+++ b/openbr/openbr.h
@@ -426,7 +426,7 @@ typedef void* br_template;
   *   Easy way to pass an image in memory from another programming language to openbr.
   */
 BR_EXPORT br_template br_load_img(const char *data);
-BR_EXPORT const unsigned char* br_unload_img(br_template tmpl);
+BR_EXPORT unsigned char* br_unload_img(br_template tmpl);
 BR_EXPORT int br_img_rows(br_template tmpl);
 BR_EXPORT int br_img_cols(br_template tmpl);
 BR_EXPORT void br_enroll_template(br_template tmpl);
diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h
index 48be572..3ad907c 100644
--- a/openbr/openbr_plugin.h
+++ b/openbr/openbr_plugin.h
@@ -1321,7 +1321,7 @@ BR_EXPORT FileList Enroll(const File &input, const File &gallery = File());
  * \brief High-level function for enrolling templates.
  * \see br_enroll
  */
-BR_EXPORT void Enroll(const Template &tmpl);
+BR_EXPORT void Enroll(Template &tmpl);
 
 /*!
  * \brief High-level function for comparing galleries.