diff --git a/src/data/Al.json b/src/data/Al.json
index 4e35939..2f84a61 100644
--- a/src/data/Al.json
+++ b/src/data/Al.json
@@ -1,7 +1,9 @@
 {
   "Name": "Aluminum",
   "Formula": "Al",
-  "CAS Reg No.": "7429-90-5",
+  "Standard": {
+    "CAS Reg No.": "7429-90-5"
+  },
   "Mol. weight": 26.982,
   "Physical Form": {
     "color": "silvery-white metal",
diff --git a/src/data/AlMg4.5Mn0.7.json b/src/data/AlMg4.5Mn0.7.json
index 943e5d5..854267e 100644
--- a/src/data/AlMg4.5Mn0.7.json
+++ b/src/data/AlMg4.5Mn0.7.json
@@ -1,13 +1,10 @@
 {
   "Name": "G.AL® C250 Medium Strength Precision Milled Plate",
   "Name_de": "G.AL® C250 Mittelfeste Präzisionsplatte",
-  "Alloy": {
-    "Standard": "EN AW 5083",
-    "Type": "non heat-treatable"
-  },
   "Formula": "AlMg4.5Mn0.7",
-  "Heat treatment": {
-    "Temper": "homogenized and stress relieved, O3"
+  "Standard": {
+    "EN-AW": "EN AW 5083",
+    "Type": "non heat-treatable"
   },
   "Electromagnetic Data": {
     "sigma": ["16-18", "m/Ω/mm²"]
@@ -27,10 +24,13 @@
       "HBW": ["68-75", "2.5/62.5"]
     }
   },
+  "Heat treatment": {
+    "Temper": "homogenized and stress relieved, O3"
+  },
   "Thermodynamic Properties": {
     "Crystal": {
       "alpha": [23.3, "m/µm/K"],
-      "k": ["110-130", "W/m/K"],
+      "lambda": ["110-130", "W/m/K"],
       "cp": [900, "J/kg/K"]
     }
   },
diff --git a/src/data/INFO.json b/src/data/INFO.json
index f2a0824..97419b8 100644
--- a/src/data/INFO.json
+++ b/src/data/INFO.json
@@ -1,20 +1,34 @@
 {
   "Name": "Name of the material",
+  "Name_de": "German name of the material",
   "Formula": "Formula of the material",
-  "Heat treatment": {
-    "Hardening": "Precipitation hardening or age hardening or particle hardening",
-    "Temper": "Tempering relieves stresses in the metal that were caused by the hardening process. precipitation hardening"
+  "Standard": {
+    "CAS Reg No.": "Chemical Abstracts Service Registry Number",
+    "ISO": "ISO or IUPAC number",
+    "DIN1725": "DIN 1725 number",
+    "EN-AW": "DIN EN 573-3 Standard Aluminium and aluminium alloys",
+    "WERKSTOFFNUMMER": "DIN Werkstoffnummer",
+    "SAE": "AISI/SAE steel grade",
+    "Type": [
+      "Aluminium:",
+      "- Pure aluminium",
+      "- Non age hardening alloys / non heat-treatable",
+      "- Age hardening alloys",
+      "Steel:",
+      "- Austenitic stainless steel grades",
+      "- Martensitic stainless steel grades",
+      "- Ferritic stainless steel grades"
+    ]
   },
-  "CAS Reg No.": "Chemical Abstracts Service Registry Number",
   "Mol. weight": "Molecular weight (relative molar mass)",
   "Physical Form": {
     "color": "color of the material",
     "crystal": "crystal type of the material, e. g. cubic"
   },
   "Equilibrium": {
-    "p": "pressure",
+    "p": "pressure p",
     "rho": "Density at pressure p and temperature T",
-    "T": "Temperature",
+    "T": "Temperature T",
     "T_m": "Normal melting point at pressure p",
     "T_b": "Normal boiling point at vapor pressure p"
   },
@@ -26,14 +40,17 @@
   "p_b(T)": "Vapor pressure \\(p\\) in pascals: \\[\\log(p/Pa) = 5.006 + A + BT^{-1} + C\\log{T} + DT^3\\] where temperature T in K; p. 6-72",
   "Electromagnetic Data": {
     "chi_m": "Magnetic susceptibility; Molar susceptibility \\[\\chi\\ti{m} = \\kappa V\\ti{m} = \\kappa M / \\rho \\] where \\(\\kappa\\) is the volume susceptibility, \\(V\\ti{m}\\) is the molar volume of the substance, \\(M\\) the molar mass, and \\(\\rho\\) the mass density. \\(\\kappa = \\bold{M}/\\bold{H}\\) where \\(\\bold{H}\\) is the magnetic filed and \\(\\bold{M}\\) is magnetic moment per unit volume.",
-    "sigma": "Electrical conductivity"
+    "sigma": "Electrical conductivity σ"
   },
   "Mechanical Properties": {
     "T": "Reference temperature",
-    "rho": "Density",
+    "rho": "Density ρ",
     "E": "Young modulus, module of elasticity",
+    "G": "Shear modulus (rigidity)",
+    "K": "Bulk modulus",
+    "NU": "Poisson ratio ν",
     "Yield strength": {
-      "R_s": "it is detectable only when the material has the yield phenomenon (it does not exist for the cold drawn and the stainless steels)",
+      "R_s": "(aka R_e) it is detectable only when the material has the yield phenomenon (it does not exist for the cold drawn and the stainless steels)",
       "R_p": "it is detectable on cold drawn and stainless steel, in place of R_s",
       "R_p02": "load corresponding to a no proportional charge equal to a 0.2% of length L_0",
       "R_p10": "load corresponding to a no proportional charge equal to a 1% of length L_0"
@@ -46,13 +63,25 @@
       "A_5": "permanent elongation for proportional specimens with length L_0 equal to 5 times diameter"
     },
     "Hardness": {
-      "HBW": ""
+      "HM": "Mohs hardness",
+      "HB": "Brinell hardness",
+      "HBW": "H hardness, B Brinell and W tungsten (wolfram) carbide indenter",
+      "HRC": "Rockwell hardness",
+      "HV": "Vickers hardness"
+    },
+    "Anodising": {
+      "AH": "Hard anodising rating",
+      "ASA": "Sulphuric acid (Decorative Type II) anodising rating"
     }
   },
+  "Heat treatment": {
+    "Hardening": "Precipitation hardening or age hardening or particle hardening",
+    "Temper": "Tempering relieves stresses in the metal that were caused by the hardening process. precipitation hardening"
+  },
   "Thermodynamic Properties": {
     "Crystal, Liquid, Gas": {
-      "alpha": "Coefficient of thermal expansion",
-      "k": "Thermal conductivity",
+      "alpha": "Linear coefficient of thermal expansion α",
+      "lambda": "Thermal conductivity λ (aka k or ϰ)",
       "Delta_f H°": "Standard molar enthalpy (heat) of formation at 298.15 K in kJ/mol. 0.0 indicates the reference state.",
       "Delta_f G°": "Standard molar Gibbs energy of formation at 298.15 K in kJ/mol",
       "S°": "Standard molar entropy at 298.15 K in J/mol/K",
@@ -87,5 +116,6 @@
       "opaque": "value or list of values of 'supersaturated', 'saturated'"
     }
   },
+  "Vacuum": "Vacuum rating",
   "Source": "Sources"
 }
diff --git a/src/data/example.json b/src/data/example.json
index 56dab02..2b49180 100644
--- a/src/data/example.json
+++ b/src/data/example.json
@@ -1,14 +1,15 @@
 {
   "Name": "Name of the material",
-  "Alloy": {
-    "Standard": "EN AW xxxx",
+  "Formula": "Al, AlMg4.5Mn0.7",
+  "Standard": {
+    "CAS Reg No.": "7429-90-5",
+    "ISO": "ISO or IUPAC number",
+    "DIN1725": "DIN 1725 number",
+    "EN-AW": "EN AW 5083",
+    "WERKSTOFFNUMMER": "DIN Werkstoffnummer",
+    "SAE": "AISI/SAE steel grade",
     "Type": "non heat-treatable"
   },
-  "Formula": "Al, AlMg4.5Mn0.7",
-  "Heat treatment": {
-    "Temper": "homogenized and stress relieved, O3"
-  },
-  "CAS Reg No.": "7429-90-5",
   "Mol. weight": 26.982,
   "Physical Form": {
     "color": "silvery-white metal",
@@ -22,6 +23,9 @@
     "T": ["20-25", "°C"],
     "rho": [2.66, "g/cm³"],
     "E": [70, "GPa"],
+    "G": [26, "GPa"],
+    "K": [70, "GPa"],
+    "NU": 0.35,
     "Yield strength": {
       "R_p02": ["110-130", "MPa"]
     },
@@ -33,10 +37,13 @@
       "HBW": ["68-75", "2.5/62.5"]
     }
   },
+  "Heat treatment": {
+    "Temper": "homogenized and stress relieved, O3"
+  },
   "Thermodynamic Properties": {
     "Crystal": {
       "alpha": [23.3, "m/µm/K"],
-      "k": ["110-130", "W/m/K"],
+      "lambda": ["110-130", "W/m/K"],
       "cp": [900, "J/kg/K"]
     }
   },