diff --git a/workflow/engine/bin/tasks/cliAddons.php b/workflow/engine/bin/tasks/cliAddons.php
index e6da3d69a..2af2f1aea 100644
--- a/workflow/engine/bin/tasks/cliAddons.php
+++ b/workflow/engine/bin/tasks/cliAddons.php
@@ -1,20 +1,5 @@
 <?php
-/*
-//Support ProcessMaker 1.8 which doesn't have the CLI class.
-define("CLI2", class_exists("CLI"));
 
-if (CLI2) {
-  CLI::taskName("addon-install");
-  CLI::taskDescription(<<<EOT
-    Download and install an addon
-EOT
-  );
-  CLI::taskRun(run_addon_core_install);
-} else {
-  pake_desc("install addon");
-  pake_task("addon-install");
-}
-*/
 /*----------------------------------********---------------------------------*/
 CLI::taskName('change-password-hash-method');
 CLI::taskDescription(<<<EOT
@@ -25,23 +10,10 @@ CLI::taskArg('workspace', false);
 CLI::taskArg('hash', false);
 CLI::taskRun("change_hash");
 /*----------------------------------********---------------------------------*/
-//function run_addon_core_install($args, $opts) {
+
 function run_addon_core_install($args)
 {
     try {
-        if (!extension_loaded("mysql")) {
-            if (strtoupper(substr(PHP_OS, 0, 3)) === "WIN") {
-                dl("mysql.dll");
-            } else {
-                dl("mysql.so");
-            }
-        }
-        ///////
-        /*
-        if (!CLI2) {
-          $args = $opts;
-        }
-        */
         $workspace = $args[0];
         $storeId = $args[1];
         $addonName = $args[2];
@@ -57,20 +29,17 @@ function run_addon_core_install($args)
             define("DB_ADAPTER", $args[3]);
         }
 
-        ///////
         $ws = new WorkspaceTools($workspace);
         $ws->initPropel(false);
 
         require_once PATH_CORE . 'methods' . PATH_SEP . 'enterprise' . PATH_SEP . 'enterprise.php';
-        require_once PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . 'AddonsManagerPeer.php';
 
         $addon = AddonsManagerPeer::retrieveByPK($addonName, $storeId);
         if ($addon == null) {
             throw new Exception("Id $addonName not found in store $storeId");
         }
-        //echo "Downloading...\n";
-        $download = $addon->download();
-        //echo "Installing...\n";
+
+        $addon->download();
         $addon->install();
 
         if ($addon->isCore()) {
@@ -82,10 +51,7 @@ function run_addon_core_install($args)
         }
     } catch (Exception $e) {
         $addon->setState("error");
-        //fwrite(STDERR, "\n[ERROR: {$e->getMessage()}]\n");
-        //fwrite(STDOUT, "\n[ERROR: {$e->getMessage()}]\n");
     }
-    //echo "** Installation finished\n";
 }
 /*----------------------------------********---------------------------------*/
 function change_hash($command, $opts)
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index ee62f0ff8..75517b680 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -589,6 +589,9 @@
         <unique name="INDEX_DYN_ID">
             <unique-column name="DYN_ID"/>
         </unique>
+        <index name="INDEX_PRO_UID">
+            <index-column name="PRO_UID"/>
+        </index>
         <validator column="DYN_TYPE">
             <rule name="validValues" value="xmlform|grid" message="Please select a valid dynaform type."/>
         </validator>
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 18efed744..30f4f911f 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -269,7 +269,8 @@ CREATE TABLE `DYNAFORM`
 	`DYN_VERSION` INTEGER  NOT NULL,
 	`DYN_UPDATE_DATE` DATETIME,
 	PRIMARY KEY (`DYN_UID`),
-	UNIQUE KEY `INDEX_DYN_ID` (`DYN_ID`)
+	UNIQUE KEY `INDEX_DYN_ID` (`DYN_ID`),
+	KEY `INDEX_PRO_UID`(`PRO_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Forms required';
 #-----------------------------------------------------------------------------
 #-- GROUPWF