diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 99fde4e54..d2b89e991 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1651,7 +1651,7 @@ class workspaceTools
         $pathDirectoryEnterprise = PATH_CORE . 'plugins' . PATH_SEP . 'enterprise';
         $pathFileEnterprise = PATH_CORE . 'plugins' . PATH_SEP . 'enterprise.php';
 
-        if (!file_exists($pathDirectoryEnterprise) && !file_exists(PATH_PLUGIN . 'enterprise.php')) {
+        if (!file_exists($pathDirectoryEnterprise) && !file_exists($pathFileEnterprise)) {
             CLI::logging("    Without changes... \n");
             return true;
         }
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index ea28e82c0..3ec91b108 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -3245,7 +3245,7 @@
     <column name="PRJ_AUTHOR" type="LONGVARCHAR" required="false"/>
     <column name="PRJ_AUTHOR_VERSION" type="LONGVARCHAR" required="false"/>
     <column name="PRJ_ORIGINAL_SOURCE" type="LONGVARCHAR" required="false"/>
-    <index>
+    <index name="BPMN_PROJECT_I_1">
       <index-column name="PRJ_UID"/>
     </index>
   </table>
@@ -3274,10 +3274,10 @@
     <foreign-key name="fk_bpmn_process_project" foreignTable="BPMN_PROJECT">
       <reference local="PRJ_UID" foreign="PRJ_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_PROCESS_I_1">
       <index-column name="PRO_UID"/>
     </index>
-    <index>
+    <index name="BPMN_PROCESS_I_2">
       <index-column name="PRJ_UID"/>
     </index>
   </table>
@@ -3331,13 +3331,13 @@
     <foreign-key name="fk_bpmn_activity_process" foreignTable="BPMN_PROCESS">
       <reference local="PRO_UID" foreign="PRO_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_ACTIVITY_I_1">
       <index-column name="ACT_UID"/>
     </index>
-    <index>
+    <index name="BPMN_ACTIVITY_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_ACTIVITY_I_3">
       <index-column name="PRO_UID"/>
     </index>
   </table>
@@ -3367,13 +3367,13 @@
     <foreign-key name="fk_bpmn_artifact_process" foreignTable="BPMN_PROCESS">
       <reference local="PRO_UID" foreign="PRO_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_ARTIFACT_I_1">
       <index-column name="ART_UID"/>
     </index>
-    <index>
+    <index name="BPMN_ARTIFACT_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_ARTIFACT_I_3">
       <index-column name="PRO_UID"/>
     </index>
   </table>
@@ -3398,10 +3398,10 @@
     <foreign-key name="fk_bpmn_diagram_project" foreignTable="BPMN_PROJECT">
       <reference local="PRJ_UID" foreign="PRJ_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_DIAGRAM_I_1">
       <index-column name="DIA_UID"/>
     </index>
-    <index>
+    <index name="BPMN_DIAGRAM_I_2">
       <index-column name="PRJ_UID"/>
     </index>
   </table>
@@ -3438,13 +3438,13 @@
     <foreign-key name="fk_bpmn_bound_diagram" foreignTable="BPMN_DIAGRAM">
       <reference local="DIA_UID" foreign="DIA_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_BOUND_I_1">
       <index-column name="BOU_UID"/>
     </index>
-    <index>
+    <index name="BPMN_BOUND_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_BOUND_I_3">
       <index-column name="DIA_UID"/>
     </index>
   </table>
@@ -3480,13 +3480,13 @@
     <foreign-key name="fk_bpmn_data_project" foreignTable="BPMN_PROJECT">
       <reference local="PRJ_UID" foreign="PRJ_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_DATA_I_1">
       <index-column name="DAT_UID"/>
     </index>
-    <index>
+    <index name="BPMN_DATA_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_DATA_I_3">
       <index-column name="PRO_UID"/>
     </index>
   </table>
@@ -3533,13 +3533,13 @@
     <foreign-key name="fk_bpmn_event_process" foreignTable="BPMN_PROCESS">
       <reference local="PRO_UID" foreign="PRO_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_EVENT_I_1">
       <index-column name="EVN_UID"/>
     </index>
-    <index>
+    <index name="BPMN_EVENT_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_EVENT_I_3">
       <index-column name="PRO_UID"/>
     </index>
   </table>
@@ -3581,13 +3581,13 @@
     <foreign-key name="fk_bpmn_flow_diagram" foreignTable="BPMN_DIAGRAM">
       <reference local="DIA_UID" foreign="DIA_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_FLOW_I_1">
       <index-column name="FLO_UID"/>
     </index>
-    <index>
+    <index name="BPMN_FLOW_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_FLOW_I_3">
       <index-column name="DIA_UID"/>
     </index>
   </table>
@@ -3622,13 +3622,13 @@
     <foreign-key name="fk_bpmn_gateway_process" foreignTable="BPMN_PROCESS">
       <reference local="PRO_UID" foreign="PRO_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_GATEWAY_I_1">
       <index-column name="GAT_UID"/>
     </index>
-    <index>
+    <index name="BPMN_GATEWAY_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_GATEWAY_I_3">
       <index-column name="PRO_UID"/>
     </index>
   </table>
@@ -3659,13 +3659,13 @@
     <foreign-key name="fk_bpmn_laneset_process" foreignTable="BPMN_PROCESS">
       <reference local="PRO_UID" foreign="PRO_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_LANESET_I_1">
       <index-column name="LNS_UID"/>
     </index>
-    <index>
+    <index name="BPMN_LANESET_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_LANESET_I_3">
       <index-column name="PRO_UID"/>
     </index>
   </table>
@@ -3695,13 +3695,13 @@
     <foreign-key name="fk_bpmn_lane_laneset" foreignTable="BPMN_LANESET">
       <reference local="LNS_UID" foreign="LNS_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_LANE_I_1">
       <index-column name="LAN_UID"/>
     </index>
-    <index>
+    <index name="BPMN_LANE_I_2">
       <index-column name="PRJ_UID"/>
     </index>
-    <index>
+    <index name="BPMN_LANE_I_3">
       <index-column name="LNS_UID"/>
     </index>
   </table>
@@ -3731,10 +3731,10 @@
     <foreign-key name="fk_bpmn_participant_project" foreignTable="BPMN_PROJECT">
       <reference local="PRJ_UID" foreign="PRJ_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_PARTICIPANT_I_1">
       <index-column name="PAR_UID"/>
     </index>
-    <index>
+    <index name="BPMN_PARTICIPANT_I_2">
       <index-column name="PRJ_UID"/>
     </index>
   </table>
@@ -3760,10 +3760,10 @@
     <foreign-key name="fk_bpmn_extension_project" foreignTable="BPMN_PROJECT">
       <reference local="PRJ_UID" foreign="PRJ_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_EXTENSION_I_1">
       <index-column name="EXT_UID"/>
     </index>
-    <index>
+    <index name="BPMN_EXTENSION_I_2">
       <index-column name="PRJ_UID"/>
     </index>
   </table>
@@ -3789,10 +3789,10 @@
     <foreign-key name="fk_bpmn_documentation_project" foreignTable="BPMN_PROJECT">
       <reference local="PRJ_UID" foreign="PRJ_UID"/>
     </foreign-key>
-    <index>
+    <index name="BPMN_DOCUMENTATION_I_1">
       <index-column name="DOC_UID"/>
     </index>
-    <index>
+    <index name="BPMN_DOCUMENTATION_I_2">
       <index-column name="PRJ_UID"/>
     </index>
   </table>
@@ -3818,7 +3818,7 @@
     </table>
 
     <table name="ADDONS_STORE">
-        <column name="STORE_ID"             type="VARCHAR"  size="32"   primaryKey="true" />
+        <column name="STORE_ID"             type="VARCHAR"  size="32"   primaryKey="true" required="true"/>
         <column name="STORE_VERSION"        type="INTEGER" />
         <column name="STORE_LOCATION"       type="VARCHAR"  size="2048" required="true" />
         <column name="STORE_TYPE"           type="VARCHAR"  size="255"  required="true" />
@@ -3847,7 +3847,7 @@
     </table>
 
     <table name="LICENSE_MANAGER">
-        <column name="LICENSE_UID"          type="VARCHAR"      size="32"       primaryKey="true" />
+        <column name="LICENSE_UID"          type="VARCHAR"      size="32"       primaryKey="true"  required="true"/>
         <column name="LICENSE_USER"         type="VARCHAR"      size="150"      required="true" default="0"/>
         <column name="LICENSE_START"        type="INTEGER"      required="true" default="0"/>
         <column name="LICENSE_END"          type="INTEGER"      required="true" default="0"/>