diff --git a/__init__.py b/__init__.py
index f119e65..300ff1d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,7 +8,6 @@ __all__ = ['register']
 def register():
     Pool.register(
         product.Product,
-        machine.Machine,
         module='optical_equipment', type_='model')
     Pool.register(
         module='optical_equipment', type_='wizard')
diff --git a/machine.py b/machine.py
deleted file mode 100644
index 0175d0b..0000000
--- a/machine.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from trytond.model import ModelView, ModelSql
-from trytond.model import fields
-from trytond.pyson import Eval
-
-
-class Machine(ModelView, ModelSql):
-    'Machine'
-
-    __name__ = 'product.machine'
-
-    trade_mark = fields.Char("Trade Mark", size=None, required=True)
-    model  = fields.Char("Model", size=None, required=True)
-    reference = fields.Char("Reference", size=None, required=True)
-    origin_country = fields.Char(
-        "Origin country", size=None, required=True)
-    software_version = fields.Char(
-        "Origin country", size=None, required=True)
-    useful_life = fields.Char(
-        "Useful life", size=None, required=True)
-    warranty = fields.Char(
-        "Warranty", size=None, required=True)
-    serial = fields.Char(
-        "Serial", size=None, required=True)
-    health_register = fields.Char(
-        "Serial", size=None, required=True)
-
-class Properties(ModelView, ModelSql):
-    'Properties'
-
-    __name__ = 'product.machine.property'
-
-   """Medidas del producto, Modúlo Tryton 'product_measurements'.
-    [Lenght, Height, Width].
-
-    Caracteristicas Técnicas, Modúlo Tryton 'product_attribute'.
-    aplica sobre la variante del producto."""
-    
-
-    
diff --git a/product.py b/product.py
index 014a6ea..e2d7086 100644
--- a/product.py
+++ b/product.py
@@ -4,13 +4,36 @@ from trytond.model import fields
 
 __all__ = [Product]
 
+_RISK = [(None, '')]
+_USE = [(None, '')]
+_BIOMEDICAL_CLASS = [(None, '')]
+_MAIN_TECNOLOGY = [(None, '')]
+
 class Product(metaclass=PoolMeta):
     'Product'
     
     __name__ = 'product.template'
 
-    risk = fields.Char("Risk", size=None, required=True)
-    use  = fields.Char("Risk", size=None, required=True)
-    main_tecnology = fields.Char("Risk", size=None, required=True)
+    machine = fields.Boolean('It is machine')
+    risk = fields.Selection(_RISK, 'Type risk')
+    use  = fields.Selection(_USE, 'Use')
+    biomedical_class = fields.Selection(_BIOMEDICAL_CLASS, 'Biomedical Class')
+    main_tecnology = fields.Selection(_MAIN_TECNOLOGY, 'Main tecnology')
     calibration = fields.Boolean("Apply calibration")
     observation = fields.Text(size=None)
+    trade_mark = fields.Char("Trade Mark", size=None, required=True)
+    model  = fields.Char("Model", size=None, required=True)
+    reference = fields.Char("Reference", size=None, required=True)
+    origin_country = fields.Char(
+        "Origin country", size=None, required=True)
+    software_version = fields.Char(
+        "Origin country", size=None, required=True)
+    useful_life = fields.Char(
+        "Useful life", size=None, required=True)
+    warranty = fields.Char(
+        "Warranty", size=None, required=True)
+    serial = fields.Char(
+        "Serial", size=None, required=True)
+    health_register = fields.Char(
+        "Serial", size=None, required=True)
+    refurbish = fields.Boolean('Refurbish')