diff --git a/h5p.classes.php b/h5p.classes.php
index 35be986..e4a5608 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -680,6 +680,7 @@ class H5PValidator {
     'author' => '/^.{1,255}$/',
     'license' => '/^(cc-by|cc-by-sa|cc-by-nd|cc-by-nc|cc-by-nc-sa|cc-by-nc-nd|pd|cr|MIT|GPL1|GPL2|GPL3|MPL|MPL2)$/',
     'description' => '/^.{1,}$/',
+    'metadata' => '/^(0|1)$/',
     'dynamicDependencies' => array(
       'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
       'majorVersion' => '/^[0-9]{1,5}$/',
diff --git a/js/h5p-content-upgrade-process.js b/js/h5p-content-upgrade-process.js
index 3562d6d..d50a09c 100644
--- a/js/h5p-content-upgrade-process.js
+++ b/js/h5p-content-upgrade-process.js
@@ -25,12 +25,12 @@ H5P.ContentUpgradeProcess = (function (Version) {
     }
 
     self.loadLibrary = loadLibrary;
-    self.upgrade(name, oldVersion, newVersion, params, function (err, upgradedParams) {
+    self.upgrade(name, oldVersion, newVersion, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
       if (err) {
         return done(err);
       }
 
-      done(null, JSON.stringify(upgradedParams));
+      done(null, JSON.stringify({params: upgradedParams, metadata: upgradedMetadata}));
     });
   }
 
@@ -41,11 +41,11 @@ H5P.ContentUpgradeProcess = (function (Version) {
    * @param {string} name
    * @param {Version} oldVersion
    * @param {Version} newVersion
-   * @param {Object} params Only for subcontent
-   * @param {Function} done Only for subcontent
-   * @param {Object} [metadata] Only for subcontent
+   * @param {Object} params
+   * @param {Object} metadata
+   * @param {Function} done
    */
-  ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, done, metadata) {
+  ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, metadata, done) {
     var self = this;
 
     // Load library details and upgrade routines
@@ -180,7 +180,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
             }
 
             // A newer version is available, upgrade params
-            return self.upgrade(availableLib[0], usedVer, availableVer, params.params, function (err, upgradedParams, upgradedMetadata) {
+            return self.upgrade(availableLib[0], usedVer, availableVer, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
               if (!err) {
                 params.library = availableLib[0] + ' ' + availableVer.major + '.' + availableVer.minor;
                 params.params = upgradedParams;
@@ -189,7 +189,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
                 }
               }
               done(err, params);
-            }, params.metadata);
+            });
           }
         }
         done();