diff --git a/pyThermoML/__init__.py b/pyThermoML/__init__.py
index 336f8b8..890adda 100644
--- a/pyThermoML/__init__.py
+++ b/pyThermoML/__init__.py
@@ -1,3 +1,3 @@
 
 __URL__ = "https://github.com/FAIRChemistry/pyThermoML"
-__COMMIT__ = "4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+__COMMIT__ = "4d2d23abb157f43b563c9d44de5b83e37a50b96b"
diff --git a/pyThermoML/core/activityfugacityosmoticprop.py b/pyThermoML/core/activityfugacityosmoticprop.py
index 71ea607..602525d 100644
--- a/pyThermoML/core/activityfugacityosmoticprop.py
+++ b/pyThermoML/core/activityfugacityosmoticprop.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class ActivityFugacityOsmoticProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/asymcombexpanduncert.py b/pyThermoML/core/asymcombexpanduncert.py
index 42f1d99..e6af84c 100644
--- a/pyThermoML/core/asymcombexpanduncert.py
+++ b/pyThermoML/core/asymcombexpanduncert.py
@@ -30,7 +30,7 @@ class AsymCombExpandUncert(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/asymcombstduncert.py b/pyThermoML/core/asymcombstduncert.py
index b941e1d..18d0904 100644
--- a/pyThermoML/core/asymcombstduncert.py
+++ b/pyThermoML/core/asymcombstduncert.py
@@ -30,7 +30,7 @@ class AsymCombStdUncert(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/asymexpanduncert.py b/pyThermoML/core/asymexpanduncert.py
index e64fc90..9121c59 100644
--- a/pyThermoML/core/asymexpanduncert.py
+++ b/pyThermoML/core/asymexpanduncert.py
@@ -30,7 +30,7 @@ class AsymExpandUncert(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/asymstduncert.py b/pyThermoML/core/asymstduncert.py
index 905da11..919d81d 100644
--- a/pyThermoML/core/asymstduncert.py
+++ b/pyThermoML/core/asymstduncert.py
@@ -30,7 +30,7 @@ class AsymStdUncert(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/auxiliarysubstance.py b/pyThermoML/core/auxiliarysubstance.py
index aee3a52..da325a8 100644
--- a/pyThermoML/core/auxiliarysubstance.py
+++ b/pyThermoML/core/auxiliarysubstance.py
@@ -7,9 +7,9 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .efunction import eFunction
-from .regnum import RegNum
 from .ephase import ePhase
+from .regnum import RegNum
+from .efunction import eFunction
 
 
 @forge_signature
@@ -45,7 +45,7 @@ class AuxiliarySubstance(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/biomaterial.py b/pyThermoML/core/biomaterial.py
index 7992c80..a4219e5 100644
--- a/pyThermoML/core/biomaterial.py
+++ b/pyThermoML/core/biomaterial.py
@@ -30,7 +30,7 @@ class Biomaterial(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/bioproperties.py b/pyThermoML/core/bioproperties.py
index a3b7c24..fca5b7f 100644
--- a/pyThermoML/core/bioproperties.py
+++ b/pyThermoML/core/bioproperties.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class BioProperties(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/book.py b/pyThermoML/core/book.py
index 519d9d6..bbd6cab 100644
--- a/pyThermoML/core/book.py
+++ b/pyThermoML/core/book.py
@@ -58,7 +58,7 @@ class Book(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/catalyst.py b/pyThermoML/core/catalyst.py
index 9ce86b9..e29007d 100644
--- a/pyThermoML/core/catalyst.py
+++ b/pyThermoML/core/catalyst.py
@@ -35,7 +35,7 @@ class Catalyst(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/citation.py b/pyThermoML/core/citation.py
index 0eade86..df3df20 100644
--- a/pyThermoML/core/citation.py
+++ b/pyThermoML/core/citation.py
@@ -7,12 +7,12 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .esourcetype import eSourceType
-from .book import Book
 from .etype import eType
 from .thesis import Thesis
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
 from .journal import Journal
 
 
@@ -167,7 +167,7 @@ class Citation(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/combineduncertainty.py b/pyThermoML/core/combineduncertainty.py
index 4838087..dae4f51 100644
--- a/pyThermoML/core/combineduncertainty.py
+++ b/pyThermoML/core/combineduncertainty.py
@@ -7,9 +7,9 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .ecombuncertevalmethod import eCombUncertEvalMethod
 from .asymcombexpanduncert import AsymCombExpandUncert
 from .asymcombstduncert import AsymCombStdUncert
+from .ecombuncertevalmethod import eCombUncertEvalMethod
 
 
 @forge_signature
@@ -77,7 +77,7 @@ class CombinedUncertainty(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/component.py b/pyThermoML/core/component.py
index 48bca1b..02bb1d9 100644
--- a/pyThermoML/core/component.py
+++ b/pyThermoML/core/component.py
@@ -37,7 +37,7 @@ class Component(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/componentsample.py b/pyThermoML/core/componentsample.py
index f0d02f8..bf2898f 100644
--- a/pyThermoML/core/componentsample.py
+++ b/pyThermoML/core/componentsample.py
@@ -34,7 +34,7 @@ class ComponentSample(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/compositionatphaseequilibrium.py b/pyThermoML/core/compositionatphaseequilibrium.py
index b732050..fcd4a68 100644
--- a/pyThermoML/core/compositionatphaseequilibrium.py
+++ b/pyThermoML/core/compositionatphaseequilibrium.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class CompositionAtPhaseEquilibrium(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/compound.py b/pyThermoML/core/compound.py
index 2b552c4..fa0cefe 100644
--- a/pyThermoML/core/compound.py
+++ b/pyThermoML/core/compound.py
@@ -7,18 +7,18 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
+from .sorgid import SOrgID
+from .multicomponentsubstance import MulticomponentSubstance
+from .ion import Ion
 from .sample import Sample
+from .purity import Purity
+from .esource import eSource
+from .estatus import eStatus
+from .polymer import Polymer
 from .regnum import RegNum
+from .biomaterial import Biomaterial
 from .especiationstate import eSpeciationState
-from .ion import Ion
-from .esource import eSource
 from .componentsample import ComponentSample
-from .multicomponentsubstance import MulticomponentSubstance
-from .biomaterial import Biomaterial
-from .polymer import Polymer
-from .sorgid import SOrgID
-from .purity import Purity
-from .estatus import eStatus
 
 
 @forge_signature
@@ -128,7 +128,7 @@ class Compound(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/constraint.py b/pyThermoML/core/constraint.py
index 0c9d1bd..91359c7 100644
--- a/pyThermoML/core/constraint.py
+++ b/pyThermoML/core/constraint.py
@@ -7,12 +7,12 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .solvent import Solvent
-from .construncertainty import ConstrUncertainty
-from .constraintphaseid import ConstraintPhaseID
-from .constraintid import ConstraintID
 from .constrdevicespec import ConstrDeviceSpec
+from .constraintid import ConstraintID
+from .solvent import Solvent
 from .constrrepeatability import ConstrRepeatability
+from .constraintphaseid import ConstraintPhaseID
+from .construncertainty import ConstrUncertainty
 
 
 @forge_signature
@@ -74,7 +74,7 @@ class Constraint(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/constraintid.py b/pyThermoML/core/constraintid.py
index 60ee3fa..900df2c 100644
--- a/pyThermoML/core/constraintid.py
+++ b/pyThermoML/core/constraintid.py
@@ -37,7 +37,7 @@ class ConstraintID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/constraintphaseid.py b/pyThermoML/core/constraintphaseid.py
index c4b1809..72353c1 100644
--- a/pyThermoML/core/constraintphaseid.py
+++ b/pyThermoML/core/constraintphaseid.py
@@ -7,9 +7,9 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
+from .ecrystallatticetype import eCrystalLatticeType
 from .econstraintphase import eConstraintPhase
 from .regnum import RegNum
-from .ecrystallatticetype import eCrystalLatticeType
 
 
 @forge_signature
@@ -48,7 +48,7 @@ class ConstraintPhaseID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/constrainttype.py b/pyThermoML/core/constrainttype.py
index d60cd7f..d732792 100644
--- a/pyThermoML/core/constrainttype.py
+++ b/pyThermoML/core/constrainttype.py
@@ -7,13 +7,13 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .etemperature import eTemperature
 from .ecomponentcomposition import eComponentComposition
-from .epressure import ePressure
-from .eparticipantamount import eParticipantAmount
-from .esolventcomposition import eSolventComposition
+from .etemperature import eTemperature
 from .ebiovariables import eBioVariables
+from .eparticipantamount import eParticipantAmount
 from .emiscellaneous import eMiscellaneous
+from .epressure import ePressure
+from .esolventcomposition import eSolventComposition
 
 
 @forge_signature
@@ -58,7 +58,7 @@ class ConstraintType(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/constrdevicespec.py b/pyThermoML/core/constrdevicespec.py
index 64c9fdc..39beda6 100644
--- a/pyThermoML/core/constrdevicespec.py
+++ b/pyThermoML/core/constrdevicespec.py
@@ -50,7 +50,7 @@ class ConstrDeviceSpec(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/constrrepeatability.py b/pyThermoML/core/constrrepeatability.py
index 05838df..9391f31 100644
--- a/pyThermoML/core/constrrepeatability.py
+++ b/pyThermoML/core/constrrepeatability.py
@@ -42,7 +42,7 @@ class ConstrRepeatability(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/construncertainty.py b/pyThermoML/core/construncertainty.py
index 449b26e..e16d7ab 100644
--- a/pyThermoML/core/construncertainty.py
+++ b/pyThermoML/core/construncertainty.py
@@ -54,7 +54,7 @@ class ConstrUncertainty(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/covariance.py b/pyThermoML/core/covariance.py
index 6a6443a..ec248f8 100644
--- a/pyThermoML/core/covariance.py
+++ b/pyThermoML/core/covariance.py
@@ -35,7 +35,7 @@ class Covariance(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/criticalevaluation.py b/pyThermoML/core/criticalevaluation.py
index dbdace7..d250173 100644
--- a/pyThermoML/core/criticalevaluation.py
+++ b/pyThermoML/core/criticalevaluation.py
@@ -8,8 +8,8 @@
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
 from .equationofstate import EquationOfState
-from .multiprop import MultiProp
 from .singleprop import SingleProp
+from .multiprop import MultiProp
 
 
 @forge_signature
@@ -42,7 +42,7 @@ class CriticalEvaluation(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/criticals.py b/pyThermoML/core/criticals.py
index 480e37b..ba16ef7 100644
--- a/pyThermoML/core/criticals.py
+++ b/pyThermoML/core/criticals.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class Criticals(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/curvedev.py b/pyThermoML/core/curvedev.py
index 433103c..3915fae 100644
--- a/pyThermoML/core/curvedev.py
+++ b/pyThermoML/core/curvedev.py
@@ -50,7 +50,7 @@ class CurveDev(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/datareport.py b/pyThermoML/core/datareport.py
index ba24c03..8853ef5 100644
--- a/pyThermoML/core/datareport.py
+++ b/pyThermoML/core/datareport.py
@@ -10,35 +10,35 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .regnum import RegNum
 from .sorgid import SOrgID
-from .phaseid import PhaseID
+from .property import Property
+from .propphaseid import PropPhaseID
+from .reactiondata import ReactionData
+from .pureormixturedata import PureOrMixtureData
 from .compound import Compound
+from .variable import Variable
 from .ion import Ion
-from .biomaterial import Biomaterial
+from .equation import Equation
+from .auxiliarysubstance import AuxiliarySubstance
 from .multicomponentsubstance import MulticomponentSubstance
-from .propertymethodid import PropertyMethodID
 from .participant import Participant
-from .combineduncertainty import CombinedUncertainty
+from .propertymethodid import PropertyMethodID
+from .eexppurpose import eExpPurpose
 from .component import Component
-from .pureormixturedata import PureOrMixtureData
+from .ereactiontype import eReactionType
+from .solvent import Solvent
+from .citation import Citation
 from .numvalues import NumValues
 from .especiationstate import eSpeciationState
-from .propphaseid import PropPhaseID
-from .auxiliarysubstance import AuxiliarySubstance
+from .ereactionformalism import eReactionFormalism
+from .sample import Sample
 from .version import Version
-from .property import Property
-from .polymer import Polymer
-from .reactiondata import ReactionData
-from .equation import Equation
-from .eexppurpose import eExpPurpose
+from .combineduncertainty import CombinedUncertainty
+from .biomaterial import Biomaterial
 from .constraint import Constraint
-from .citation import Citation
-from .sample import Sample
-from .variable import Variable
-from .solvent import Solvent
-from .ereactionformalism import eReactionFormalism
-from .ereactiontype import eReactionType
+from .polymer import Polymer
+from .regnum import RegNum
+from .phaseid import PhaseID
 from ..tools.mapping import (
     CONTSTRAINT_IDS,
     VARIABLES_IDS,
@@ -87,7 +87,7 @@ class DataReport(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
@@ -514,7 +514,6 @@ def analysis_property(
             # Check if property exists in pure of mixture data
             if pomd.property_exists(prop_name, property_identifier):
 
-
                 # Get properties
                 prop_df = pomd.get_property()
 
@@ -523,13 +522,15 @@ def analysis_property(
 
                 for variable in variables:
                     prop_df[variable["type"]] = variable["values"]
-                
+
                 # Get constraints
                 constraints = pomd.get_constraints()
 
                 for const in constraints:
                     txt = f'{const["type"]} of'
-                    txt += f' {id_dict[const["component_identifier"].n_org_num][0] if const["component_identifier"].n_org_num else "system"}'
+                    txt += (
+                        f' {id_dict[const["component_identifier"].n_org_num][0] if const["component_identifier"].n_org_num else "system"}'
+                    )
                     prop_df[txt] = [const["value"]] * prop_df.shape[0]
 
                 final.append(prop_df)
diff --git a/pyThermoML/core/eqconstant.py b/pyThermoML/core/eqconstant.py
index 66aba49..926c035 100644
--- a/pyThermoML/core/eqconstant.py
+++ b/pyThermoML/core/eqconstant.py
@@ -44,7 +44,7 @@ class EqConstant(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/eqconstraint.py b/pyThermoML/core/eqconstraint.py
index 9623f17..929d220 100644
--- a/pyThermoML/core/eqconstraint.py
+++ b/pyThermoML/core/eqconstraint.py
@@ -62,7 +62,7 @@ class EqConstraint(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/eqparameter.py b/pyThermoML/core/eqparameter.py
index 4f3f62a..6df0719 100644
--- a/pyThermoML/core/eqparameter.py
+++ b/pyThermoML/core/eqparameter.py
@@ -41,7 +41,7 @@ class EqParameter(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/eqproperty.py b/pyThermoML/core/eqproperty.py
index 599a539..9beccee 100644
--- a/pyThermoML/core/eqproperty.py
+++ b/pyThermoML/core/eqproperty.py
@@ -58,7 +58,7 @@ class EqProperty(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/equation.py b/pyThermoML/core/equation.py
index 7ae89d8..6123d3d 100644
--- a/pyThermoML/core/equation.py
+++ b/pyThermoML/core/equation.py
@@ -7,13 +7,13 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
+from .eqparameter import EqParameter
 from .eqconstant import EqConstant
+from .eqconstraint import EqConstraint
+from .eqproperty import EqProperty
 from .eeqname import eEqName
-from .eqparameter import EqParameter
-from .eqvariable import EqVariable
 from .covariance import Covariance
-from .eqproperty import EqProperty
-from .eqconstraint import EqConstraint
+from .eqvariable import EqVariable
 
 
 @forge_signature
@@ -75,7 +75,7 @@ class Equation(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/equationofstate.py b/pyThermoML/core/equationofstate.py
index b70cb5f..445b770 100644
--- a/pyThermoML/core/equationofstate.py
+++ b/pyThermoML/core/equationofstate.py
@@ -7,13 +7,13 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .esourcetype import eSourceType
-from .book import Book
-from .evaleosref import EvalEOSRef
 from .etype import eType
 from .thesis import Thesis
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
+from .evaleosref import EvalEOSRef
 from .journal import Journal
 
 
@@ -45,7 +45,7 @@ class EquationOfState(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/eqvariable.py b/pyThermoML/core/eqvariable.py
index 979c461..bc4a974 100644
--- a/pyThermoML/core/eqvariable.py
+++ b/pyThermoML/core/eqvariable.py
@@ -54,7 +54,7 @@ class EqVariable(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/evaleosref.py b/pyThermoML/core/evaleosref.py
index 3ce4ba2..362d64d 100644
--- a/pyThermoML/core/evaleosref.py
+++ b/pyThermoML/core/evaleosref.py
@@ -7,12 +7,12 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .esourcetype import eSourceType
-from .book import Book
 from .etype import eType
 from .thesis import Thesis
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
 from .journal import Journal
 
 
@@ -167,7 +167,7 @@ class EvalEOSRef(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/evalmultipropref.py b/pyThermoML/core/evalmultipropref.py
index 2114b50..caba26f 100644
--- a/pyThermoML/core/evalmultipropref.py
+++ b/pyThermoML/core/evalmultipropref.py
@@ -7,12 +7,12 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .esourcetype import eSourceType
-from .book import Book
 from .etype import eType
 from .thesis import Thesis
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
 from .journal import Journal
 
 
@@ -167,7 +167,7 @@ class EvalMultiPropRef(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/evalsinglepropref.py b/pyThermoML/core/evalsinglepropref.py
index 896daf8..bdc0899 100644
--- a/pyThermoML/core/evalsinglepropref.py
+++ b/pyThermoML/core/evalsinglepropref.py
@@ -7,12 +7,12 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .esourcetype import eSourceType
-from .book import Book
 from .etype import eType
 from .thesis import Thesis
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
 from .journal import Journal
 
 
@@ -167,7 +167,7 @@ class EvalSinglePropRef(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/excesspartialapparentenergyprop.py b/pyThermoML/core/excesspartialapparentenergyprop.py
index 7863394..8c6dd21 100644
--- a/pyThermoML/core/excesspartialapparentenergyprop.py
+++ b/pyThermoML/core/excesspartialapparentenergyprop.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class ExcessPartialApparentEnergyProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/heatcapacityandderivedprop.py b/pyThermoML/core/heatcapacityandderivedprop.py
index dd06f73..f16aaff 100644
--- a/pyThermoML/core/heatcapacityandderivedprop.py
+++ b/pyThermoML/core/heatcapacityandderivedprop.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class HeatCapacityAndDerivedProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/ion.py b/pyThermoML/core/ion.py
index 42e764a..6239abc 100644
--- a/pyThermoML/core/ion.py
+++ b/pyThermoML/core/ion.py
@@ -27,7 +27,7 @@ class Ion(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/journal.py b/pyThermoML/core/journal.py
index 11b1b9d..880b668 100644
--- a/pyThermoML/core/journal.py
+++ b/pyThermoML/core/journal.py
@@ -44,7 +44,7 @@ class Journal(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/multicomponentsubstance.py b/pyThermoML/core/multicomponentsubstance.py
index 12657b5..f6bfafb 100644
--- a/pyThermoML/core/multicomponentsubstance.py
+++ b/pyThermoML/core/multicomponentsubstance.py
@@ -7,8 +7,8 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .regnum import RegNum
 from .component import Component
+from .regnum import RegNum
 
 
 @forge_signature
@@ -39,7 +39,7 @@ class MulticomponentSubstance(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/multiprop.py b/pyThermoML/core/multiprop.py
index 2170866..123472d 100644
--- a/pyThermoML/core/multiprop.py
+++ b/pyThermoML/core/multiprop.py
@@ -7,13 +7,13 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .esourcetype import eSourceType
-from .book import Book
-from .evalmultipropref import EvalMultiPropRef
 from .etype import eType
 from .thesis import Thesis
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
+from .evalmultipropref import EvalMultiPropRef
 from .journal import Journal
 
 
@@ -47,7 +47,7 @@ class MultiProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/numvalues.py b/pyThermoML/core/numvalues.py
index 96d0dbf..f87ba28 100644
--- a/pyThermoML/core/numvalues.py
+++ b/pyThermoML/core/numvalues.py
@@ -7,14 +7,14 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
+from .varrepeatability import VarRepeatability
 from .propuncertainty import PropUncertainty
 from .combineduncertainty import CombinedUncertainty
 from .curvedev import CurveDev
-from .propertyvalue import PropertyValue
-from .varrepeatability import VarRepeatability
-from .varuncertainty import VarUncertainty
 from .proplimit import PropLimit
+from .varuncertainty import VarUncertainty
 from .proprepeatability import PropRepeatability
+from .propertyvalue import PropertyValue
 from .variablevalue import VariableValue
 
 
@@ -43,7 +43,7 @@ class NumValues(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/participant.py b/pyThermoML/core/participant.py
index ca2ed8d..aba4e91 100644
--- a/pyThermoML/core/participant.py
+++ b/pyThermoML/core/participant.py
@@ -7,11 +7,11 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .regnum import RegNum
-from .ephase import ePhase
 from .ecrystallatticetype import eCrystalLatticeType
-from .estandardstate import eStandardState
+from .ephase import ePhase
 from .ecompositionrepresentation import eCompositionRepresentation
+from .regnum import RegNum
+from .estandardstate import eStandardState
 
 
 @forge_signature
@@ -71,7 +71,7 @@ class Participant(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/phaseid.py b/pyThermoML/core/phaseid.py
index cf196ef..0fdb0a3 100644
--- a/pyThermoML/core/phaseid.py
+++ b/pyThermoML/core/phaseid.py
@@ -7,9 +7,9 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .regnum import RegNum
-from .ephase import ePhase
 from .ecrystallatticetype import eCrystalLatticeType
+from .ephase import ePhase
+from .regnum import RegNum
 
 
 @forge_signature
@@ -46,7 +46,7 @@ class PhaseID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/phasetransition.py b/pyThermoML/core/phasetransition.py
index bce7a9f..86783d0 100644
--- a/pyThermoML/core/phasetransition.py
+++ b/pyThermoML/core/phasetransition.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class PhaseTransition(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/polymer.py b/pyThermoML/core/polymer.py
index e1adca0..6bead24 100644
--- a/pyThermoML/core/polymer.py
+++ b/pyThermoML/core/polymer.py
@@ -69,7 +69,7 @@ class Polymer(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/prediction.py b/pyThermoML/core/prediction.py
index 9136f92..b8aa34f 100644
--- a/pyThermoML/core/prediction.py
+++ b/pyThermoML/core/prediction.py
@@ -7,14 +7,14 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .esourcetype import eSourceType
-from .book import Book
-from .predictionmethodref import PredictionMethodRef
 from .epredictiontype import ePredictionType
 from .etype import eType
 from .thesis import Thesis
+from .predictionmethodref import PredictionMethodRef
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
 from .journal import Journal
 
 
@@ -53,7 +53,7 @@ class Prediction(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/predictionmethodref.py b/pyThermoML/core/predictionmethodref.py
index ed43c13..8939f25 100644
--- a/pyThermoML/core/predictionmethodref.py
+++ b/pyThermoML/core/predictionmethodref.py
@@ -7,12 +7,12 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .esourcetype import eSourceType
-from .book import Book
 from .etype import eType
 from .thesis import Thesis
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
 from .journal import Journal
 
 
@@ -167,7 +167,7 @@ class PredictionMethodRef(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/propdevicespec.py b/pyThermoML/core/propdevicespec.py
index 5ecc35d..08041ce 100644
--- a/pyThermoML/core/propdevicespec.py
+++ b/pyThermoML/core/propdevicespec.py
@@ -45,7 +45,7 @@ class PropDeviceSpec(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/property.py b/pyThermoML/core/property.py
index 4c1f712..5bfc388 100644
--- a/pyThermoML/core/property.py
+++ b/pyThermoML/core/property.py
@@ -7,29 +7,29 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .propertymethodid import PropertyMethodID
-from .regnum import RegNum
-from .asymcombexpanduncert import AsymCombExpandUncert
-from .asymexpanduncert import AsymExpandUncert
-from .solvent import Solvent
+from .ebiostate import eBioState
 from .catalyst import Catalyst
-from .epresentation import ePresentation
-from .propdevicespec import PropDeviceSpec
+from .regnum import RegNum
+from .epropphase import ePropPhase
 from .proprepeatability import PropRepeatability
-from .asymcombstduncert import AsymCombStdUncert
-from .ephase import ePhase
-from .ecrystallatticetype import eCrystalLatticeType
+from .ecombuncertevalmethod import eCombUncertEvalMethod
+from .propuncertainty import PropUncertainty
+from .asymstduncert import AsymStdUncert
+from .solvent import Solvent
 from .propphaseid import PropPhaseID
-from .epropphase import ePropPhase
 from .refphaseid import RefPhaseID
-from .estandardstate import eStandardState
-from .propuncertainty import PropUncertainty
-from .erefstatetype import eRefStateType
-from .ebiostate import eBioState
-from .ecombuncertevalmethod import eCombUncertEvalMethod
+from .asymexpanduncert import AsymExpandUncert
 from .combineduncertainty import CombinedUncertainty
+from .propertymethodid import PropertyMethodID
+from .estandardstate import eStandardState
+from .epresentation import ePresentation
+from .asymcombexpanduncert import AsymCombExpandUncert
 from .curvedev import CurveDev
-from .asymstduncert import AsymStdUncert
+from .ephase import ePhase
+from .ecrystallatticetype import eCrystalLatticeType
+from .asymcombstduncert import AsymCombStdUncert
+from .propdevicespec import PropDeviceSpec
+from .erefstatetype import eRefStateType
 
 
 @forge_signature
@@ -143,7 +143,7 @@ class Property(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/propertygroup.py b/pyThermoML/core/propertygroup.py
index 3e15c96..57b8126 100644
--- a/pyThermoML/core/propertygroup.py
+++ b/pyThermoML/core/propertygroup.py
@@ -8,18 +8,18 @@
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
 from .bioproperties import BioProperties
-from .reactionequilibriumprop import ReactionEquilibriumProp
+from .activityfugacityosmoticprop import ActivityFugacityOsmoticProp
+from .phasetransition import PhaseTransition
+from .refractionsurfacetensionsoundspeed import RefractionSurfaceTensionSoundSpeed
+from .volumetricprop import VolumetricProp
 from .criticals import Criticals
-from .heatcapacityandderivedprop import HeatCapacityAndDerivedProp
 from .excesspartialapparentenergyprop import ExcessPartialApparentEnergyProp
-from .reactionstatechangeprop import ReactionStateChangeProp
-from .compositionatphaseequilibrium import CompositionAtPhaseEquilibrium
 from .transportprop import TransportProp
-from .activityfugacityosmoticprop import ActivityFugacityOsmoticProp
+from .heatcapacityandderivedprop import HeatCapacityAndDerivedProp
+from .compositionatphaseequilibrium import CompositionAtPhaseEquilibrium
+from .reactionstatechangeprop import ReactionStateChangeProp
 from .vaporpboilingtazeotroptandp import VaporPBoilingTAzeotropTandP
-from .volumetricprop import VolumetricProp
-from .phasetransition import PhaseTransition
-from .refractionsurfacetensionsoundspeed import RefractionSurfaceTensionSoundSpeed
+from .reactionequilibriumprop import ReactionEquilibriumProp
 
 
 @forge_signature
@@ -106,7 +106,7 @@ class PropertyGroup(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/propertymethodid.py b/pyThermoML/core/propertymethodid.py
index 67b4431..afb0244 100644
--- a/pyThermoML/core/propertymethodid.py
+++ b/pyThermoML/core/propertymethodid.py
@@ -37,7 +37,7 @@ class PropertyMethodID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/propertyvalue.py b/pyThermoML/core/propertyvalue.py
index 6b0cef0..50d5dae 100644
--- a/pyThermoML/core/propertyvalue.py
+++ b/pyThermoML/core/propertyvalue.py
@@ -8,15 +8,15 @@
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
 from .propuncertainty import PropUncertainty
-from .ecombuncertevalmethod import eCombUncertEvalMethod
 from .combineduncertainty import CombinedUncertainty
+from .asymstduncert import AsymStdUncert
 from .asymcombexpanduncert import AsymCombExpandUncert
-from .asymexpanduncert import AsymExpandUncert
 from .curvedev import CurveDev
-from .asymstduncert import AsymStdUncert
 from .proplimit import PropLimit
 from .proprepeatability import PropRepeatability
 from .asymcombstduncert import AsymCombStdUncert
+from .ecombuncertevalmethod import eCombUncertEvalMethod
+from .asymexpanduncert import AsymExpandUncert
 
 
 @forge_signature
@@ -73,7 +73,7 @@ class PropertyValue(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/proplimit.py b/pyThermoML/core/proplimit.py
index a41dce8..34705f1 100644
--- a/pyThermoML/core/proplimit.py
+++ b/pyThermoML/core/proplimit.py
@@ -39,7 +39,7 @@ class PropLimit(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/propphaseid.py b/pyThermoML/core/propphaseid.py
index 393c2b2..9fdb3ef 100644
--- a/pyThermoML/core/propphaseid.py
+++ b/pyThermoML/core/propphaseid.py
@@ -8,9 +8,9 @@
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
 from .ebiostate import eBioState
-from .regnum import RegNum
-from .ecrystallatticetype import eCrystalLatticeType
 from .epropphase import ePropPhase
+from .ecrystallatticetype import eCrystalLatticeType
+from .regnum import RegNum
 
 
 @forge_signature
@@ -53,7 +53,7 @@ class PropPhaseID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/proprepeatability.py b/pyThermoML/core/proprepeatability.py
index b69a9b7..2d9ad3a 100644
--- a/pyThermoML/core/proprepeatability.py
+++ b/pyThermoML/core/proprepeatability.py
@@ -44,7 +44,7 @@ class PropRepeatability(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/propuncertainty.py b/pyThermoML/core/propuncertainty.py
index 0436419..45379fe 100644
--- a/pyThermoML/core/propuncertainty.py
+++ b/pyThermoML/core/propuncertainty.py
@@ -7,8 +7,8 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .asymexpanduncert import AsymExpandUncert
 from .asymstduncert import AsymStdUncert
+from .asymexpanduncert import AsymExpandUncert
 
 
 @forge_signature
@@ -71,7 +71,7 @@ class PropUncertainty(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/pureormixturedata.py b/pyThermoML/core/pureormixturedata.py
index 663f586..c303c17 100644
--- a/pyThermoML/core/pureormixturedata.py
+++ b/pyThermoML/core/pureormixturedata.py
@@ -9,50 +9,50 @@
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
 from .regnum import RegNum
-from .catalyst import Catalyst
-from .propdevicespec import PropDeviceSpec
-from .proprepeatability import PropRepeatability
-from .constrrepeatability import ConstrRepeatability
 from .varphaseid import VarPhaseID
-from .propertyvalue import PropertyValue
-from .phaseid import PhaseID
-from .estandardstate import eStandardState
-from .eqconstraint import EqConstraint
-from .efunction import eFunction
-from .propertymethodid import PropertyMethodID
-from .varuncertainty import VarUncertainty
-from .ephase import ePhase
-from .combineduncertainty import CombinedUncertainty
-from .component import Component
-from .variablevalue import VariableValue
-from .eqconstant import EqConstant
-from .numvalues import NumValues
-from .constraintphaseid import ConstraintPhaseID
 from .covariance import Covariance
-from .constrdevicespec import ConstrDeviceSpec
-from .ecrystallatticetype import eCrystalLatticeType
+from .eqconstant import EqConstant
+from .property import Property
 from .propphaseid import PropPhaseID
-from .auxiliarysubstance import AuxiliarySubstance
+from .refphaseid import RefPhaseID
 from .eqparameter import EqParameter
-from .eqproperty import EqProperty
+from .vardevicespec import VarDeviceSpec
+from .varuncertainty import VarUncertainty
+from .construncertainty import ConstrUncertainty
+from .eeqname import eEqName
+from .variable import Variable
 from .propuncertainty import PropUncertainty
-from .curvedev import CurveDev
-from .property import Property
 from .equation import Equation
+from .auxiliarysubstance import AuxiliarySubstance
+from .propertymethodid import PropertyMethodID
+from .estandardstate import eStandardState
 from .eexppurpose import eExpPurpose
-from .constraint import Constraint
-from .variable import Variable
+from .ecrystallatticetype import eCrystalLatticeType
+from .eqvariable import EqVariable
+from .component import Component
+from .proprepeatability import PropRepeatability
+from .constraintid import ConstraintID
 from .solvent import Solvent
-from .construncertainty import ConstrUncertainty
+from .constrrepeatability import ConstrRepeatability
+from .constraintphaseid import ConstraintPhaseID
+from .eqproperty import EqProperty
+from .propertyvalue import PropertyValue
+from .numvalues import NumValues
+from .variablevalue import VariableValue
+from .ephase import ePhase
+from .erefstatetype import eRefStateType
+from .constrdevicespec import ConstrDeviceSpec
+from .catalyst import Catalyst
+from .eqconstraint import EqConstraint
+from .efunction import eFunction
 from .varrepeatability import VarRepeatability
+from .combineduncertainty import CombinedUncertainty
 from .variableid import VariableID
-from .constraintid import ConstraintID
 from .epresentation import ePresentation
-from .vardevicespec import VarDeviceSpec
-from .refphaseid import RefPhaseID
-from .eqvariable import EqVariable
-from .erefstatetype import eRefStateType
-from .eeqname import eEqName
+from .curvedev import CurveDev
+from .constraint import Constraint
+from .phaseid import PhaseID
+from .propdevicespec import PropDeviceSpec
 
 
 @forge_signature
@@ -133,7 +133,7 @@ class PureOrMixtureData(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/purity.py b/pyThermoML/core/purity.py
index f1a5844..2cc4ad4 100644
--- a/pyThermoML/core/purity.py
+++ b/pyThermoML/core/purity.py
@@ -7,8 +7,8 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .epurifmethod import ePurifMethod
 from .eanalmeth import eAnalMeth
+from .epurifmethod import ePurifMethod
 
 
 @forge_signature
@@ -146,7 +146,7 @@ class Purity(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/reactiondata.py b/pyThermoML/core/reactiondata.py
index 29c102f..12382ac 100644
--- a/pyThermoML/core/reactiondata.py
+++ b/pyThermoML/core/reactiondata.py
@@ -8,52 +8,52 @@
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
 from .regnum import RegNum
-from .catalyst import Catalyst
-from .ecompositionrepresentation import eCompositionRepresentation
-from .propdevicespec import PropDeviceSpec
-from .proprepeatability import PropRepeatability
-from .constrrepeatability import ConstrRepeatability
 from .varphaseid import VarPhaseID
-from .propertyvalue import PropertyValue
-from .estandardstate import eStandardState
-from .eqconstraint import EqConstraint
-from .efunction import eFunction
-from .propertymethodid import PropertyMethodID
-from .varuncertainty import VarUncertainty
-from .ephase import ePhase
-from .participant import Participant
-from .combineduncertainty import CombinedUncertainty
-from .variablevalue import VariableValue
-from .eqconstant import EqConstant
-from .numvalues import NumValues
-from .constraintphaseid import ConstraintPhaseID
 from .covariance import Covariance
-from .constrdevicespec import ConstrDeviceSpec
-from .ecrystallatticetype import eCrystalLatticeType
+from .eqconstant import EqConstant
+from .property import Property
 from .propphaseid import PropPhaseID
-from .auxiliarysubstance import AuxiliarySubstance
+from .refphaseid import RefPhaseID
 from .eqparameter import EqParameter
-from .eqproperty import EqProperty
+from .vardevicespec import VarDeviceSpec
+from .varuncertainty import VarUncertainty
+from .construncertainty import ConstrUncertainty
+from .eeqname import eEqName
+from .variable import Variable
 from .propuncertainty import PropUncertainty
-from .curvedev import CurveDev
-from .property import Property
 from .equation import Equation
+from .auxiliarysubstance import AuxiliarySubstance
+from .participant import Participant
+from .propertymethodid import PropertyMethodID
+from .estandardstate import eStandardState
 from .eexppurpose import eExpPurpose
-from .constraint import Constraint
-from .variable import Variable
+from .ecrystallatticetype import eCrystalLatticeType
+from .eqvariable import EqVariable
+from .ereactiontype import eReactionType
+from .proprepeatability import PropRepeatability
+from .constraintid import ConstraintID
 from .solvent import Solvent
-from .construncertainty import ConstrUncertainty
-from .varrepeatability import VarRepeatability
+from .constrrepeatability import ConstrRepeatability
+from .constraintphaseid import ConstraintPhaseID
+from .eqproperty import EqProperty
+from .propertyvalue import PropertyValue
+from .numvalues import NumValues
+from .variablevalue import VariableValue
+from .ephase import ePhase
+from .erefstatetype import eRefStateType
+from .constrdevicespec import ConstrDeviceSpec
+from .catalyst import Catalyst
 from .ereactionformalism import eReactionFormalism
+from .ecompositionrepresentation import eCompositionRepresentation
+from .eqconstraint import EqConstraint
+from .efunction import eFunction
+from .varrepeatability import VarRepeatability
+from .combineduncertainty import CombinedUncertainty
 from .variableid import VariableID
-from .constraintid import ConstraintID
 from .epresentation import ePresentation
-from .ereactiontype import eReactionType
-from .vardevicespec import VarDeviceSpec
-from .refphaseid import RefPhaseID
-from .eqvariable import EqVariable
-from .erefstatetype import eRefStateType
-from .eeqname import eEqName
+from .curvedev import CurveDev
+from .constraint import Constraint
+from .propdevicespec import PropDeviceSpec
 
 
 @forge_signature
@@ -145,7 +145,7 @@ class ReactionData(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/reactionequilibriumprop.py b/pyThermoML/core/reactionequilibriumprop.py
index 49f27f0..9399b24 100644
--- a/pyThermoML/core/reactionequilibriumprop.py
+++ b/pyThermoML/core/reactionequilibriumprop.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -49,7 +49,7 @@ class ReactionEquilibriumProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/reactionstatechangeprop.py b/pyThermoML/core/reactionstatechangeprop.py
index 858fbc1..38669f1 100644
--- a/pyThermoML/core/reactionstatechangeprop.py
+++ b/pyThermoML/core/reactionstatechangeprop.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -49,7 +49,7 @@ class ReactionStateChangeProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/refphaseid.py b/pyThermoML/core/refphaseid.py
index 0e85fd3..a10cd66 100644
--- a/pyThermoML/core/refphaseid.py
+++ b/pyThermoML/core/refphaseid.py
@@ -7,9 +7,9 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .regnum import RegNum
 from .ecrystallatticetype import eCrystalLatticeType
 from .erefphase import eRefPhase
+from .regnum import RegNum
 
 
 @forge_signature
@@ -46,7 +46,7 @@ class RefPhaseID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/refractionsurfacetensionsoundspeed.py b/pyThermoML/core/refractionsurfacetensionsoundspeed.py
index 309fce5..24598d7 100644
--- a/pyThermoML/core/refractionsurfacetensionsoundspeed.py
+++ b/pyThermoML/core/refractionsurfacetensionsoundspeed.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class RefractionSurfaceTensionSoundSpeed(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/regnum.py b/pyThermoML/core/regnum.py
index 4693264..e82e0d6 100644
--- a/pyThermoML/core/regnum.py
+++ b/pyThermoML/core/regnum.py
@@ -33,7 +33,7 @@ class RegNum(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/sample.py b/pyThermoML/core/sample.py
index 69372bc..9b564f9 100644
--- a/pyThermoML/core/sample.py
+++ b/pyThermoML/core/sample.py
@@ -7,13 +7,13 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .regnum import RegNum
-from .esource import eSource
-from .componentsample import ComponentSample
+from .purity import Purity
 from .eanalmeth import eAnalMeth
 from .epurifmethod import ePurifMethod
-from .purity import Purity
+from .esource import eSource
 from .estatus import eStatus
+from .regnum import RegNum
+from .componentsample import ComponentSample
 
 
 @forge_signature
@@ -52,7 +52,7 @@ class Sample(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/singleprop.py b/pyThermoML/core/singleprop.py
index cf6cbec..c7d0265 100644
--- a/pyThermoML/core/singleprop.py
+++ b/pyThermoML/core/singleprop.py
@@ -7,14 +7,14 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .elanguage import eLanguage
 from .trcrefid import TRCRefID
-from .evalsinglepropref import EvalSinglePropRef
-from .book import Book
-from .esourcetype import eSourceType
 from .etype import eType
 from .thesis import Thesis
+from .book import Book
+from .esourcetype import eSourceType
+from .elanguage import eLanguage
 from .journal import Journal
+from .evalsinglepropref import EvalSinglePropRef
 
 
 @forge_signature
@@ -42,7 +42,7 @@ class SingleProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/solvent.py b/pyThermoML/core/solvent.py
index 80f6960..e49085b 100644
--- a/pyThermoML/core/solvent.py
+++ b/pyThermoML/core/solvent.py
@@ -35,7 +35,7 @@ class Solvent(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/sorgid.py b/pyThermoML/core/sorgid.py
index ea3e260..6235746 100644
--- a/pyThermoML/core/sorgid.py
+++ b/pyThermoML/core/sorgid.py
@@ -30,7 +30,7 @@ class SOrgID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/thesis.py b/pyThermoML/core/thesis.py
index e7cbff1..8c2ef36 100644
--- a/pyThermoML/core/thesis.py
+++ b/pyThermoML/core/thesis.py
@@ -44,7 +44,7 @@ class Thesis(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/transportprop.py b/pyThermoML/core/transportprop.py
index a46c3f0..78c744a 100644
--- a/pyThermoML/core/transportprop.py
+++ b/pyThermoML/core/transportprop.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class TransportProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/trcrefid.py b/pyThermoML/core/trcrefid.py
index 01c85ee..c9efdd9 100644
--- a/pyThermoML/core/trcrefid.py
+++ b/pyThermoML/core/trcrefid.py
@@ -51,7 +51,7 @@ class TRCRefID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/vaporpboilingtazeotroptandp.py b/pyThermoML/core/vaporpboilingtazeotroptandp.py
index 09ad8e9..5e4f278 100644
--- a/pyThermoML/core/vaporpboilingtazeotroptandp.py
+++ b/pyThermoML/core/vaporpboilingtazeotroptandp.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class VaporPBoilingTAzeotropTandP(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/vardevicespec.py b/pyThermoML/core/vardevicespec.py
index 196c4e7..cf6f506 100644
--- a/pyThermoML/core/vardevicespec.py
+++ b/pyThermoML/core/vardevicespec.py
@@ -45,7 +45,7 @@ class VarDeviceSpec(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/variable.py b/pyThermoML/core/variable.py
index dc04698..d14cad1 100644
--- a/pyThermoML/core/variable.py
+++ b/pyThermoML/core/variable.py
@@ -7,12 +7,12 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
+from .varphaseid import VarPhaseID
 from .solvent import Solvent
 from .varrepeatability import VarRepeatability
-from .variableid import VariableID
-from .varuncertainty import VarUncertainty
-from .varphaseid import VarPhaseID
 from .vardevicespec import VarDeviceSpec
+from .varuncertainty import VarUncertainty
+from .variableid import VariableID
 
 
 @forge_signature
@@ -65,7 +65,7 @@ class Variable(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/variableid.py b/pyThermoML/core/variableid.py
index d0ff41e..179801f 100644
--- a/pyThermoML/core/variableid.py
+++ b/pyThermoML/core/variableid.py
@@ -7,8 +7,8 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .regnum import RegNum
 from .variabletype import VariableType
+from .regnum import RegNum
 
 
 @forge_signature
@@ -37,7 +37,7 @@ class VariableID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/variabletype.py b/pyThermoML/core/variabletype.py
index 05c1c63..0ce2d8e 100644
--- a/pyThermoML/core/variabletype.py
+++ b/pyThermoML/core/variabletype.py
@@ -7,13 +7,13 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .etemperature import eTemperature
 from .ecomponentcomposition import eComponentComposition
-from .epressure import ePressure
-from .eparticipantamount import eParticipantAmount
-from .esolventcomposition import eSolventComposition
+from .etemperature import eTemperature
 from .ebiovariables import eBioVariables
+from .eparticipantamount import eParticipantAmount
 from .emiscellaneous import eMiscellaneous
+from .epressure import ePressure
+from .esolventcomposition import eSolventComposition
 
 
 @forge_signature
@@ -58,7 +58,7 @@ class VariableType(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/variablevalue.py b/pyThermoML/core/variablevalue.py
index c3327a3..907f3aa 100644
--- a/pyThermoML/core/variablevalue.py
+++ b/pyThermoML/core/variablevalue.py
@@ -50,7 +50,7 @@ class VariableValue(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/varphaseid.py b/pyThermoML/core/varphaseid.py
index fe74664..84bb130 100644
--- a/pyThermoML/core/varphaseid.py
+++ b/pyThermoML/core/varphaseid.py
@@ -7,9 +7,9 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .regnum import RegNum
-from .ecrystallatticetype import eCrystalLatticeType
 from .evarphase import eVarPhase
+from .ecrystallatticetype import eCrystalLatticeType
+from .regnum import RegNum
 
 
 @forge_signature
@@ -46,7 +46,7 @@ class VarPhaseID(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/varrepeatability.py b/pyThermoML/core/varrepeatability.py
index 66ed75c..e7b1d91 100644
--- a/pyThermoML/core/varrepeatability.py
+++ b/pyThermoML/core/varrepeatability.py
@@ -44,7 +44,7 @@ class VarRepeatability(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/varuncertainty.py b/pyThermoML/core/varuncertainty.py
index ef0a8b3..62480c3 100644
--- a/pyThermoML/core/varuncertainty.py
+++ b/pyThermoML/core/varuncertainty.py
@@ -59,7 +59,7 @@ class VarUncertainty(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/version.py b/pyThermoML/core/version.py
index fce403e..861fe7f 100644
--- a/pyThermoML/core/version.py
+++ b/pyThermoML/core/version.py
@@ -30,7 +30,7 @@ class Version(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
diff --git a/pyThermoML/core/volumetricprop.py b/pyThermoML/core/volumetricprop.py
index 148503f..e488331 100644
--- a/pyThermoML/core/volumetricprop.py
+++ b/pyThermoML/core/volumetricprop.py
@@ -7,10 +7,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .emethodname import eMethodName
 from .epropname import ePropName
 from .criticalevaluation import CriticalEvaluation
 from .prediction import Prediction
+from .emethodname import eMethodName
 
 
 @forge_signature
@@ -47,7 +47,7 @@ class VolumetricProp(
         default="https://github.com/FAIRChemistry/pyThermoML"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="4014e57ac2f3b9b09cdefb1c3e2f2cfca298f660"
+        default="4d2d23abb157f43b563c9d44de5b83e37a50b96b"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)