diff --git a/sdk/core/bee.cpp b/sdk/core/bee.cpp
index f81cc24..430d949 100644
--- a/sdk/core/bee.cpp
+++ b/sdk/core/bee.cpp
@@ -34,7 +34,7 @@ using namespace cv;
 using namespace br;
 
 /**** BEE ****/
-FileList BEE::readSigset(QString sigset, bool ignoreMetadata)
+FileList BEE::readSigset(const QString &sigset, bool ignoreMetadata)
 {
     FileList fileList;
 
@@ -90,24 +90,22 @@ FileList BEE::readSigset(QString sigset, bool ignoreMetadata)
     return fileList;
 }
 
-void BEE::writeSigset(const QString &sigset, const br::FileList &fileList)
+void BEE::writeSigset(const QString &sigset, const br::FileList &files, bool ignoreMetadata)
 {
-    typedef QPair<QString,QString> Signature; // QPair<Subject, File>
-    QList<Signature> signatures;
-
-    foreach (const File &file, fileList)
-        signatures.append(Signature(file.subject(), file.name));
-
-    QFile file(sigset);
-    file.open(QFile::WriteOnly);
-    file.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-               "<biometric-signature-set>\n");
-    foreach (const Signature &signature, signatures)
-        file.write(qPrintable(QString("\t<biometric-signature name=\"%1\">\n"
-                                      "\t\t<presentation file-name=\"%2\"/>\n"
-                                      "\t</biometric-signature>\n").arg(signature.first, signature.second)));
-    file.write("</biometric-signature-set>\n");
-    file.close();
+    QStringList lines; lines.reserve(3*files.size()+3);
+    lines.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+    lines.append("<biometric-signature-set>");
+    foreach (const File &file, files) {
+        QStringList metadata;
+        if (!ignoreMetadata)
+            foreach (const QString &key, file.localKeys())
+                metadata.append(key+"=\""+file.getString(key, "?")+"\"");
+        lines.append("\t<biometric-signature name=\"" + file.subject() +"\">");
+        lines.append("\t\t<presentation file-name=\"" + file.name + "\" " + metadata.join(" ") + "/>");
+        lines.append("\t</biometric-signature>");
+    }
+    lines.append("</biometric-signature-set>");
+    QtUtils::writeFile(sigset, lines);
 }
 
 template <typename T>
diff --git a/sdk/core/bee.h b/sdk/core/bee.h
index f51c1c3..220a3f4 100644
--- a/sdk/core/bee.h
+++ b/sdk/core/bee.h
@@ -35,8 +35,8 @@ namespace BEE
     typedef uchar Mask_t;
 
     // Sigset IO
-    br::FileList readSigset(QString sigset, bool ignoreMetadata = false);
-    void writeSigset(const QString &sigset, const br::FileList &metadataList);
+    br::FileList readSigset(const QString &sigset, bool ignoreMetadata = false);
+    void writeSigset(const QString &sigset, const br::FileList &files, bool ignoreMetadata = false);
 
     // Matrix IO
     cv::Mat readSimmat(const br::File &simmat);
diff --git a/sdk/openbr_plugin.h b/sdk/openbr_plugin.h
index 7144360..5fdc954 100644
--- a/sdk/openbr_plugin.h
+++ b/sdk/openbr_plugin.h
@@ -330,6 +330,7 @@ struct TemplateList : public QList<Template>
 
     TemplateList() : uniform(false) {}
     TemplateList(const QList<Template> &templates) : uniform(false) { append(templates); } /*!< \brief Initialize the template list from another template list. */
+    TemplateList(const QList<File> &files) : uniform(false) { foreach (const File &file, files) append(file); }
     BR_EXPORT static TemplateList fromInput(const File &input); /*!< \brief Create a template list from a br::Input. */
     BR_EXPORT static TemplateList relabel(const TemplateList &tl); /*!< \brief Ensure labels are in the range [0,numClasses-1]. */
     /*!
diff --git a/sdk/plugins/gallery.cpp b/sdk/plugins/gallery.cpp
index 7f86411..6e4849a 100644
--- a/sdk/plugins/gallery.cpp
+++ b/sdk/plugins/gallery.cpp
@@ -433,22 +433,24 @@ BR_REGISTER(Gallery, txtGallery)
 class xmlGallery : public Gallery
 {
     Q_OBJECT
-    Q_PROPERTY(bool ignoreMetadata READ get_ignoreMetadata WRITE set_ignoreMetadata RESET reset_ignoreMetadata)
+    Q_PROPERTY(bool ignoreMetadata READ get_ignoreMetadata WRITE set_ignoreMetadata RESET reset_ignoreMetadata STORED false)
     BR_PROPERTY(bool, ignoreMetadata, false)
+    FileList files;
+
+    ~xmlGallery()
+    {
+        BEE::writeSigset(file, files, ignoreMetadata);
+    }
 
     TemplateList readBlock(bool *done)
     {
-        TemplateList templates;
-        foreach (const File &signature, BEE::readSigset(file.name, ignoreMetadata))
-            templates.append(signature);
         *done = true;
-        return templates;
+        return TemplateList(BEE::readSigset(file, ignoreMetadata));
     }
 
     void write(const Template &t)
     {
-        (void) t;
-        qFatal("Writing to an xmlGallery not supported.");
+        files.append(t.file);
     }
 };
 
@@ -471,8 +473,7 @@ class dbGallery : public Gallery
         QString subset = file.getString("subset", "");
 
 #ifndef BR_EMBEDDED
-        static QSqlDatabase db;
-        if (!db.isValid()) db = QSqlDatabase::addDatabase("QSQLITE");
+        QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
         db.setDatabaseName(file);
         if (!db.open()) qFatal("Failed to open SQLite database %s.", qPrintable(file.name));