diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp
index d44d4e5068..66b2149200 100644
--- a/src/App/PropertyUnits.cpp
+++ b/src/App/PropertyUnits.cpp
@@ -40,7 +40,6 @@ using namespace std;
 const PropertyQuantityConstraint::Constraints LengthStandard = {0.0,DBL_MAX,1.0};
 const PropertyQuantityConstraint::Constraints AngleStandard = {-360,360,1.0};
 
-//**************************************************************************
 //**************************************************************************
 // PropertyQuantity
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -129,7 +128,6 @@ const boost::any PropertyQuantity::getPathValue(const ObjectIdentifier & /*path*
     return Quantity(_dValue, _Unit);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertyQuantityConstraint
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -198,7 +196,10 @@ void PropertyQuantityConstraint::setPyObject(PyObject *value)
     PropertyFloat::setValue(quant.getValue()); // clazy:exclude=skipped-base-method
 }
 
-//**************************************************************************
+// ------------------------------------------------------
+// now all properties
+// ------------------------------------------------------
+
 //**************************************************************************
 // PropertyAcceleration
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -211,6 +212,16 @@ PropertyAcceleration::PropertyAcceleration()
 }
 
 //**************************************************************************
+// PropertyAmountOfSubstance
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyAmountOfSubstance, App::PropertyQuantity)
+
+PropertyAmountOfSubstance::PropertyAmountOfSubstance()
+{
+    setUnit(Base::Unit::AmountOfSubstance);
+}
+
 //**************************************************************************
 // PropertyAngle
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -223,7 +234,6 @@ PropertyAngle::PropertyAngle()
     setConstraints(&AngleStandard);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertyArea
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -237,18 +247,16 @@ PropertyArea::PropertyArea()
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyDistance
+// PropertyCompressiveStrength
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyDistance, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyCompressiveStrength, App::PropertyQuantity)
 
-PropertyDistance::PropertyDistance()
+PropertyCompressiveStrength::PropertyCompressiveStrength()
 {
-    setUnit(Base::Unit::Length);
+    setUnit(Base::Unit::CompressiveStrength);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertyCurrentDensity
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -261,6 +269,126 @@ PropertyCurrentDensity::PropertyCurrentDensity()
 }
 
 //**************************************************************************
+// PropertyDensity
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyDensity, App::PropertyQuantity)
+
+PropertyDensity::PropertyDensity()
+{
+    setUnit(Base::Unit::Density);
+}
+
+//**************************************************************************
+// PropertyDissipationRate
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyDissipationRate, App::PropertyQuantity)
+
+PropertyDissipationRate::PropertyDissipationRate()
+{
+    setUnit(Base::Unit::DissipationRate);
+}
+
+//**************************************************************************
+// PropertyDistance
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyDistance, App::PropertyQuantity)
+
+PropertyDistance::PropertyDistance()
+{
+    setUnit(Base::Unit::Length);
+}
+
+//**************************************************************************
+// PropertyDynamicViscosity
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyDynamicViscosity, App::PropertyQuantity)
+
+PropertyDynamicViscosity::PropertyDynamicViscosity()
+{
+    setUnit(Base::Unit::DynamicViscosity);
+}
+
+//**************************************************************************
+// PropertyElectricalCapacitance
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyElectricalCapacitance, App::PropertyQuantity)
+
+PropertyElectricalCapacitance::PropertyElectricalCapacitance()
+{
+    setUnit(Base::Unit::ElectricalCapacitance);
+}
+
+//**************************************************************************
+// PropertyElectricalInductance
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyElectricalInductance, App::PropertyQuantity)
+
+PropertyElectricalInductance::PropertyElectricalInductance()
+{
+    setUnit(Base::Unit::ElectricalInductance);
+}
+
+//**************************************************************************
+// PropertyElectricalConductance
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyElectricalConductance, App::PropertyQuantity)
+
+PropertyElectricalConductance::PropertyElectricalConductance()
+{
+    setUnit(Base::Unit::ElectricalConductance);
+}
+
+//**************************************************************************
+// PropertyElectricalConductivity
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyElectricalConductivity, App::PropertyQuantity)
+
+PropertyElectricalConductivity::PropertyElectricalConductivity()
+{
+    setUnit(Base::Unit::ElectricalConductivity);
+}
+
+//**************************************************************************
+// PropertyElectricalResistance
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyElectricalResistance, App::PropertyQuantity)
+
+PropertyElectricalResistance::PropertyElectricalResistance()
+{
+    setUnit(Base::Unit::ElectricalResistance);
+}
+
+//**************************************************************************
+// PropertyElectricCharge
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyElectricCharge, App::PropertyQuantity)
+
+PropertyElectricCharge::PropertyElectricCharge()
+{
+    setUnit(Base::Unit::ElectricCharge);
+}
+
+//**************************************************************************
+// PropertyElectricCurrent
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyElectricCurrent, App::PropertyQuantity)
+
+PropertyElectricCurrent::PropertyElectricCurrent()
+{
+    setUnit(Base::Unit::ElectricCurrent);
+}
+
 //**************************************************************************
 // PropertyElectricPotential
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -272,7 +400,6 @@ PropertyElectricPotential::PropertyElectricPotential()
     setUnit(Base::Unit::ElectricPotential);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertyFrequency
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -284,7 +411,6 @@ PropertyFrequency::PropertyFrequency()
     setUnit(Base::Unit::Frequency);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertyForce
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -297,6 +423,60 @@ PropertyForce::PropertyForce()
 }
 
 //**************************************************************************
+// PropertyHeatFlux
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyHeatFlux, App::PropertyQuantity)
+
+PropertyHeatFlux::PropertyHeatFlux()
+{
+    setUnit(Base::Unit::HeatFlux);
+}
+
+//**************************************************************************
+// PropertyInverseArea
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyInverseArea, App::PropertyQuantity)
+
+PropertyInverseArea::PropertyInverseArea()
+{
+    setUnit(Base::Unit::InverseArea);
+}
+
+//**************************************************************************
+// PropertyInverseLength
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyInverseLength, App::PropertyQuantity)
+
+PropertyInverseLength::PropertyInverseLength()
+{
+    setUnit(Base::Unit::InverseLength);
+}
+
+//**************************************************************************
+// PropertyInverseVolume
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyInverseVolume, App::PropertyQuantity)
+
+PropertyInverseVolume::PropertyInverseVolume()
+{
+    setUnit(Base::Unit::InverseVolume);
+}
+
+//**************************************************************************
+// PropertyKinematicViscosity
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyKinematicViscosity, App::PropertyQuantity)
+
+PropertyKinematicViscosity::PropertyKinematicViscosity()
+{
+    setUnit(Base::Unit::KinematicViscosity);
+}
+
 //**************************************************************************
 // PropertyLength
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -310,138 +490,16 @@ PropertyLength::PropertyLength()
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyMagnetization
+// PropertyLuminousIntensity
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyMagnetization, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyLuminousIntensity, App::PropertyQuantity)
 
-PropertyMagnetization::PropertyMagnetization()
+PropertyLuminousIntensity::PropertyLuminousIntensity()
 {
-    setUnit(Base::Unit::Magnetization);
+    setUnit(Base::Unit::LuminousIntensity);
 }
 
-//**************************************************************************
-//**************************************************************************
-// PropertyPressure
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyPressure, App::PropertyQuantity)
-
-PropertyPressure::PropertyPressure()
-{
-    setUnit(Base::Unit::Pressure);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertySpeed
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertySpeed, App::PropertyQuantity)
-
-PropertySpeed::PropertySpeed()
-{
-    setUnit(Base::Unit::Velocity);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyStiffness
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyStiffness, App::PropertyQuantity)
-
-PropertyStiffness::PropertyStiffness()
-{
-    setUnit(Base::Unit::Stiffness);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyMass
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyMass, App::PropertyQuantity)
-
-PropertyMass::PropertyMass()
-{
-    setUnit(Base::Unit::Mass);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyDensity
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyDensity, App::PropertyQuantity)
-
-PropertyDensity::PropertyDensity()
-{
-    setUnit(Base::Unit::Density);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyTime
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyTime, App::PropertyQuantity)
-
-PropertyTime::PropertyTime()
-{
-    setUnit(Base::Unit::TimeSpan);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyTemperature
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyTemperature, App::PropertyQuantity)
-
-PropertyTemperature::PropertyTemperature()
-{
-    setUnit(Base::Unit::Temperature);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyElectricCurrent
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyElectricCurrent, App::PropertyQuantity)
-
-PropertyElectricCurrent::PropertyElectricCurrent()
-{
-    setUnit(Base::Unit::ElectricCurrent);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyVacuumPermittivity
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyVacuumPermittivity, App::PropertyQuantity)
-
-PropertyVacuumPermittivity::PropertyVacuumPermittivity()
-{
-    setUnit(Base::Unit::VacuumPermittivity);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyElectricCharge
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyElectricCharge, App::PropertyQuantity)
-
-PropertyElectricCharge::PropertyElectricCharge()
-{
-    setUnit(Base::Unit::ElectricCharge);
-}
-
-//**************************************************************************
 //**************************************************************************
 // PropertyMagneticFieldStrength
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -453,7 +511,6 @@ PropertyMagneticFieldStrength::PropertyMagneticFieldStrength()
     setUnit(Base::Unit::MagneticFieldStrength);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertyMagneticFlux
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -465,7 +522,6 @@ PropertyMagneticFlux::PropertyMagneticFlux()
     setUnit(Base::Unit::MagneticFlux);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertyMagneticFluxDensity
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -478,174 +534,38 @@ PropertyMagneticFluxDensity::PropertyMagneticFluxDensity()
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyElectricalCapacitance
+// PropertyMagnetization
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyElectricalCapacitance, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyMagnetization, App::PropertyQuantity)
 
-PropertyElectricalCapacitance::PropertyElectricalCapacitance()
+PropertyMagnetization::PropertyMagnetization()
 {
-    setUnit(Base::Unit::ElectricalCapacitance);
+    setUnit(Base::Unit::Magnetization);
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyElectricalInductance
+// PropertyMass
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyElectricalInductance, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyMass, App::PropertyQuantity)
 
-PropertyElectricalInductance::PropertyElectricalInductance()
+PropertyMass::PropertyMass()
 {
-    setUnit(Base::Unit::ElectricalInductance);
+    setUnit(Base::Unit::Mass);
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyElectricalConductance
+// PropertyPressure
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyElectricalConductance, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyPressure, App::PropertyQuantity)
 
-PropertyElectricalConductance::PropertyElectricalConductance()
+PropertyPressure::PropertyPressure()
 {
-    setUnit(Base::Unit::ElectricalConductance);
+    setUnit(Base::Unit::Pressure);
 }
 
-//**************************************************************************
-//**************************************************************************
-// PropertyElectricalResistance
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyElectricalResistance, App::PropertyQuantity)
-
-PropertyElectricalResistance::PropertyElectricalResistance()
-{
-    setUnit(Base::Unit::ElectricalResistance);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyElectricalConductivity
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyElectricalConductivity, App::PropertyQuantity)
-
-PropertyElectricalConductivity::PropertyElectricalConductivity()
-{
-    setUnit(Base::Unit::ElectricalConductivity);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyAmountOfSubstance
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyAmountOfSubstance, App::PropertyQuantity)
-
-PropertyAmountOfSubstance::PropertyAmountOfSubstance()
-{
-    setUnit(Base::Unit::AmountOfSubstance);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyLuminousIntensity
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyLuminousIntensity, App::PropertyQuantity)
-
-PropertyLuminousIntensity::PropertyLuminousIntensity()
-{
-    setUnit(Base::Unit::LuminousIntensity);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyCompressiveStrength
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyCompressiveStrength, App::PropertyQuantity)
-
-PropertyCompressiveStrength::PropertyCompressiveStrength()
-{
-    setUnit(Base::Unit::CompressiveStrength);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyShearModulus
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyShearModulus, App::PropertyQuantity)
-
-PropertyShearModulus::PropertyShearModulus()
-{
-    setUnit(Base::Unit::ShearModulus);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyStress
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyStress, App::PropertyQuantity)
-
-PropertyStress::PropertyStress()
-{
-    setUnit(Base::Unit::Stress);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyUltimateTensileStrength
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyUltimateTensileStrength, App::PropertyQuantity)
-
-PropertyUltimateTensileStrength::PropertyUltimateTensileStrength()
-{
-    setUnit(Base::Unit::UltimateTensileStrength);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyYieldStrength
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyYieldStrength, App::PropertyQuantity)
-
-PropertyYieldStrength::PropertyYieldStrength()
-{
-    setUnit(Base::Unit::YieldStrength);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyYoungsModulus
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyYoungsModulus, App::PropertyQuantity)
-
-PropertyYoungsModulus::PropertyYoungsModulus()
-{
-    setUnit(Base::Unit::YoungsModulus);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyWork
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyWork, App::PropertyQuantity)
-
-PropertyWork::PropertyWork()
-{
-    setUnit(Base::Unit::Work);
-}
-
-//**************************************************************************
 //**************************************************************************
 // PropertyPower
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -657,7 +577,6 @@ PropertyPower::PropertyPower()
     setUnit(Base::Unit::Power);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertySpecificEnergy
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -669,43 +588,6 @@ PropertySpecificEnergy::PropertySpecificEnergy()
     setUnit(Base::Unit::SpecificEnergy);
 }
 
-//**************************************************************************
-//**************************************************************************
-// PropertyThermalConductivity
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyThermalConductivity, App::PropertyQuantity)
-
-PropertyThermalConductivity::PropertyThermalConductivity()
-{
-    setUnit(Base::Unit::ThermalConductivity);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyThermalExpansionCoefficient
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyThermalExpansionCoefficient, App::PropertyQuantity)
-
-PropertyThermalExpansionCoefficient::PropertyThermalExpansionCoefficient()
-{
-    setUnit(Base::Unit::ThermalExpansionCoefficient);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyVolumetricThermalExpansionCoefficient
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyVolumetricThermalExpansionCoefficient, App::PropertyQuantity)
-
-PropertyVolumetricThermalExpansionCoefficient::PropertyVolumetricThermalExpansionCoefficient()
-{
-    setUnit(Base::Unit::VolumetricThermalExpansionCoefficient);
-}
-
-//**************************************************************************
 //**************************************************************************
 // PropertySpecificHeat
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -718,6 +600,61 @@ PropertySpecificHeat::PropertySpecificHeat()
 }
 
 //**************************************************************************
+// PropertySpeed
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertySpeed, App::PropertyQuantity)
+
+PropertySpeed::PropertySpeed()
+{
+    setUnit(Base::Unit::Velocity);
+}
+
+//**************************************************************************
+// PropertyStiffness
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyStiffness, App::PropertyQuantity)
+
+PropertyStiffness::PropertyStiffness()
+{
+    setUnit(Base::Unit::Stiffness);
+}
+
+//**************************************************************************
+// PropertyTemperature
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyTemperature, App::PropertyQuantity)
+
+PropertyTemperature::PropertyTemperature()
+{
+    setUnit(Base::Unit::Temperature);
+}
+
+//**************************************************************************
+// PropertyThermalConductivity
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyThermalConductivity, App::PropertyQuantity)
+
+PropertyThermalConductivity::PropertyThermalConductivity()
+{
+    setUnit(Base::Unit::ThermalConductivity);
+}
+
+//**************************************************************************
+// PropertyThermalExpansionCoefficient
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyThermalExpansionCoefficient, App::PropertyQuantity)
+
+PropertyThermalExpansionCoefficient::PropertyThermalExpansionCoefficient()
+{
+    setUnit(Base::Unit::ThermalExpansionCoefficient);
+}
+
+
 //**************************************************************************
 // PropertyThermalTransferCoefficient
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -730,42 +667,71 @@ PropertyThermalTransferCoefficient::PropertyThermalTransferCoefficient()
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyHeatFlux
+// PropertyTime
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyHeatFlux, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyTime, App::PropertyQuantity)
 
-PropertyHeatFlux::PropertyHeatFlux()
+PropertyTime::PropertyTime()
 {
-    setUnit(Base::Unit::HeatFlux);
+    setUnit(Base::Unit::TimeSpan);
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyDynamicViscosity
+// PropertyShearModulus
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyDynamicViscosity, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyShearModulus, App::PropertyQuantity)
 
-PropertyDynamicViscosity::PropertyDynamicViscosity()
+PropertyShearModulus::PropertyShearModulus()
 {
-    setUnit(Base::Unit::DynamicViscosity);
+    setUnit(Base::Unit::ShearModulus);
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyKinematicViscosity
+// PropertyStress
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyKinematicViscosity, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyStress, App::PropertyQuantity)
 
-PropertyKinematicViscosity::PropertyKinematicViscosity()
+PropertyStress::PropertyStress()
 {
-    setUnit(Base::Unit::KinematicViscosity);
+    setUnit(Base::Unit::Stress);
 }
 
 //**************************************************************************
+// PropertyUltimateTensileStrength
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyUltimateTensileStrength, App::PropertyQuantity)
+
+PropertyUltimateTensileStrength::PropertyUltimateTensileStrength()
+{
+    setUnit(Base::Unit::UltimateTensileStrength);
+}
+
+//**************************************************************************
+// PropertyVacuumPermittivity
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyVacuumPermittivity, App::PropertyQuantity)
+
+PropertyVacuumPermittivity::PropertyVacuumPermittivity()
+{
+    setUnit(Base::Unit::VacuumPermittivity);
+}
+
+//**************************************************************************
+// PropertyVelocity
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+TYPESYSTEM_SOURCE(App::PropertyVelocity, App::PropertyQuantity)
+
+PropertyVelocity::PropertyVelocity()
+{
+    setUnit(Base::Unit::Velocity);
+}
+
 //**************************************************************************
 // PropertyVolume
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -778,7 +744,6 @@ PropertyVolume::PropertyVolume()
     setConstraints(&LengthStandard);
 }
 
-//**************************************************************************
 //**************************************************************************
 // PropertyVolumeFlowRate
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -791,61 +756,45 @@ PropertyVolumeFlowRate::PropertyVolumeFlowRate()
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyDissipationRate
+// PropertyVolumetricThermalExpansionCoefficient
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyDissipationRate, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyVolumetricThermalExpansionCoefficient, App::PropertyQuantity)
 
-PropertyDissipationRate::PropertyDissipationRate()
+PropertyVolumetricThermalExpansionCoefficient::PropertyVolumetricThermalExpansionCoefficient()
 {
-    setUnit(Base::Unit::DissipationRate);
+    setUnit(Base::Unit::VolumetricThermalExpansionCoefficient);
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyInverseLength
+// PropertyWork
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyInverseLength, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyWork, App::PropertyQuantity)
 
-PropertyInverseLength::PropertyInverseLength()
+PropertyWork::PropertyWork()
 {
-    setUnit(Base::Unit::InverseLength);
+    setUnit(Base::Unit::Work);
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyInverseArea
+// PropertyYieldStrength
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyInverseArea, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyYieldStrength, App::PropertyQuantity)
 
-PropertyInverseArea::PropertyInverseArea()
+PropertyYieldStrength::PropertyYieldStrength()
 {
-    setUnit(Base::Unit::InverseArea);
+    setUnit(Base::Unit::YieldStrength);
 }
 
 //**************************************************************************
-//**************************************************************************
-// PropertyInverseVolume
+// PropertyYoungsModulus
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-TYPESYSTEM_SOURCE(App::PropertyInverseVolume, App::PropertyQuantity)
+TYPESYSTEM_SOURCE(App::PropertyYoungsModulus, App::PropertyQuantity)
 
-PropertyInverseVolume::PropertyInverseVolume()
+PropertyYoungsModulus::PropertyYoungsModulus()
 {
-    setUnit(Base::Unit::InverseVolume);
-}
-
-//**************************************************************************
-//**************************************************************************
-// PropertyVelocity
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-TYPESYSTEM_SOURCE(App::PropertyVelocity, App::PropertyQuantity)
-
-PropertyVelocity::PropertyVelocity()
-{
-    setUnit(Base::Unit::Velocity);
+    setUnit(Base::Unit::YoungsModulus);
 }
diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h
index 918fb1c135..4a70cf1fe0 100644
--- a/src/App/PropertyUnits.h
+++ b/src/App/PropertyUnits.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef APP_PROPERTYUNITS_H
 #define APP_PROPERTYUNITS_H
 
@@ -29,11 +28,11 @@
 
 #include "PropertyStandard.h"
 
+
 namespace Base {
 class Writer;
 }
 
-
 namespace App
 {
 
@@ -119,6 +118,10 @@ protected:
     const Constraints* _ConstStruct;
 };
 
+// ------------------------------------------------------
+// now all properties
+// ------------------------------------------------------
+
 /** Acceleration property
  * This is a property for representing acceleration. It is basically a float
  * property. On the Gui it has a quantity like m/s^2.
@@ -132,6 +135,20 @@ public:
     ~PropertyAcceleration() override = default;
 };
 
+/** AmountOfSubstance property
+ * This is a property for representing number of molecules. It is basically a
+ * float property. On the Gui it has a quantity like mole.
+ */
+class AppExport PropertyAmountOfSubstance: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyAmountOfSubstance(void);
+    virtual ~PropertyAmountOfSubstance()
+    {}
+};
+
 /** Angle property
  * This is a property for representing angles. It basically a float
  * property. On the Gui it has a quantity like RAD.
@@ -159,17 +176,18 @@ public:
     ~PropertyArea() override = default;
 };
 
-/** Distance property
- * This is a property for representing distances. It is basically a float
- * property. On the Gui it has a quantity like m or mm.
+/** CompressiveStrength property
+ * This is a property for representing compressive strength. It is basically a
+ * float property. On the Gui it has a quantity like Pa.
  */
