diff --git a/partner_nace/models/res_partner_nace.py b/partner_nace/models/res_partner_nace.py
index 92b82615a..ba3f14084 100644
--- a/partner_nace/models/res_partner_nace.py
+++ b/partner_nace/models/res_partner_nace.py
@@ -27,6 +27,9 @@ from openerp import models, fields
 
 class ResPartnerNace(models.Model):
     _name = 'res.partner.nace'
+    _order = "parent_left"
+    _parent_order = "name"
+    _parent_store = True
     _description = "NACE Activity"
 
     # NACE fields
@@ -40,3 +43,7 @@ class ResPartnerNace(models.Model):
     exclusions = fields.Char(string="Excludes")
     # Parent hierarchy
     parent_id = fields.Many2one(comodel_name='res.partner.nace')
+    children = fields.One2many(comodel_name='res.partner.nace',
+                               inverse_name='parent_id')
+    parent_left = fields.Integer('Parent Left', select=True)
+    parent_right = fields.Integer('Parent Right', select=True)
diff --git a/partner_nace/wizard/nace_import.py b/partner_nace/wizard/nace_import.py
index 78b5c9600..e676e6028 100644
--- a/partner_nace/wizard/nace_import.py
+++ b/partner_nace/wizard/nace_import.py
@@ -241,7 +241,8 @@ class NaceImport(models.TransientModel):
 
     @api.one
     def run_import(self):
-        nace_model = self.env['res.partner.nace']
+        nace_model = self.env['res.partner.nace'].\
+            with_context(defer_parent_store_computation=True)
         lang_model = self.env['res.lang']
         # Available lang list
         langs = lang_model.search(