diff --git a/local/config/schema.xml b/local/config/schema.xml
index 5f86bb9e8..9539cca25 100644
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -1,11 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="UTF-8"?>

 <database defaultIdMethod="native" name="thelia">
-    <vendor type="mysql">
-        <parameter name="Engine" value="InnoDB"/>
-        <parameter name="Charset" value="utf8"/>
-    </vendor>
-    <table name="category" namespace="Thelia\Model">
+  <table name="category" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="parent" type="INTEGER" />
     <column name="visible" required="true" type="TINYINT" />
@@ -38,7 +33,7 @@
     <column name="tax_rule_id" type="INTEGER" />
     <column name="ref" required="true" size="255" type="VARCHAR" />
     <column defaultValue="0" name="visible" required="true" type="TINYINT" />
-    <column defaultValue="0" name="position" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
     <column name="title" size="255" type="VARCHAR" />
     <column name="description" type="CLOB" />
     <column name="chapo" type="LONGVARCHAR" />
@@ -110,9 +105,6 @@
     <index name="idx_country_area_id">
       <index-column name="area_id" />
     </index>
-    <index name="idx_country_by_default">
-      <index-column name="by_default" />
-    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -162,11 +154,6 @@
     <index name="idx_tax_rule_country_country_id">
       <index-column name="country_id" />
     </index>
-    <index name="idx_tax_rule_country_tax_rule_id_country_id_position">
-      <index-column name="tax_rule_id" />
-      <index-column name="country_id" />
-      <index-column name="position" />
-    </index>
     <behavior name="timestampable" />
   </table>
   <table name="feature" namespace="Thelia\Model">
@@ -226,11 +213,6 @@
     <index name="idx_feature_prod_feature_av_id">
       <index-column name="feature_av_id" />
     </index>
-    <index name="idx_feature_product_product_id_feature_id_position">
-      <index-column name="product_id" />
-      <index-column name="feature_id" />
-      <index-column name="position" />
-    </index>
     <behavior name="timestampable" />
   </table>
   <table isCrossRef="true" name="feature_template" namespace="Thelia\Model">
@@ -250,10 +232,6 @@
     <index name="fk_feature_template_idx">
       <index-column name="template_id" />
     </index>
-    <index name="idx_feature_template_template_id_position">
-      <index-column name="template_id" />
-      <index-column name="position" />
-    </index>
     <behavior name="timestampable" />
   </table>
   <table name="attribute" namespace="Thelia\Model">
@@ -330,11 +308,6 @@
     <index name="ref">
       <index-column name="ref" />
     </index>
-    <index name="idx_product_elements_product_id_promo_is_default">
-      <index-column name="product_id" />
-      <index-column name="promo" />
-      <index-column name="is_default" />
-    </index>
     <behavior name="timestampable" />
   </table>
   <table isCrossRef="true" name="attribute_template" namespace="Thelia\Model">
@@ -376,7 +349,7 @@
   </table>
   <table name="customer" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="ref" size="50" type="VARCHAR" />
+    <column name="ref" required="true" size="50" type="VARCHAR" />
     <column name="title_id" required="true" type="INTEGER" />
     <column name="firstname" required="true" size="255" type="VARCHAR" />
     <column name="lastname" required="true" size="255" type="VARCHAR" />
@@ -392,12 +365,12 @@
     <foreign-key foreignTable="customer_title" name="fk_customer_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
       <reference foreign="id" local="title_id" />
     </foreign-key>
-    <index name="idx_customer_customer_title_id">
-      <index-column name="title_id" />
-    </index>
     <unique name="ref_UNIQUE">
       <unique-column name="ref" />
     </unique>
+    <index name="idx_customer_customer_title_id">
+      <index-column name="title_id" />
+    </index>
     <behavior name="timestampable" />
   </table>
   <table name="address" namespace="Thelia\Model">
@@ -462,9 +435,6 @@
     <column name="decimals" size="45" type="VARCHAR" />
     <column name="by_default" type="TINYINT" />
     <column name="position" type="INTEGER" />