-class AppExport PropertyDistance: public PropertyQuantity
+class AppExport PropertyCompressiveStrength: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER_WITH_OVERRIDE();
+    TYPESYSTEM_HEADER();
 
 public:
-    PropertyDistance();
-    ~PropertyDistance() override = default;
+    PropertyCompressiveStrength(void);
+    virtual ~PropertyCompressiveStrength()
+    {}
 };
 
 /** CurrentDensity property
@@ -185,6 +203,162 @@ public:
     ~PropertyCurrentDensity() override = default;
 };
 
+/** Density property
+ * This is a property for representing density. It is basically a float
+ * property which must not be negative. On the Gui it has a quantity like
+ * kg/m^3.
+ */
+class AppExport PropertyDensity: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyDensity(void);
+    virtual ~PropertyDensity()
+    {}
+};
+
+/** DissipationRate property
+ * This is a property for representing turbulent dissipation rate. It basically
+ * a float property. On the Gui it has a quantity like m^2/s^3.
+ */
+class AppExport PropertyDissipationRate: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyDissipationRate(void);
+    virtual ~PropertyDissipationRate()
+    {}
+};
+
+/** Distance property
+ * This is a property for representing distances. It is basically a float
+ * property. On the Gui it has a quantity like m or mm.
+ */
+class AppExport PropertyDistance: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
+
+public:
+    PropertyDistance();
+    ~PropertyDistance() override = default;
+};
+
+/** DynamicViscosity property
+ * This is a property for representing dynamic viscosity. It is basically a
+ * float property which must not be negative. On the Gui it has a quantity like
+ * Pa*s.
+ */
+class AppExport PropertyDynamicViscosity: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyDynamicViscosity(void);
+    virtual ~PropertyDynamicViscosity()
+    {}
+};
+
+/** ElectricalCapacitance property
+ * This is a property for representing capacitance. It is basically a float
+ * property. On the Gui it has a quantity like uF.
+ */
+class AppExport PropertyElectricalCapacitance: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyElectricalCapacitance(void);
+    virtual ~PropertyElectricalCapacitance()
+    {}
+};
+
+/** ElectricalConductance property
+ * This is a property for representing electrical conductance. It is basically a
+ * float property. On the Gui it has a quantity like S.
+ */
+class AppExport PropertyElectricalConductance: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyElectricalConductance(void);
+    virtual ~PropertyElectricalConductance()
+    {}
+};
+
+/** ElectricalConductivity property
+ * This is a property for representing electrical conductivity. It is basically
+ * a float property. On the Gui it has a quantity like S/m.
+ */
+class AppExport PropertyElectricalConductivity: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyElectricalConductivity(void);
+    virtual ~PropertyElectricalConductivity()
+    {}
+};
+
+/** ElectricalInductance property
+ * This is a property for representing electrical inductance. It is basically a
+ * float property. On the Gui it has a quantity like H.
+ */
+class AppExport PropertyElectricalInductance: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyElectricalInductance(void);
+    virtual ~PropertyElectricalInductance()
+    {}
+};
+
+/** ElectricalResistance property
+ * This is a property for representing electrical resistance. It is basically a
+ * float property. On the Gui it has a quantity like Ohm.
+ */
+
+class AppExport PropertyElectricalResistance: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyElectricalResistance(void);
+    virtual ~PropertyElectricalResistance()
+    {}
+};
+
+/** ElectricCharge property
+ * This is a property for representing electric charge. It is basically a float
+ * property. On the Gui it has a quantity like C.
+ */
+class AppExport PropertyElectricCharge: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyElectricCharge(void);
+    virtual ~PropertyElectricCharge()
+    {}
+};
+
+/** ElectricCurrent property
+ * This is a property for representing electric currents. It is basically a
+ * float property. On the Gui it has a quantity like A.
+ */
+class AppExport PropertyElectricCurrent: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyElectricCurrent(void);
+    virtual ~PropertyElectricCurrent()
+    {}
+};
+
 /** ElectricPotential property
  * This is a property for electric potentials. It is basically a float
  * property. On the Gui it has a quantity of Volt.
@@ -224,6 +398,80 @@ public:
     ~PropertyForce() override = default;
 };
 
+/** HeatFlux property
+ * This is a property for representing heat flux. It is basically a float
+ * property. On the Gui it has a quantity like W/m^2.
+ */
+class AppExport PropertyHeatFlux: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyHeatFlux(void);
+    virtual ~PropertyHeatFlux()
+    {}
+};
+
+/** InverseArea property
+ * This is a property for representing the reciprocal of area. It is basically a
+ * float property which must not be negative. On the Gui it has a quantity like
+ * 1/m^2.
+ */
+class AppExport PropertyInverseArea: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyInverseArea(void);
+    virtual ~PropertyInverseArea()
+    {}
+};
+
+/** InverseLength property
+ * This is a property for representing the reciprocal of length. It is basically
+ * a float property which must not be negative. On the Gui it has a quantity
+ * like 1/m.
+ */
+class AppExport PropertyInverseLength: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyInverseLength(void);
+    virtual ~PropertyInverseLength()
+    {}
+};
+
+/** InverseVolume property
+ * This is a property for representing the reciprocal of volume. It is basically
+ * a float property. which must not be negative. On the Gui it has a quantity
+ * like 1/m^3.
+ */
+class AppExport PropertyInverseVolume: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyInverseVolume(void);
+    virtual ~PropertyInverseVolume()
+    {}
+};
+
+/** KinematicViscosity property
+ * This is a property for representing kinematic viscosity. It is basically a
+ * float property which must not be negative. On the Gui it has a quantity like
+ * m^2/s^2.
+ */
+class AppExport PropertyKinematicViscosity: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyKinematicViscosity(void);
+    virtual ~PropertyKinematicViscosity()
+    {}
+};
+
 /** Length property
  * This is a property for representing lengths. It is basically a float
  * property which must not be negative. On the Gui it has a quantity like m or mm.
@@ -237,6 +485,62 @@ public:
     ~PropertyLength() override = default;
 };
 
+/** LuminousIntensity property
+ * This is a property for representing luminous intensity. It is basically a
+ * float property. On the Gui it has a quantity like cd.
+ */
+class AppExport PropertyLuminousIntensity: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyLuminousIntensity(void);
+    virtual ~PropertyLuminousIntensity()
+    {}
+};
+
+/** MagneticFieldStrength property
+ * This is a property for representing magnetic field strength. It is basically
+ * a float property. On the Gui it has a quantity like Wb.
+ */
+class AppExport PropertyMagneticFieldStrength: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyMagneticFieldStrength(void);
+    virtual ~PropertyMagneticFieldStrength()
+    {}
+};
+
+/** MagneticFlux property
+ * This is a property for representing magnetic flux. It is basically a float
+ * property. On the Gui it has a quantity like Wb.
+ */
+class AppExport PropertyMagneticFlux: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyMagneticFlux(void);
+    virtual ~PropertyMagneticFlux()
+    {}
+};
+
+/** MagneticFluxDensity property
+ * This is a property for representing magnetic flux density. It is basically a
+ * float property. On the Gui it has a quantity like G or T.
+ */
+class AppExport PropertyMagneticFluxDensity: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyMagneticFluxDensity(void);
+    virtual ~PropertyMagneticFluxDensity()
+    {}
+};
+
  /** Magnetization property
  * This is a property for representing magnetizations. It is basically a float
  * property. On the Gui it has a quantity like A/m.
@@ -250,6 +554,20 @@ public:
     ~PropertyMagnetization() override = default;
 };
 
+/** Mass property
+ * This is a property for representing mass. It is basically a float
+ * property. On the Gui it has a quantity like kg.
+ */
+class AppExport PropertyMass: public PropertyQuantity
+    {
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyMass(void);
+    virtual ~PropertyMass()
+    {}
+    };
+
 /** Pressure property
  * This is a property for representing pressure. It basically a float
  * property. On the Gui it has a quantity like Pa.
@@ -263,6 +581,62 @@ public:
     ~PropertyPressure() override = default;
 };
 
+/** Power property
+ * This is a property for representing power. It is basically a float
+ * property. On the Gui it has a quantity like W.
+ */
+class AppExport PropertyPower: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyPower(void);
+    virtual ~PropertyPower()
+    {}
+};
+
+/** ShearModulus property
+ * This is a property for representing shear modulus. It is basically a float
+ * property. On the Gui it has a quantity like Pa.
+ */
+class AppExport PropertyShearModulus: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyShearModulus(void);
+    virtual ~PropertyShearModulus()
+    {}
+};
+
+/** SpecificEnergy property
+ * This is a property for representing specific energy. It is basically a float
+ * property. On the Gui it has a quantity like m^2/s^2.
+ */
+class AppExport PropertySpecificEnergy: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertySpecificEnergy(void);
+    virtual ~PropertySpecificEnergy()
+    {}
+};
+
+/** SpecificHeat property
+ * This is a property for representing specific heat capacity. It is basically a
+ * float property. On the Gui it has a quantity like J/kg/K.
+ */
+class AppExport PropertySpecificHeat: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertySpecificHeat(void);
+    virtual ~PropertySpecificHeat()
+    {}
+};
+
 /** Speed property
  * This is a property for representing speed. It is basically a float
  * property. On the Gui it has a quantity like m/s or km/h.
@@ -289,31 +663,74 @@ public:
     ~PropertyStiffness() override = default;
 };
 
-/** Mass property
- * This is a property for representing mass. It is basically a float
- * property. On the Gui it has a quantity like kg.
+/** Stress property
+ * This is a property for representing . It is basically a float
+ * property. On the Gui it has a quantity like .
  */
