diff --git a/datamodel_b07_tc/__init__.py b/datamodel_b07_tc/__init__.py
index 44cf759..af10061 100644
--- a/datamodel_b07_tc/__init__.py
+++ b/datamodel_b07_tc/__init__.py
@@ -1,3 +1,3 @@
 
 __URL__ = "https://github.com/FAIRChemistry/datamodel_b07_tc.git"
-__COMMIT__ = "c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+__COMMIT__ = "ac55b72bed16a0027ba585ed1fa2168c71f58708"
diff --git a/datamodel_b07_tc/core/author.py b/datamodel_b07_tc/core/author.py
index 3658000..407d455 100644
--- a/datamodel_b07_tc/core/author.py
+++ b/datamodel_b07_tc/core/author.py
@@ -29,5 +29,5 @@ class Author(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/calibration.py b/datamodel_b07_tc/core/calibration.py
index 683f863..8725e5a 100644
--- a/datamodel_b07_tc/core/calibration.py
+++ b/datamodel_b07_tc/core/calibration.py
@@ -47,5 +47,5 @@ class Calibration(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/chemical.py b/datamodel_b07_tc/core/chemical.py
index d3789f6..8d6f5bc 100644
--- a/datamodel_b07_tc/core/chemical.py
+++ b/datamodel_b07_tc/core/chemical.py
@@ -65,5 +65,5 @@ class Chemical(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/data.py b/datamodel_b07_tc/core/data.py
index 588b406..a5ec816 100644
--- a/datamodel_b07_tc/core/data.py
+++ b/datamodel_b07_tc/core/data.py
@@ -5,8 +5,8 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature, IDGenerator
 
-from astropy.units import UnitBase
 from datetime import datetime as Datetime
+from astropy.units import UnitBase
 
 from .quantity import Quantity
 
@@ -41,5 +41,5 @@ class Data(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/dataset.py b/datamodel_b07_tc/core/dataset.py
index 4d21c1b..36ac25b 100644
--- a/datamodel_b07_tc/core/dataset.py
+++ b/datamodel_b07_tc/core/dataset.py
@@ -6,11 +6,11 @@
 from sdRDM.base.utils import forge_signature, IDGenerator
 
 
-from .speciesdata import SpeciesData
-from .measurement import Measurement
+from .generalinformation import GeneralInformation
 from .plantsetup import PlantSetup
+from .measurement import Measurement
+from .speciesdata import SpeciesData
 from .experiment import Experiment
-from .generalinformation import GeneralInformation
 
 
 @forge_signature
@@ -38,7 +38,7 @@ class Dataset(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
 
     def add_to_experiments(
diff --git a/datamodel_b07_tc/core/device.py b/datamodel_b07_tc/core/device.py
index aa71f32..f9c9a2d 100644
--- a/datamodel_b07_tc/core/device.py
+++ b/datamodel_b07_tc/core/device.py
@@ -39,5 +39,5 @@ class Device(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/experiment.py b/datamodel_b07_tc/core/experiment.py
index 744fb24..a4f2c9b 100644
--- a/datamodel_b07_tc/core/experiment.py
+++ b/datamodel_b07_tc/core/experiment.py
@@ -6,15 +6,15 @@
 from sdRDM.base.utils import forge_signature, IDGenerator
 
 
-from .calibration import Calibration
-from .species import Species
-from .metadata import Metadata
 from .measurementtype import MeasurementType
+from .species import Species
 from .chemicalformula import ChemicalFormula
-from .speciesdata import SpeciesData
+from .metadata import Metadata
+from .plantsetup import PlantSetup
 from .data import Data
+from .calibration import Calibration
 from .measurement import Measurement
-from .plantsetup import PlantSetup
+from .speciesdata import SpeciesData
 
 
 @forge_signature
@@ -50,7 +50,7 @@ class Experiment(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
 
     def add_to_measurements(
diff --git a/datamodel_b07_tc/core/generalinformation.py b/datamodel_b07_tc/core/generalinformation.py
index 443f070..3842b05 100644
--- a/datamodel_b07_tc/core/generalinformation.py
+++ b/datamodel_b07_tc/core/generalinformation.py
@@ -39,7 +39,7 @@ class GeneralInformation(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
 
     def add_to_authors(
diff --git a/datamodel_b07_tc/core/input.py b/datamodel_b07_tc/core/input.py
index 417304b..c06f7a1 100644
--- a/datamodel_b07_tc/core/input.py
+++ b/datamodel_b07_tc/core/input.py
@@ -7,8 +7,8 @@
 
 
 from .reactantrole import ReactantRole
-from .chemical import Chemical
 from .stoichiometry import Stoichiometry
+from .chemical import Chemical
 
 
 @forge_signature
@@ -31,7 +31,7 @@ class Input(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
 
     def add_to_component(
diff --git a/datamodel_b07_tc/core/insulation.py b/datamodel_b07_tc/core/insulation.py
index ac786ff..30e5a37 100644
--- a/datamodel_b07_tc/core/insulation.py
+++ b/datamodel_b07_tc/core/insulation.py
@@ -32,5 +32,5 @@ class Insulation(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/massflowmeter.py b/datamodel_b07_tc/core/massflowmeter.py
index 621722b..5aab361 100644
--- a/datamodel_b07_tc/core/massflowmeter.py
+++ b/datamodel_b07_tc/core/massflowmeter.py
@@ -32,5 +32,5 @@ class MassFlowMeter(Device):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/measurement.py b/datamodel_b07_tc/core/measurement.py
index f144bd1..cbaae35 100644
--- a/datamodel_b07_tc/core/measurement.py
+++ b/datamodel_b07_tc/core/measurement.py
@@ -5,14 +5,14 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature, IDGenerator
 
-from astropy.units import UnitBase
 from datetime import datetime as Datetime
+from astropy.units import UnitBase
 
 from .quantity import Quantity
 from .data import Data
-from .datatype import DataType
-from .metadata import Metadata
 from .measurementtype import MeasurementType
+from .metadata import Metadata
+from .datatype import DataType
 
 
 @forge_signature
@@ -46,7 +46,7 @@ class Measurement(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
 
     def add_to_metadata(
@@ -54,7 +54,7 @@ def add_to_metadata(
         parameter: Optional[str] = None,
         value: Union[str, float, Datetime, None] = None,
         abbreviation: Optional[str] = None,
-        data_type: Union[DataType, str, None] = None,
+        type: Optional[DataType] = None,
         mode: Optional[str] = None,
         unit: Optional[UnitBase] = None,
         description: Optional[str] = None,
@@ -68,7 +68,7 @@ def add_to_metadata(
             parameter (): Name of the parameter.. Defaults to None
             value (): value of the parameter.. Defaults to None
             abbreviation (): abbreviation for the parameter.. Defaults to None
-            data_type (): type of the parameter.. Defaults to None
+            type (): type of the parameter.. Defaults to None
             mode (): mode of the parameter. E.g., on and off.. Defaults to None
             unit (): unit of the parameter.. Defaults to None
             description (): description of the parameter.. Defaults to None
@@ -78,7 +78,7 @@ def add_to_metadata(
             "parameter": parameter,
             "value": value,
             "abbreviation": abbreviation,
-            "data_type": data_type,
+            "type": type,
             "mode": mode,
             "unit": unit,
             "description": description,
diff --git a/datamodel_b07_tc/core/metadata.py b/datamodel_b07_tc/core/metadata.py
index 8cee13c..81c92e6 100644
--- a/datamodel_b07_tc/core/metadata.py
+++ b/datamodel_b07_tc/core/metadata.py
@@ -4,8 +4,8 @@
 from pydantic import Field, PrivateAttr
 from sdRDM.base.utils import forge_signature, IDGenerator
 
-from astropy.units import UnitBase
 from datetime import datetime as Datetime
+from astropy.units import UnitBase
 
 from .datatype import DataType
 
@@ -35,7 +35,7 @@ class Metadata(sdRDM.DataModel):
         description="abbreviation for the parameter.",
     )
 
-    data_type: Union[DataType, str, None] = Field(
+    type: Optional[DataType] = Field(
         default=None,
         description="type of the parameter.",
     )
@@ -59,5 +59,5 @@ class Metadata(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/output.py b/datamodel_b07_tc/core/output.py
index 3517754..39af923 100644
--- a/datamodel_b07_tc/core/output.py
+++ b/datamodel_b07_tc/core/output.py
@@ -7,8 +7,8 @@
 
 
 from .reactantrole import ReactantRole
-from .chemical import Chemical
 from .stoichiometry import Stoichiometry
+from .chemical import Chemical
 
 
 @forge_signature
@@ -31,7 +31,7 @@ class Output(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
 
     def add_to_component(
diff --git a/datamodel_b07_tc/core/parameter.py b/datamodel_b07_tc/core/parameter.py
index a1fe3ea..2328e67 100644
--- a/datamodel_b07_tc/core/parameter.py
+++ b/datamodel_b07_tc/core/parameter.py
@@ -31,5 +31,5 @@ class Parameter(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/plantsetup.py b/datamodel_b07_tc/core/plantsetup.py
index 2a73998..80da968 100644
--- a/datamodel_b07_tc/core/plantsetup.py
+++ b/datamodel_b07_tc/core/plantsetup.py
@@ -6,13 +6,13 @@
 from sdRDM.base.utils import forge_signature, IDGenerator
 
 
-from .input import Input
-from .chemical import Chemical
-from .tubing import Tubing
 from .output import Output
-from .material import Material
 from .insulation import Insulation
+from .chemical import Chemical
+from .tubing import Tubing
 from .device import Device
+from .input import Input
+from .material import Material
 
 
 @forge_signature
@@ -53,7 +53,7 @@ class PlantSetup(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
 
     def add_to_devices(
diff --git a/datamodel_b07_tc/core/potentiostat.py b/datamodel_b07_tc/core/potentiostat.py
index 12547b2..d5a84b5 100644
--- a/datamodel_b07_tc/core/potentiostat.py
+++ b/datamodel_b07_tc/core/potentiostat.py
@@ -4,9 +4,9 @@
 from sdRDM.base.utils import forge_signature, IDGenerator
 
 
-from .measurement import Measurement
 from .metadata import Metadata
 from .device import Device
+from .measurement import Measurement
 
 
 @forge_signature
@@ -33,5 +33,5 @@ class Potentiostat(Device):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/pump.py b/datamodel_b07_tc/core/pump.py
index 63150a1..33c47ba 100644
--- a/datamodel_b07_tc/core/pump.py
+++ b/datamodel_b07_tc/core/pump.py
@@ -4,8 +4,8 @@
 from sdRDM.base.utils import forge_signature, IDGenerator
 
 
-from .pumptype import PumpType
 from .device import Device
+from .pumptype import PumpType
 
 
 @forge_signature
@@ -27,5 +27,5 @@ class Pump(Device):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/speciesdata.py b/datamodel_b07_tc/core/speciesdata.py
index 7e106b3..121a60f 100644
--- a/datamodel_b07_tc/core/speciesdata.py
+++ b/datamodel_b07_tc/core/speciesdata.py
@@ -5,10 +5,10 @@
 from sdRDM.base.utils import forge_signature, IDGenerator
 
 
+from .chemicalformula import ChemicalFormula
+from .data import Data
 from .calibration import Calibration
 from .species import Species
-from .data import Data
-from .chemicalformula import ChemicalFormula
 
 
 @forge_signature
@@ -55,5 +55,5 @@ class SpeciesData(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/stoichiometry.py b/datamodel_b07_tc/core/stoichiometry.py
index eecc437..58db0d4 100644
--- a/datamodel_b07_tc/core/stoichiometry.py
+++ b/datamodel_b07_tc/core/stoichiometry.py
@@ -59,5 +59,5 @@ class Stoichiometry(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/thermocouple.py b/datamodel_b07_tc/core/thermocouple.py
index ba64ee0..2a57e27 100644
--- a/datamodel_b07_tc/core/thermocouple.py
+++ b/datamodel_b07_tc/core/thermocouple.py
@@ -27,5 +27,5 @@ class Thermocouple(Device):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )
diff --git a/datamodel_b07_tc/core/tubing.py b/datamodel_b07_tc/core/tubing.py
index e92f048..4233a7e 100644
--- a/datamodel_b07_tc/core/tubing.py
+++ b/datamodel_b07_tc/core/tubing.py
@@ -5,8 +5,8 @@
 from sdRDM.base.utils import forge_signature, IDGenerator
 
 
-from .material import Material
 from .insulation import Insulation
+from .material import Material
 
 
 @forge_signature
@@ -48,5 +48,5 @@ class Tubing(sdRDM.DataModel):
         default="https://github.com/FAIRChemistry/datamodel_b07_tc.git"
     )
     __commit__: Optional[str] = PrivateAttr(
-        default="c7407c28baaf7f0667ca7e50953202a7c1ae7ff5"
+        default="ac55b72bed16a0027ba585ed1fa2168c71f58708"
     )