-    <index name="idx_lang_by_default">
-      <index-column name="by_default" />
-    </index>
     <behavior name="timestampable" />
   </table>
   <table name="folder" namespace="Thelia\Model">
@@ -523,10 +493,6 @@
     <index name="idx_product_image_product_id">
       <index-column name="product_id" />
     </index>
-    <index name="idx_product_image_product_id_position">
-      <index-column name="product_id" />
-      <index-column name="position" />
-    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -554,7 +520,7 @@
   </table>
   <table name="order" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="ref" size="45" type="VARCHAR" />
+    <column name="ref" required="true" size="45" type="VARCHAR" />
     <column name="customer_id" required="true" type="INTEGER" />
     <column name="invoice_order_address_id" required="true" type="INTEGER" />
     <column name="delivery_order_address_id" required="true" type="INTEGER" />
@@ -635,12 +601,6 @@
     <column name="rate" type="FLOAT" />
     <column name="position" type="INTEGER" />
     <column name="by_default" type="TINYINT" />
-    <index name="idx_currency_by_default">
-      <index-column name="by_default" />
-    </index>
-    <index name="idx_currency_code">
-      <index-column name="code" />
-    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="name" />
@@ -736,9 +696,6 @@
     <unique name="code_UNIQUE">
       <unique-column name="code" />
     </unique>
-    <index name="idx_module_activate">
-      <index-column name="activate" />
-    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -920,7 +877,6 @@
     <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
     <column name="is_used" required="true" type="BOOLEAN" />
     <column name="serialized_conditions" required="true" type="LONGVARCHAR" />
-    <column name="per_customer_usage_count" required="true" type="BOOLEAN" />
     <unique name="code_UNIQUE">
       <unique-column name="code" />
     </unique>
@@ -952,7 +908,10 @@
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, short_description, description" />
     </behavior>
-    <behavior name="versionable" />
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
   </table>
   <table name="admin_log" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
@@ -1088,10 +1047,6 @@
     <index name="idx_category_image_category_id">
       <index-column name="category_id" />
     </index>
-    <index name="idx_category_image_category_id_position">
-      <index-column name="category_id" />
-      <index-column name="position" />
-    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -1112,10 +1067,6 @@
     <index name="idx_folder_image_folder_id">
       <index-column name="folder_id" />
     </index>
-    <index name="idx_folder_image_folder_id_position">
-      <index-column name="folder_id" />
-      <index-column name="position" />
-    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -1136,10 +1087,6 @@
     <index name="idx_content_image_content_id">
       <index-column name="content_id" />
     </index>
-    <index name="idx_content_image_content_id_position">
-      <index-column name="content_id" />
-      <index-column name="position" />
-    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -1256,6 +1203,9 @@
     <unique name="url_UNIQUE">
       <unique-column name="url" />
     </unique>
+    <index name="idx_view_id">
+      <index-column name="view_id" />
+    </index>
     <index name="idx_rewriting_url_redirected">
       <index-column name="redirected" />
     </index>
@@ -1296,10 +1246,6 @@
     <index name="idx_module_image_module_id">
       <index-column name="module_id" />
     </index>
-    <index name="idx_module_image_module_id_position">
-      <index-column name="module_id" />
-      <index-column name="position" />
-    </index>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
@@ -1345,7 +1291,6 @@
     <column name="is_removing_postage" required="true" type="BOOLEAN" />
     <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
     <column name="serialized_conditions" required="true" type="LONGVARCHAR" />
-    <column name="per_customer_usage_count" required="true" type="BOOLEAN" />
     <foreign-key foreignTable="order" name="fk_order_coupon_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="order_id" />
     </foreign-key>