-class AppExport PropertyMass: public PropertyQuantity
+class AppExport PropertyStress: public PropertyQuantity
 {
     TYPESYSTEM_HEADER();
 
 public:
-    PropertyMass(void);
-    virtual ~PropertyMass(){}
+    PropertyStress(void);
+    virtual ~PropertyStress()
+    {}
 };
 
-/** Density property
- * This is a property for representing density. It is basically a float
- * property which must not be negative. On the Gui it has a quantity like
- * kg/m^3.
+/** Temperature property
+ * This is a property for representing temperatures. It is basically a float
+ * property which must not be negative. On the Gui it has a quantity like K.
  */
-class AppExport PropertyDensity: public PropertyQuantity
+class AppExport PropertyTemperature: public PropertyQuantity
 {
     TYPESYSTEM_HEADER();
 
 public:
-    PropertyDensity(void);
-    virtual ~PropertyDensity(){}
+    PropertyTemperature(void);
+    virtual ~PropertyTemperature()
+    {}
+};
+
+/** ThermalConductivity property
+ * This is a property for representing thermal conductivity. It is basically a
+ * float property. On the Gui it has a quantity like W/m/K.
+ */
+class AppExport PropertyThermalConductivity: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyThermalConductivity(void);
+    virtual ~PropertyThermalConductivity()
+    {}
+};
+
+/** ThermalExpansionCoefficient property
+ * This is a property for representing a coefficient of thermal expansion. It
+ * basically a float property. On the Gui it has a quantity like 1/K.
+ */
+class AppExport PropertyThermalExpansionCoefficient: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyThermalExpansionCoefficient(void);
+    virtual ~PropertyThermalExpansionCoefficient()
+    {}
+};
+
+/** ThermalTransferCoefficient property
+ * This is a property for representing heat transfer coefficient. It is
+ * basically a float property. On the Gui it has a quantity like W/m^2/K.
+ */
+class AppExport PropertyThermalTransferCoefficient: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyThermalTransferCoefficient(void);
+    virtual ~PropertyThermalTransferCoefficient()
+    {}
 };
 
 /** TimeSpan property
@@ -329,228 +746,6 @@ public:
     virtual ~PropertyTime(){}
 };
 
-/** Velocity property
- * This is a property for representing velocities. It is basically a float
- * property. On the Gui it has a quantity like m/s.
- */
-class AppExport PropertyVelocity: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyVelocity(void);
-    virtual ~PropertyVelocity(){}
-};
-
-/** Temperature property
- * This is a property for representing temperatures. It is basically a float
- * property which must not be negative. On the Gui it has a quantity like K.
- */
-class AppExport PropertyTemperature: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyTemperature(void);
-    virtual ~PropertyTemperature(){}
-};
-
-/** ElectricCurrent property
- * This is a property for representing electric currents. It is basically a
- * float property. On the Gui it has a quantity like A.
- */
-class AppExport PropertyElectricCurrent: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyElectricCurrent(void);
-    virtual ~PropertyElectricCurrent(){}
-};
-
-/** ElectricCharge property
- * This is a property for representing electric charge. It is basically a float
- * property. On the Gui it has a quantity like C.
- */
-class AppExport PropertyElectricCharge: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyElectricCharge(void);
-    virtual ~PropertyElectricCharge(){}
-};
-
-/** MagneticFieldStrength property
- * This is a property for representing magnetic field strength. It is basically
- * a float property. On the Gui it has a quantity like Wb.
- */
-class AppExport PropertyMagneticFieldStrength: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyMagneticFieldStrength(void);
-    virtual ~PropertyMagneticFieldStrength(){}
-};
-
-/** MagneticFlux property
- * This is a property for representing magnetic flux. It is basically a float
- * property. On the Gui it has a quantity like Wb.
- */
-class AppExport PropertyMagneticFlux: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyMagneticFlux(void);
-    virtual ~PropertyMagneticFlux(){}
-};
-
-/** MagneticFluxDensity property
- * This is a property for representing magnetic flux density. It is basically a
- * float property. On the Gui it has a quantity like G or T.
- */
-class AppExport PropertyMagneticFluxDensity: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyMagneticFluxDensity(void);
-    virtual ~PropertyMagneticFluxDensity(){}
-};
-
-/** ElectricalCapacitance property
- * This is a property for representing capacitance. It is basically a float
- * property. On the Gui it has a quantity like uF.
- */
-class AppExport PropertyElectricalCapacitance: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyElectricalCapacitance(void);
-    virtual ~PropertyElectricalCapacitance(){}
-};
-
-/** ElectricalInductance property
- * This is a property for representing electrical inductance. It is basically a
- * float property. On the Gui it has a quantity like H.
- */
-class AppExport PropertyElectricalInductance: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyElectricalInductance(void);
-    virtual ~PropertyElectricalInductance(){}
-};
-
-/** ElectricalConductance property
- * This is a property for representing electrical conductance. It is basically a
- * float property. On the Gui it has a quantity like S.
- */
-class AppExport PropertyElectricalConductance: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyElectricalConductance(void);
-    virtual ~PropertyElectricalConductance(){}
-};
-
-/** ElectricalResistance property
- * This is a property for representing electrical resistance. It is basically a
- * float property. On the Gui it has a quantity like Ohm.
- */
-
-class AppExport PropertyElectricalResistance: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyElectricalResistance(void);
-    virtual ~PropertyElectricalResistance(){}
-};
-
-/** ElectricalConductivity property
- * This is a property for representing electrical conductivity. It is basically
- * a float property. On the Gui it has a quantity like S/m.
- */
-class AppExport PropertyElectricalConductivity: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyElectricalConductivity(void);
-    virtual ~PropertyElectricalConductivity(){}
-};
-
-/** AmountOfSubstance property
- * This is a property for representing number of molecules. It is basically a
- * float property. On the Gui it has a quantity like mole.
- */
-class AppExport PropertyAmountOfSubstance: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyAmountOfSubstance(void);
-    virtual ~PropertyAmountOfSubstance(){}
-};
-
-/** LuminousIntensity property
- * This is a property for representing luminous intensity. It is basically a
- * float property. On the Gui it has a quantity like cd.
- */
-class AppExport PropertyLuminousIntensity: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyLuminousIntensity(void);
-    virtual ~PropertyLuminousIntensity(){}
-};
-
-/** CompressiveStrength property
- * This is a property for representing compressive strength. It is basically a
- * float property. On the Gui it has a quantity like Pa.
- */
-class AppExport PropertyCompressiveStrength: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyCompressiveStrength(void);
-    virtual ~PropertyCompressiveStrength(){}
-};
-
-/** ShearModulus property
- * This is a property for representing shear modulus. It is basically a float
- * property. On the Gui it has a quantity like Pa.
- */
-class AppExport PropertyShearModulus: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyShearModulus(void);
-    virtual ~PropertyShearModulus(){}
-};
-
-/** Stress property
- * This is a property for representing . It is basically a float
- * property. On the Gui it has a quantity like .
- */
-class AppExport PropertyStress: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyStress(void);
-    virtual ~PropertyStress(){}
-};
-
 /** UltimateTensileStrength property
  * This is a property for representing ultimate tensile strength. It is
  * basically a float property. On the Gui it has a quantity like Pa.
@@ -564,177 +759,6 @@ public:
     virtual ~PropertyUltimateTensileStrength(){}
 };
 
-/** YieldStrength property
- * This is a property for representing yield strength. It is basically a float
- * property. On the Gui it has a quantity like Pa.
- */
-class AppExport PropertyYieldStrength: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyYieldStrength(void);
-    virtual ~PropertyYieldStrength(){}
-};
-
-/** YoungsModulus property
- * This is a property for representing Young's modulus. It is basically a float
- * property. On the Gui it has a quantity like Pa.
- */
-class AppExport PropertyYoungsModulus: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyYoungsModulus(void);
-    virtual ~PropertyYoungsModulus(){}
-};
-
-/** Work property
- * This is a property for representing work. It is basically a float
- * property. On the Gui it has a quantity like Nm.
- */
-class AppExport PropertyWork: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyWork(void);
-    virtual ~PropertyWork(){}
-};
-
-/** Power property
- * This is a property for representing power. It is basically a float
- * property. On the Gui it has a quantity like W.
- */
-class AppExport PropertyPower: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyPower(void);
-    virtual ~PropertyPower(){}
-};
-
-/** SpecificEnergy property
- * This is a property for representing specific energy. It is basically a float
- * property. On the Gui it has a quantity like m^2/s^2.
- */
-class AppExport PropertySpecificEnergy: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertySpecificEnergy(void);
-    virtual ~PropertySpecificEnergy(){}
-};
-
-/** ThermalConductivity property
- * This is a property for representing thermal conductivity. It is basically a
- * float property. On the Gui it has a quantity like W/m/K.
- */
-class AppExport PropertyThermalConductivity: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyThermalConductivity(void);
-    virtual ~PropertyThermalConductivity(){}
-};
-
-/** ThermalExpansionCoefficient property
- * This is a property for representing a coefficient of thermal expansion. It
- * basically a float property. On the Gui it has a quantity like 1/K.
- */
-class AppExport PropertyThermalExpansionCoefficient: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyThermalExpansionCoefficient(void);
-    virtual ~PropertyThermalExpansionCoefficient(){}
-};
-
-/** VolumetricThermalExpansionCoefficient property
- * This is a property for representing . It is basically a float
- * property. On the Gui it has a quantity like 1/K.
- */
-class AppExport PropertyVolumetricThermalExpansionCoefficient: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyVolumetricThermalExpansionCoefficient(void);
-    virtual ~PropertyVolumetricThermalExpansionCoefficient(){}
-};
-
-/** SpecificHeat property
- * This is a property for representing specific heat capacity. It is basically a
- * float property. On the Gui it has a quantity like J/kg/K.
- */
-class AppExport PropertySpecificHeat: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertySpecificHeat(void);
-    virtual ~PropertySpecificHeat(){}
-};
-
-/** ThermalTransferCoefficient property
- * This is a property for representing heat transfer coefficient. It is
- * basically a float property. On the Gui it has a quantity like W/m^2/K.
- */
-class AppExport PropertyThermalTransferCoefficient: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyThermalTransferCoefficient(void);
-    virtual ~PropertyThermalTransferCoefficient(){}
-};
-
-/** HeatFlux property
- * This is a property for representing heat flux. It is basically a float
- * property. On the Gui it has a quantity like W/m^2.
- */
-class AppExport PropertyHeatFlux: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyHeatFlux(void);
-    virtual ~PropertyHeatFlux(){}
-};
-
-/** DynamicViscosity property
- * This is a property for representing dynamic viscosity. It is basically a
- * float property which must not be negative. On the Gui it has a quantity like
- * Pa*s.
- */
-class AppExport PropertyDynamicViscosity: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyDynamicViscosity(void);
-    virtual ~PropertyDynamicViscosity(){}
-};
-
-/** KinematicViscosity property
- * This is a property for representing kinematic viscosity. It is basically a
- * float property which must not be negative. On the Gui it has a quantity like
- * m^2/s^2.
- */
-class AppExport PropertyKinematicViscosity: public PropertyQuantity
-{
-    TYPESYSTEM_HEADER();
-
-public:
-    PropertyKinematicViscosity(void);
-    virtual ~PropertyKinematicViscosity(){}
-};
-
 /** VacuumPermittivity property
  * This is a property for representing vacuum permittivity. It is basically a float
  * property. On the Gui it has a quantity like s^4*A^2 / (m^3*kg).
@@ -748,6 +772,20 @@ public:
     ~PropertyVacuumPermittivity() override = default;
 };
 
+/** Velocity property
+ * This is a property for representing velocities. It is basically a float
+ * property. On the Gui it has a quantity like m/s.
+ */
+class AppExport PropertyVelocity: public PropertyQuantity
+{
+    TYPESYSTEM_HEADER();
+
+public:
+    PropertyVelocity(void);
+    virtual ~PropertyVelocity()
+    {}
+};
+
 /** Volume property
  * This is a property for representing volumes. It is basically a float
  * property which must not be negative. On the Gui it has a quantity like m^3 or mm^3.
@@ -771,65 +809,65 @@ class AppExport PropertyVolumeFlowRate: public PropertyQuantity
 
 public:
     PropertyVolumeFlowRate(void);
-    virtual ~PropertyVolumeFlowRate(){}
+    virtual ~PropertyVolumeFlowRate()
+    {}
 };
 
-/** DissipationRate property
- * This is a property for representing turbulent dissipation rate. It basically
- * a float property. On the Gui it has a quantity like m^2/s^3.
+/** VolumetricThermalExpansionCoefficient property
+ * This is a property for representing . It is basically a float
+ * property. On the Gui it has a quantity like 1/K.
  */
