diff --git a/nfu_product_bnn_attributes/README.rst b/nfu_product_bnn_attributes/README.rst
index 4e3438f..b2ec0ab 100644
--- a/nfu_product_bnn_attributes/README.rst
+++ b/nfu_product_bnn_attributes/README.rst
@@ -34,6 +34,7 @@ Changelog
 
 
 :1.0.0: Initial module.
+:1.1.0: Add packaging
 
 Bug Tracker
 ===========
diff --git a/nfu_product_bnn_attributes/__manifest__.py b/nfu_product_bnn_attributes/__manifest__.py
index 5e7077e..4d046ca 100644
--- a/nfu_product_bnn_attributes/__manifest__.py
+++ b/nfu_product_bnn_attributes/__manifest__.py
@@ -6,7 +6,7 @@
     "category": "Product",
     "version": "16.0.1.0.0",
     "depends": ["product"],
-    "data": ["views/product_template_bnn_view.xml"],
+    "data": ["views/product_bnn_views.xml"],
     "assets": {},
     "license": "LGPL-3",
     "installable": True,
diff --git a/nfu_product_bnn_attributes/models/product_product.py b/nfu_product_bnn_attributes/models/product_product.py
new file mode 100644
index 0000000..29ccd70
--- /dev/null
+++ b/nfu_product_bnn_attributes/models/product_product.py
@@ -0,0 +1,12 @@
+from odoo import models
+
+
+class ProductProduct(models.Model):
+    _inherit = "product.product"
+
+    # Should be moved to product.product at some point
+    # additional_information = fields.Char()
+    # quality = fields.Char()
+    # origin = fields.Char()
+    # packaging_qty = fields.Float(string="Packaging Quantity")
+    # packaging_name = fields.Char()
diff --git a/nfu_product_bnn_attributes/models/product_template.py b/nfu_product_bnn_attributes/models/product_template.py
index 1581bbc..22aa5ca 100644
--- a/nfu_product_bnn_attributes/models/product_template.py
+++ b/nfu_product_bnn_attributes/models/product_template.py
@@ -4,7 +4,10 @@ from odoo import fields, models
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
+    manufacturer_abbr = fields.Char(string="Manufacturer Abbreviation")
+    # Should be moved to product.product at some point
     additional_information = fields.Char()
     quality = fields.Char()
     origin = fields.Char()
-    manufacturer_abbr = fields.Char(string="Manufacturer Abbreviation")
+    packaging_qty = fields.Float(string="Packaging Quantity")
+    packaging_name = fields.Char()
diff --git a/nfu_product_bnn_attributes/readme/HISTORY.rst b/nfu_product_bnn_attributes/readme/HISTORY.rst
index 962941f..e6c8ca0 100644
--- a/nfu_product_bnn_attributes/readme/HISTORY.rst
+++ b/nfu_product_bnn_attributes/readme/HISTORY.rst
@@ -1,2 +1,3 @@
 
-:1.0.0: Initial module.
\ No newline at end of file
+:1.0.0: Initial module.
+:1.1.0: Add packaging
\ No newline at end of file
diff --git a/nfu_product_bnn_attributes/static/description/index.html b/nfu_product_bnn_attributes/static/description/index.html
index c09ba0b..fe44d6a 100644
--- a/nfu_product_bnn_attributes/static/description/index.html
+++ b/nfu_product_bnn_attributes/static/description/index.html
@@ -392,6 +392,8 @@ ul.auto-toc {
 <tbody valign="top">
 <tr class="field"><th class="field-name">1.0.0:</th><td class="field-body">Initial module.</td>
 </tr>
+<tr class="field"><th class="field-name">1.1.0:</th><td class="field-body">Add packaging</td>
+</tr>
 </tbody>
 </table>
 </div>
diff --git a/nfu_product_bnn_attributes/views/product_bnn_views.xml b/nfu_product_bnn_attributes/views/product_bnn_views.xml
new file mode 100644
index 0000000..283260f
--- /dev/null
+++ b/nfu_product_bnn_attributes/views/product_bnn_views.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="product_template_form_view" model="ir.ui.view">
+        <field name="name">product.template.view.inherit.bnn</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_form_view"/>
+        <field name="arch" type="xml">
+            <page name="general_information" position="after">
+                <page name="bnn" string="BNN Information">
+                    <group>
+                        <group name="bnn_information">
+                            <field name="manufacturer_abbr"/>
+                            <field name="additional_information"/>
+                            <field name="quality"/>
+                            <field name="origin"/>
+                        </group>
+                        <group name="bnn_packaging">
+                            <field name="packaging_name"/>
+                            <field name="packaging_qty"/>
+                        </group>
+                    </group>
+                </page>
+            </page>
+        </field>
+    </record>
+    <!--
+    Should be moved to product.product at some point
+     <record id="product_normal_form_view" model="ir.ui.view">
+        <field name="name">product.product.form.inherit.bnn</field>
+        <field name="model">product.product</field>
+        <field name="mode">primary</field>
+        <field name="inherit_id" ref="nfu_product_bnn_attributes.product_template_form_view"/>
+        <field name="arch" type="xml">
+            <group name="bnn_information" position="inside">
+                <field name="additional_information"/>
+                <field name="quality"/>
+                <field name="origin"/>
+            </group>
+            <page name="bnn" position="inside">
+                <group name="bnn_packaging">
+                    <field name="packaging_name"/>
+                    <field name="packaging_qty"/>
+                </group>
+            </page>
+        </field>
+    </record> -->
+</odoo>
diff --git a/nfu_product_bnn_attributes/views/product_template_bnn_view.xml b/nfu_product_bnn_attributes/views/product_template_bnn_view.xml
deleted file mode 100644
index cb806f7..0000000
--- a/nfu_product_bnn_attributes/views/product_template_bnn_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="product_template_bnn_view" model="ir.ui.view">
-        <field name="name">product.template.bnn.view</field>
-        <field name="model">product.template</field>
-        <field name="inherit_id" ref="product.product_template_only_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//page[@name='general_information']" position="after">
-                <page name="bnn" string="BNN Information">
-                    <group>
-                        <field name="additional_information"/>
-                        <field name="manufacturer_abbr"/>
-                        <field name="quality"/>
-                        <field name="origin"/>
-                    </group>
-                </page>
-            </xpath>
-        </field>
-    </record>
-</odoo>