@@ -1354,73 +1299,4 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table isCrossRef="true" name="coupon_country" namespace="Thelia\Model">
-    <column name="coupon_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="country_id" primaryKey="true" required="true" type="INTEGER" />
-    <foreign-key foreignTable="country" name="fk_coupon_country_country_id" onDelete="CASCADE">
-      <reference foreign="id" local="country_id" />
-    </foreign-key>
-    <foreign-key foreignTable="coupon" name="fk_coupon_country_coupon_id" onDelete="CASCADE">
-      <reference foreign="id" local="coupon_id" />
-    </foreign-key>
-    <index name="fk_country_id_idx">
-      <index-column name="country_id" />
-    </index>
-  </table>
-  <table isCrossRef="true" name="coupon_module" namespace="Thelia\Model">
-    <column name="coupon_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="module_id" primaryKey="true" required="true" type="INTEGER" />
-    <foreign-key foreignTable="coupon" name="fk_coupon_module_coupon_id" onDelete="CASCADE">
-      <reference foreign="id" local="coupon_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="fk_coupon_module_module_id" onDelete="CASCADE">
-      <reference foreign="id" local="module_id" />
-    </foreign-key>
-    <index name="fk_module_id_idx">
-      <index-column name="module_id" />
-    </index>
-  </table>
-  <table isCrossRef="true" name="order_coupon_country" namespace="Thelia\Model">
-    <column name="coupon_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="country_id" primaryKey="true" required="true" type="INTEGER" />
-    <foreign-key foreignTable="country" name="fk_order_coupon_country_country_id" onDelete="CASCADE">
-      <reference foreign="id" local="country_id" />
-    </foreign-key>
-    <foreign-key foreignTable="order_coupon" name="fk_order_coupon_country_coupon_id">
-      <reference foreign="id" local="coupon_id" />
-    </foreign-key>
-    <index name="fk_country_id_idx">
-      <index-column name="country_id" />
-    </index>
-  </table>
-  <table isCrossRef="true" name="order_coupon_module" namespace="Thelia\Model">
-    <column name="coupon_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="module_id" primaryKey="true" required="true" type="INTEGER" />
-    <foreign-key foreignTable="order_coupon" name="fk_coupon_module_coupon_id0" onDelete="CASCADE">
-      <reference foreign="id" local="coupon_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="fk_coupon_module_module_id0" onDelete="CASCADE">
-      <reference foreign="id" local="module_id" />
-    </foreign-key>
-    <index name="fk_module_id_idx">
-      <index-column name="module_id" />
-    </index>
-  </table>
-  <table isCrossRef="true" name="coupon_customer_count" namespace="Thelia\Model">
-    <column name="coupon_id" required="true" type="INTEGER" />
-    <column name="customer_id" required="true" type="INTEGER" />
-    <column defaultValue="0" name="count" required="true" type="INTEGER" />
-    <foreign-key foreignTable="customer" name="fk_coupon_customer_customer_id" onDelete="CASCADE">
-      <reference foreign="id" local="customer_id" />
-    </foreign-key>
-    <foreign-key foreignTable="coupon" name="fk_coupon_customer_coupon_id" onDelete="CASCADE">
-      <reference foreign="id" local="coupon_id" />
-    </foreign-key>
-    <index name="fk_coupon_customer_customer_id_idx">
-      <index-column name="customer_id" />
-    </index>
-    <index name="fk_coupon_customer_coupon_id_idx">
-      <index-column name="coupon_id" />
-    </index>
-  </table>
 </database>
diff --git a/setup/update/2.0.3.sql b/setup/update/2.0.3.sql
index 7c94478b1..cde550b0e 100644
--- a/setup/update/2.0.3.sql
+++ b/setup/update/2.0.3.sql
@@ -45,4 +45,8 @@ CREATE TABLE `order_version`
         ON DELETE CASCADE
 ) ENGINE=InnoDB CHARACTER SET='utf8';
 
+# Add missing columns to coupon (version_created_at, version_created_by)
+ALTER TABLE `order` ADD `version_created_at` DATE AFTER `version`;
+ALTER TABLE `order` ADD `version_created_by` VARCHAR(100) AFTER `version_created_at`;
+
 SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file