-class AppExport PropertyDissipationRate: public PropertyQuantity
+class AppExport PropertyVolumetricThermalExpansionCoefficient: public PropertyQuantity
 {
     TYPESYSTEM_HEADER();
 
 public:
-    PropertyDissipationRate(void);
-    virtual ~PropertyDissipationRate(){}
+    PropertyVolumetricThermalExpansionCoefficient(void);
+    virtual ~PropertyVolumetricThermalExpansionCoefficient()
+    {}
 };
 
-/** InverseLength property
- * This is a property for representing the reciprocal of length. It is basically
- * a float property which must not be negative. On the Gui it has a quantity
- * like 1/m.
+/** Work property
+ * This is a property for representing work. It is basically a float
+ * property. On the Gui it has a quantity like Nm.
  */
-class AppExport PropertyInverseLength: public PropertyQuantity
+class AppExport PropertyWork: public PropertyQuantity
 {
     TYPESYSTEM_HEADER();
 
 public:
-    PropertyInverseLength(void);
-    virtual ~PropertyInverseLength(){}
+    PropertyWork(void);
+    virtual ~PropertyWork(){}
 };
 
-/** InverseArea property
- * This is a property for representing the reciprocal of area. It is basically a
- * float property which must not be negative. On the Gui it has a quantity like
- * 1/m^2.
+/** YieldStrength property
+ * This is a property for representing yield strength. It is basically a float
+ * property. On the Gui it has a quantity like Pa.
  */
-class AppExport PropertyInverseArea: public PropertyQuantity
+class AppExport PropertyYieldStrength: public PropertyQuantity
 {
     TYPESYSTEM_HEADER();
 
 public:
-    PropertyInverseArea(void);
-    virtual ~PropertyInverseArea(){}
+    PropertyYieldStrength(void);
+    virtual ~PropertyYieldStrength()
+    {}
 };
 
-/** InverseVolume property
- * This is a property for representing the reciprocal of volume. It is basically
- * a float property. which must not be negative. On the Gui it has a quantity
- * like 1/m^3.
+/** YoungsModulus property
+ * This is a property for representing Young's modulus. It is basically a float
+ * property. On the Gui it has a quantity like Pa.
  */
-class AppExport PropertyInverseVolume: public PropertyQuantity
+class AppExport PropertyYoungsModulus: public PropertyQuantity
 {
     TYPESYSTEM_HEADER();
 
 public:
-    PropertyInverseVolume(void);
-    virtual ~PropertyInverseVolume(){}
+    PropertyYoungsModulus(void);
+    virtual ~PropertyYoungsModulus()
+    {}
 };
 
-
 }// namespace App
 
 #endif// APP_PROPERTYUNITS_H