diff --git a/Test.UI/Data/AntaDoppia.jwd b/Test.UI/Data/AntaDoppia.jwd
index fe1c70c..1fdcc46 100644
--- a/Test.UI/Data/AntaDoppia.jwd
+++ b/Test.UI/Data/AntaDoppia.jwd
@@ -69,7 +69,7 @@
               "JointType": "FULL_V"
             }
           ],
-          "Hardware": "000000",
+          "Hardware": "102111",
           "AreaList": [
             {
               "AreaList": [
diff --git a/Test.UI/Data/AntaSingola.jwd b/Test.UI/Data/AntaSingola.jwd
index 3a18934..46c2320 100644
--- a/Test.UI/Data/AntaSingola.jwd
+++ b/Test.UI/Data/AntaSingola.jwd
@@ -64,7 +64,7 @@
               "JointType": "FULL_H"
             }
           ],
-          "Hardware": "000000",
+          "Hardware": "101111",
           "AreaList": [
             {
               "FillType": "GLASS",
diff --git a/Test.UI/Data/FinDueAnteBottomFisso.jwd b/Test.UI/Data/FinDueAnteBottomFisso.jwd
index 36f9952..9ddb068 100644
--- a/Test.UI/Data/FinDueAnteBottomFisso.jwd
+++ b/Test.UI/Data/FinDueAnteBottomFisso.jwd
@@ -94,7 +94,7 @@
                       "JointType": "FULL_H"
                     }
                   ],
-                  "Hardware": "000000",
+                  "Hardware": "102112",
                   "AreaList": [
                     {
                       "AreaList": [
diff --git a/Test.UI/Hardware/Setup.json b/Test.UI/Hardware/Setup.json
index 476545f..b232b3f 100644
--- a/Test.UI/Hardware/Setup.json
+++ b/Test.UI/Hardware/Setup.json
@@ -1,6 +1,6 @@
 [
   {
-    "sId": "000100",
+    "sId": "101111",
     "sFamily": "Natura",
     "sName": "Natura_ANTA_RIBALTA_RECTANGLE_1SASH_2T_12_2T",
     "sOpeningType": "ANTA_RIBALTA",
@@ -9,7 +9,7 @@
     "nSashPosition": "1"
   },
   {
-    "sId": "000101",
+    "sId": "101112",
     "sFamily": "Natura",
     "sName": "Natura_ANTA_RIBALTA_RECTANGLE_1SASH_3T_12_3T",
     "sOpeningType": "ANTA_RIBALTA",
@@ -18,7 +18,34 @@
     "nSashPosition": "1"
   },
   {
-    "sId": "000102",
+    "sId": "101121",
+    "sFamily": "Natura",
+    "sName": "Natura_ANTA_BANDIERA_RECTANGLE_1SASH_2T_12_2T",
+    "sOpeningType": "ANTA_BANDIERA",
+    "sShape": "RECTANGLE",
+    "nSashQty": "1",
+    "nSashPosition": "1"
+  },
+  {
+    "sId": "101122",
+    "sFamily": "Natura",
+    "sName": "Natura_ANTA_BANDIERA_RECTANGLE_1SASH_3T_12_3T",
+    "sOpeningType": "ANTA_BANDIERA",
+    "sShape": "RECTANGLE",
+    "nSashQty": "1",
+    "nSashPosition": "1"
+  },
+  {
+    "sId": "101211",
+    "sFamily": "Natura",
+    "sName": "Natura_ANTA_RIBALTA_CHAMFER_1SASH_3T_12_3T",
+    "sOpeningType": "ANTA_RIBALTA",
+    "sShape": "CHAMFER",
+    "nSashQty": "1",
+    "nSashPosition": "1"
+  },
+  {
+    "sId": "102111",
     "sFamily": "Natura",
     "sName": "Natura_ANTA_RIBALTA_RECTANGLE_2SASH_3T_12_3T",
     "sOpeningType": "ANTA_RIBALTA",
@@ -27,7 +54,34 @@
     "nSashPosition": "1"
   },
   {
-    "sId": "000103",
+    "sId": "102112",
+    "sFamily": "Natura",
+    "sName": "Natura_ANTA_RIBALTA_RECTANGLE_2SASH_2T_18_2T",
+    "sOpeningType": "ANTA_RIBALTA",
+    "sShape": "RECTANGLE",
+    "nSashQty": "2",
+    "nSashPosition": "1"
+  },
+  {
+    "sId": "102121",
+    "sFamily": "Natura",
+    "sName": "Natura_ANTA_BANDIERA_RECTANGLE_2SASH_3T_12_3T",
+    "sOpeningType": "ANTA_BANDIERA",
+    "sShape": "RECTANGLE",
+    "nSashQty": "2",
+    "nSashPosition": "1"
+  },
+  {
+    "sId": "102221",
+    "sFamily": "Natura",
+    "sName": "Natura_ANTA_BANDIERA_CHAMFER_2SASH_3T_12_3T",
+    "sOpeningType": "ANTA_BANDIERA",
+    "sShape": "CHAMFER",
+    "nSashQty": "2",
+    "nSashPosition": "1"
+  },
+  {
+    "sId": "201111",
     "sFamily": "Optima",
     "sName": "Optima_ANTA_RIBALTA_RECTANGLE_1SASH_3T_12_3T",
     "sOpeningType": "ANTA_RIBALTA",
@@ -36,12 +90,30 @@
     "nSashPosition": "1"
   },
   {
-    "sId": "000104",
+    "sId": "201221",
+    "sFamily": "Optima",
+    "sName": "Optima_ANTA_BANDIERA_RECTANGLE_1SASH_3T_12_3T",
+    "sOpeningType": "ANTA_BANDIERA",
+    "sShape": "CHAMFER",
+    "nSashQty": "1",
+    "nSashPosition": "1"
+  },
+  {
+    "sId": "202111",
     "sFamily": "Optima",
     "sName": "Optima_ANTA_RIBALTA_RECTANGLE_2SASH_3T_12_3T",
     "sOpeningType": "ANTA_RIBALTA",
     "sShape": "RECTANGLE",
     "nSashQty": "2",
     "nSashPosition": "1"
+  },
+  {
+    "sId": "202211",
+    "sFamily": "Optima",
+    "sName": "Optima_ANTA_RIBALTA_CHAMFER_2SASH_3T_12_3T",
+    "sOpeningType": "ANTA_RIBALTA",
+    "sShape": "CHAMFER",
+    "nSashQty": "2",
+    "nSashPosition": "1"
   }
 ]
\ No newline at end of file