diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
index 4cf68ce85ad..f873d5e7a23 100644
--- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
+++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
@@ -58,3 +58,67 @@ ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (entity, name
 ALTER TABLE llx_societe_account ADD COLUMN ip varchar(250);
 
 ALTER TABLE llx_product ADD COLUMN packaging float(24,8) DEFAULT NULL;
+
+
+ALTER TABLE llx_categorie_member ADD COLUMN import_key varchar(14);
+ALTER TABLE llx_category_bankline ADD COLUMN import_key varchar(14);
+
+
+create table llx_categorie_order
+(
+  fk_categorie integer NOT NULL,
+  fk_order     integer NOT NULL,
+  import_key   varchar(14)
+)ENGINE=innodb;
+
+--ALTER TABLE llx_categorie_order ADD PRIMARY KEY pk_categorie_order(fk_categorie, fk_order);
+ALTER TABLE llx_categorie_order ADD INDEX idx_categorie_order_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_order ADD INDEX idx_categorie_order_fk_order (fk_order);
+
+ALTER TABLE llx_categorie_order ADD CONSTRAINT fk_categorie_order_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_order ADD CONSTRAINT fk_categorie_order_fk_order_rowid FOREIGN KEY (fk_order) REFERENCES llx_commande (rowid);
+
+
+create table llx_categorie_invoice
+(
+  fk_categorie integer NOT NULL,
+  fk_invoice   integer NOT NULL,
+  import_key   varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_categorie_invoice ADD PRIMARY KEY pk_categorie_invoice (fk_categorie, fk_invoice);
+ALTER TABLE llx_categorie_invoice ADD INDEX idx_categorie_invoice_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_invoice ADD INDEX idx_categorie_invoice_fk_invoice (fk_invoice);
+
+ALTER TABLE llx_categorie_invoice ADD CONSTRAINT fk_categorie_invoice_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_invoice ADD CONSTRAINT fk_categorie_invoice_fk_invoice_rowid FOREIGN KEY (fk_invoice) REFERENCES llx_facture (rowid);
+
+
+create table llx_categorie_supplier_order
+(
+  fk_categorie      integer NOT NULL,
+  fk_supplier_order integer NOT NULL,
+  import_key        varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_categorie_supplier_order ADD PRIMARY KEY pk_categorie_supplier_order (fk_categorie, fk_supplier_order);
+ALTER TABLE llx_categorie_supplier_order ADD INDEX idx_categorie_supplier_order_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_supplier_order ADD INDEX idx_categorie_supplier_order_fk_supplier_order (fk_supplier_order);
+
+ALTER TABLE llx_categorie_supplier_order ADD CONSTRAINT fk_categorie_supplier_order_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_supplier_order ADD CONSTRAINT fk_categorie_supplier_order_fk_supplier_order_rowid FOREIGN KEY (fk_supplier_order) REFERENCES llx_commande_fournisseur (rowid);
+
+
+create table llx_categorie_supplier_invoice
+(
+  fk_categorie        integer NOT NULL,
+  fk_supplier_invoice integer NOT NULL,
+  import_key          varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_categorie_supplier_invoice ADD PRIMARY KEY pk_categorie_supplier_invoice (fk_categorie, fk_supplier_invoice);
+ALTER TABLE llx_categorie_supplier_invoice ADD INDEX idx_categorie_supplier_invoice_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_supplier_invoice ADD INDEX idx_categorie_supplier_invoice_fk_supplier_invoice (fk_supplier_invoice);
+
+ALTER TABLE llx_categorie_supplier_invoice ADD CONSTRAINT fk_categorie_supplier_invoice_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_supplier_invoice ADD CONSTRAINT fk_categorie_supplier_invoice_fk_supplier_invoice_rowid FOREIGN KEY (fk_supplier_invoice) REFERENCES llx_facture_fourn (rowid);
diff --git a/htdocs/install/mysql/tables/llx_categorie_invoice.key.sql b/htdocs/install/mysql/tables/llx_categorie_invoice-facture.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_invoice.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_invoice-facture.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_invoice.sql b/htdocs/install/mysql/tables/llx_categorie_invoice-facture.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_invoice.sql
rename to htdocs/install/mysql/tables/llx_categorie_invoice-facture.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql
index b8ffedffc1e..0d911afb671 100644
--- a/htdocs/install/mysql/tables/llx_categorie_member.sql
+++ b/htdocs/install/mysql/tables/llx_categorie_member.sql
@@ -1,6 +1,6 @@
 -- ============================================================================
 -- Copyright (C) 2005      Brice Davoleau <e1davole@iu-vannes.fr>
--- Copyright (C) 2005-2010 Matthieu Valleton <mv@seeschloss.org>		
+-- Copyright (C) 2005-2010 Matthieu Valleton <mv@seeschloss.org>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,5 +20,6 @@
 create table llx_categorie_member
 (
   fk_categorie  integer NOT NULL,
-  fk_member     integer NOT NULL
+  fk_member     integer NOT NULL,
+  import_key    varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_categorie_order.key.sql b/htdocs/install/mysql/tables/llx_categorie_order-commande.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_order.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_order-commande.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_order.sql b/htdocs/install/mysql/tables/llx_categorie_order-commande.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_order.sql
rename to htdocs/install/mysql/tables/llx_categorie_order-commande.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_warehouse.key.sql b/htdocs/install/mysql/tables/llx_categorie_warehouse-stock.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_warehouse.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_warehouse-stock.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_warehouse.sql b/htdocs/install/mysql/tables/llx_categorie_warehouse-stock.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_warehouse.sql
rename to htdocs/install/mysql/tables/llx_categorie_warehouse-stock.sql
diff --git a/htdocs/install/mysql/tables/llx_category_bank.sql b/htdocs/install/mysql/tables/llx_category_bank.sql
deleted file mode 100644
index 10ed331b069..00000000000
--- a/htdocs/install/mysql/tables/llx_category_bank.sql
+++ /dev/null
@@ -1,27 +0,0 @@
--- ===================================================================
--- Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program. If not, see <https://www.gnu.org/licenses/>.
---
--- ===================================================================
-
--- TODO : Remove this file, content of this table has been moved into llx_categories table
-
-create table llx_category_bank
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  label           varchar(255),
-  entity          integer DEFAULT 1 NOT NULL  	-- multi company id
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_category_bankline.sql b/htdocs/install/mysql/tables/llx_category_bankline.sql
index 61112c3bec8..65d54e4e029 100644
--- a/htdocs/install/mysql/tables/llx_category_bankline.sql
+++ b/htdocs/install/mysql/tables/llx_category_bankline.sql
@@ -20,5 +20,6 @@
 create table llx_category_bankline
 (
   lineid   integer NOT NULL,
-  fk_categ integer NOT NULL
+  fk_categ integer NOT NULL,
+  import_key    varchar(14)
 )ENGINE=innodb;