diff --git a/Common/GeneratedCode/Quantities/Acceleration.Common.g.cs b/Common/GeneratedCode/Quantities/Acceleration.Common.g.cs
index 20cdb98eb1..18caab2220 100644
--- a/Common/GeneratedCode/Quantities/Acceleration.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Acceleration.Common.g.cs
@@ -550,7 +550,7 @@ public bool Equals(Acceleration other, Acceleration maxError)
         /// <returns>A hash code for the current Acceleration.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Acceleration), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/AmountOfSubstance.Common.g.cs b/Common/GeneratedCode/Quantities/AmountOfSubstance.Common.g.cs
index 4a37a5e1db..3205606f9c 100644
--- a/Common/GeneratedCode/Quantities/AmountOfSubstance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/AmountOfSubstance.Common.g.cs
@@ -569,7 +569,7 @@ public bool Equals(AmountOfSubstance other, AmountOfSubstance maxError)
         /// <returns>A hash code for the current AmountOfSubstance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(AmountOfSubstance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/AmplitudeRatio.Common.g.cs b/Common/GeneratedCode/Quantities/AmplitudeRatio.Common.g.cs
index 8f76f2ceda..25ce7dc99d 100644
--- a/Common/GeneratedCode/Quantities/AmplitudeRatio.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/AmplitudeRatio.Common.g.cs
@@ -378,7 +378,7 @@ public bool Equals(AmplitudeRatio other, AmplitudeRatio maxError)
         /// <returns>A hash code for the current AmplitudeRatio.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(AmplitudeRatio), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Angle.Common.g.cs b/Common/GeneratedCode/Quantities/Angle.Common.g.cs
index 6fc2f691d6..36586115b3 100644
--- a/Common/GeneratedCode/Quantities/Angle.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Angle.Common.g.cs
@@ -568,7 +568,7 @@ public bool Equals(Angle other, Angle maxError)
         /// <returns>A hash code for the current Angle.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Angle), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ApparentEnergy.Common.g.cs b/Common/GeneratedCode/Quantities/ApparentEnergy.Common.g.cs
index c63c38b73c..6cc59451b4 100644
--- a/Common/GeneratedCode/Quantities/ApparentEnergy.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ApparentEnergy.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(ApparentEnergy other, ApparentEnergy maxError)
         /// <returns>A hash code for the current ApparentEnergy.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ApparentEnergy), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ApparentPower.Common.g.cs b/Common/GeneratedCode/Quantities/ApparentPower.Common.g.cs
index f9983c34cc..4a103de4cf 100644
--- a/Common/GeneratedCode/Quantities/ApparentPower.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ApparentPower.Common.g.cs
@@ -379,7 +379,7 @@ public bool Equals(ApparentPower other, ApparentPower maxError)
         /// <returns>A hash code for the current ApparentPower.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ApparentPower), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Area.Common.g.cs b/Common/GeneratedCode/Quantities/Area.Common.g.cs
index 7cda67fda6..b4cd1ec7ea 100644
--- a/Common/GeneratedCode/Quantities/Area.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Area.Common.g.cs
@@ -550,7 +550,7 @@ public bool Equals(Area other, Area maxError)
         /// <returns>A hash code for the current Area.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Area), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/AreaDensity.Common.g.cs b/Common/GeneratedCode/Quantities/AreaDensity.Common.g.cs
index 5c826bd6d9..4c4b15fc4c 100644
--- a/Common/GeneratedCode/Quantities/AreaDensity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/AreaDensity.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(AreaDensity other, AreaDensity maxError)
         /// <returns>A hash code for the current AreaDensity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(AreaDensity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/AreaMomentOfInertia.Common.g.cs b/Common/GeneratedCode/Quantities/AreaMomentOfInertia.Common.g.cs
index d374af505b..d68942796a 100644
--- a/Common/GeneratedCode/Quantities/AreaMomentOfInertia.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/AreaMomentOfInertia.Common.g.cs
@@ -417,7 +417,7 @@ public bool Equals(AreaMomentOfInertia other, AreaMomentOfInertia maxError)
         /// <returns>A hash code for the current AreaMomentOfInertia.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(AreaMomentOfInertia), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/BitRate.Common.g.cs b/Common/GeneratedCode/Quantities/BitRate.Common.g.cs
index 4f23de2ee9..23bb99ca85 100644
--- a/Common/GeneratedCode/Quantities/BitRate.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/BitRate.Common.g.cs
@@ -795,7 +795,7 @@ public bool Equals(BitRate other, BitRate maxError)
         /// <returns>A hash code for the current BitRate.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(BitRate), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.Common.g.cs b/Common/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.Common.g.cs
index 775e0bb39d..e031047df7 100644
--- a/Common/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(BrakeSpecificFuelConsumption other, BrakeSpecificFuelConsumpt
         /// <returns>A hash code for the current BrakeSpecificFuelConsumption.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(BrakeSpecificFuelConsumption), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Capacitance.Common.g.cs b/Common/GeneratedCode/Quantities/Capacitance.Common.g.cs
index 51f4d7b426..2b1e0fefb6 100644
--- a/Common/GeneratedCode/Quantities/Capacitance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Capacitance.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(Capacitance other, Capacitance maxError)
         /// <returns>A hash code for the current Capacitance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Capacitance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Density.Common.g.cs b/Common/GeneratedCode/Quantities/Density.Common.g.cs
index 6b166783bf..a9605f03db 100644
--- a/Common/GeneratedCode/Quantities/Density.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Density.Common.g.cs
@@ -1025,7 +1025,7 @@ public bool Equals(Density other, Density maxError)
         /// <returns>A hash code for the current Density.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Density), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Duration.Common.g.cs b/Common/GeneratedCode/Quantities/Duration.Common.g.cs
index c8a999f8c4..72943349cc 100644
--- a/Common/GeneratedCode/Quantities/Duration.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Duration.Common.g.cs
@@ -535,7 +535,7 @@ public bool Equals(Duration other, Duration maxError)
         /// <returns>A hash code for the current Duration.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Duration), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/DynamicViscosity.Common.g.cs b/Common/GeneratedCode/Quantities/DynamicViscosity.Common.g.cs
index e9c8c5f187..9a9443ae7d 100644
--- a/Common/GeneratedCode/Quantities/DynamicViscosity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/DynamicViscosity.Common.g.cs
@@ -417,7 +417,7 @@ public bool Equals(DynamicViscosity other, DynamicViscosity maxError)
         /// <returns>A hash code for the current DynamicViscosity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(DynamicViscosity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricAdmittance.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricAdmittance.Common.g.cs
index b2f51a20a4..e73ed449eb 100644
--- a/Common/GeneratedCode/Quantities/ElectricAdmittance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricAdmittance.Common.g.cs
@@ -379,7 +379,7 @@ public bool Equals(ElectricAdmittance other, ElectricAdmittance maxError)
         /// <returns>A hash code for the current ElectricAdmittance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricAdmittance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricCharge.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricCharge.Common.g.cs
index 7ee46b9a56..50c441cff0 100644
--- a/Common/GeneratedCode/Quantities/ElectricCharge.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricCharge.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(ElectricCharge other, ElectricCharge maxError)
         /// <returns>A hash code for the current ElectricCharge.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricCharge), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricChargeDensity.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricChargeDensity.Common.g.cs
index 2077ea5219..6f358904d5 100644
--- a/Common/GeneratedCode/Quantities/ElectricChargeDensity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricChargeDensity.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(ElectricChargeDensity other, ElectricChargeDensity maxError)
         /// <returns>A hash code for the current ElectricChargeDensity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricChargeDensity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricConductance.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricConductance.Common.g.cs
index 8065fca67c..75dada6f7e 100644
--- a/Common/GeneratedCode/Quantities/ElectricConductance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricConductance.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(ElectricConductance other, ElectricConductance maxError)
         /// <returns>A hash code for the current ElectricConductance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricConductance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricConductivity.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricConductivity.Common.g.cs
index 7dd8478447..0d62f46eac 100644
--- a/Common/GeneratedCode/Quantities/ElectricConductivity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricConductivity.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(ElectricConductivity other, ElectricConductivity maxError)
         /// <returns>A hash code for the current ElectricConductivity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricConductivity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricCurrent.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricCurrent.Common.g.cs
index c0f97fdbf2..9acb9f3a01 100644
--- a/Common/GeneratedCode/Quantities/ElectricCurrent.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricCurrent.Common.g.cs
@@ -455,7 +455,7 @@ public bool Equals(ElectricCurrent other, ElectricCurrent maxError)
         /// <returns>A hash code for the current ElectricCurrent.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricCurrent), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricCurrentDensity.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricCurrentDensity.Common.g.cs
index e2e803a3da..1abfb0ae7b 100644
--- a/Common/GeneratedCode/Quantities/ElectricCurrentDensity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricCurrentDensity.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(ElectricCurrentDensity other, ElectricCurrentDensity maxError
         /// <returns>A hash code for the current ElectricCurrentDensity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricCurrentDensity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricCurrentGradient.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricCurrentGradient.Common.g.cs
index be91a65f38..c2ff2c5d88 100644
--- a/Common/GeneratedCode/Quantities/ElectricCurrentGradient.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricCurrentGradient.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(ElectricCurrentGradient other, ElectricCurrentGradient maxErr
         /// <returns>A hash code for the current ElectricCurrentGradient.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricCurrentGradient), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricField.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricField.Common.g.cs
index 39eb12dd61..a6c4c00087 100644
--- a/Common/GeneratedCode/Quantities/ElectricField.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricField.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(ElectricField other, ElectricField maxError)
         /// <returns>A hash code for the current ElectricField.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricField), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricInductance.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricInductance.Common.g.cs
index 2a41581253..cd967fe07e 100644
--- a/Common/GeneratedCode/Quantities/ElectricInductance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricInductance.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(ElectricInductance other, ElectricInductance maxError)
         /// <returns>A hash code for the current ElectricInductance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricInductance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricPotential.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricPotential.Common.g.cs
index 451df6f235..2e4917c000 100644
--- a/Common/GeneratedCode/Quantities/ElectricPotential.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricPotential.Common.g.cs
@@ -398,7 +398,7 @@ public bool Equals(ElectricPotential other, ElectricPotential maxError)
         /// <returns>A hash code for the current ElectricPotential.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricPotential), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricPotentialAc.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricPotentialAc.Common.g.cs
index d1e7d7ecec..3f2af80320 100644
--- a/Common/GeneratedCode/Quantities/ElectricPotentialAc.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricPotentialAc.Common.g.cs
@@ -397,7 +397,7 @@ public bool Equals(ElectricPotentialAc other, ElectricPotentialAc maxError)
         /// <returns>A hash code for the current ElectricPotentialAc.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricPotentialAc), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricPotentialDc.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricPotentialDc.Common.g.cs
index cf468b8609..e1e23c9c06 100644
--- a/Common/GeneratedCode/Quantities/ElectricPotentialDc.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricPotentialDc.Common.g.cs
@@ -397,7 +397,7 @@ public bool Equals(ElectricPotentialDc other, ElectricPotentialDc maxError)
         /// <returns>A hash code for the current ElectricPotentialDc.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricPotentialDc), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricResistance.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricResistance.Common.g.cs
index ba6709d508..e25f845786 100644
--- a/Common/GeneratedCode/Quantities/ElectricResistance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricResistance.Common.g.cs
@@ -379,7 +379,7 @@ public bool Equals(ElectricResistance other, ElectricResistance maxError)
         /// <returns>A hash code for the current ElectricResistance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricResistance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ElectricResistivity.Common.g.cs b/Common/GeneratedCode/Quantities/ElectricResistivity.Common.g.cs
index caceb042e2..8b55295040 100644
--- a/Common/GeneratedCode/Quantities/ElectricResistivity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ElectricResistivity.Common.g.cs
@@ -379,7 +379,7 @@ public bool Equals(ElectricResistivity other, ElectricResistivity maxError)
         /// <returns>A hash code for the current ElectricResistivity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ElectricResistivity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Energy.Common.g.cs b/Common/GeneratedCode/Quantities/Energy.Common.g.cs
index d28b309327..4854bf565c 100644
--- a/Common/GeneratedCode/Quantities/Energy.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Energy.Common.g.cs
@@ -721,7 +721,7 @@ public bool Equals(Energy other, Energy maxError)
         /// <returns>A hash code for the current Energy.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Energy), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Entropy.Common.g.cs b/Common/GeneratedCode/Quantities/Entropy.Common.g.cs
index 1a8e7f5189..4d71ae199f 100644
--- a/Common/GeneratedCode/Quantities/Entropy.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Entropy.Common.g.cs
@@ -436,7 +436,7 @@ public bool Equals(Entropy other, Entropy maxError)
         /// <returns>A hash code for the current Entropy.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Entropy), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Flow.Common.g.cs b/Common/GeneratedCode/Quantities/Flow.Common.g.cs
index 52770f9207..bf17546056 100644
--- a/Common/GeneratedCode/Quantities/Flow.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Flow.Common.g.cs
@@ -796,7 +796,7 @@ public bool Equals(Flow other, Flow maxError)
         /// <returns>A hash code for the current Flow.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Flow), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Force.Common.g.cs b/Common/GeneratedCode/Quantities/Force.Common.g.cs
index e6b543bf20..dcefeab254 100644
--- a/Common/GeneratedCode/Quantities/Force.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Force.Common.g.cs
@@ -550,7 +550,7 @@ public bool Equals(Force other, Force maxError)
         /// <returns>A hash code for the current Force.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Force), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ForceChangeRate.Common.g.cs b/Common/GeneratedCode/Quantities/ForceChangeRate.Common.g.cs
index 6bc35ab155..01a9fb2e73 100644
--- a/Common/GeneratedCode/Quantities/ForceChangeRate.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ForceChangeRate.Common.g.cs
@@ -512,7 +512,7 @@ public bool Equals(ForceChangeRate other, ForceChangeRate maxError)
         /// <returns>A hash code for the current ForceChangeRate.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ForceChangeRate), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ForcePerLength.Common.g.cs b/Common/GeneratedCode/Quantities/ForcePerLength.Common.g.cs
index 7abcf9092d..090ab87e76 100644
--- a/Common/GeneratedCode/Quantities/ForcePerLength.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ForcePerLength.Common.g.cs
@@ -474,7 +474,7 @@ public bool Equals(ForcePerLength other, ForcePerLength maxError)
         /// <returns>A hash code for the current ForcePerLength.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ForcePerLength), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Frequency.Common.g.cs b/Common/GeneratedCode/Quantities/Frequency.Common.g.cs
index ea915a7d87..09a69274ac 100644
--- a/Common/GeneratedCode/Quantities/Frequency.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Frequency.Common.g.cs
@@ -455,7 +455,7 @@ public bool Equals(Frequency other, Frequency maxError)
         /// <returns>A hash code for the current Frequency.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Frequency), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/HeatFlux.Common.g.cs b/Common/GeneratedCode/Quantities/HeatFlux.Common.g.cs
index c5a1aa0b19..ae085a0ee9 100644
--- a/Common/GeneratedCode/Quantities/HeatFlux.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/HeatFlux.Common.g.cs
@@ -607,7 +607,7 @@ public bool Equals(HeatFlux other, HeatFlux maxError)
         /// <returns>A hash code for the current HeatFlux.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(HeatFlux), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/HeatTransferCoefficient.Common.g.cs b/Common/GeneratedCode/Quantities/HeatTransferCoefficient.Common.g.cs
index 7d88dfbfbe..f6e946887d 100644
--- a/Common/GeneratedCode/Quantities/HeatTransferCoefficient.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/HeatTransferCoefficient.Common.g.cs
@@ -341,7 +341,7 @@ public bool Equals(HeatTransferCoefficient other, HeatTransferCoefficient maxErr
         /// <returns>A hash code for the current HeatTransferCoefficient.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(HeatTransferCoefficient), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Illuminance.Common.g.cs b/Common/GeneratedCode/Quantities/Illuminance.Common.g.cs
index 40dfb97600..cdb6ae9ec3 100644
--- a/Common/GeneratedCode/Quantities/Illuminance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Illuminance.Common.g.cs
@@ -379,7 +379,7 @@ public bool Equals(Illuminance other, Illuminance maxError)
         /// <returns>A hash code for the current Illuminance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Illuminance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Information.Common.g.cs b/Common/GeneratedCode/Quantities/Information.Common.g.cs
index d1c7c36a27..3051e9b23a 100644
--- a/Common/GeneratedCode/Quantities/Information.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Information.Common.g.cs
@@ -795,7 +795,7 @@ public bool Equals(Information other, Information maxError)
         /// <returns>A hash code for the current Information.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Information), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Irradiance.Common.g.cs b/Common/GeneratedCode/Quantities/Irradiance.Common.g.cs
index 1c7ea1efcb..aa4d384802 100644
--- a/Common/GeneratedCode/Quantities/Irradiance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Irradiance.Common.g.cs
@@ -341,7 +341,7 @@ public bool Equals(Irradiance other, Irradiance maxError)
         /// <returns>A hash code for the current Irradiance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Irradiance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Irradiation.Common.g.cs b/Common/GeneratedCode/Quantities/Irradiation.Common.g.cs
index 3b1b356b93..dc82d148ec 100644
--- a/Common/GeneratedCode/Quantities/Irradiation.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Irradiation.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(Irradiation other, Irradiation maxError)
         /// <returns>A hash code for the current Irradiation.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Irradiation), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/KinematicViscosity.Common.g.cs b/Common/GeneratedCode/Quantities/KinematicViscosity.Common.g.cs
index 2cdb78317d..ae6e65332d 100644
--- a/Common/GeneratedCode/Quantities/KinematicViscosity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/KinematicViscosity.Common.g.cs
@@ -455,7 +455,7 @@ public bool Equals(KinematicViscosity other, KinematicViscosity maxError)
         /// <returns>A hash code for the current KinematicViscosity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(KinematicViscosity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/LapseRate.Common.g.cs b/Common/GeneratedCode/Quantities/LapseRate.Common.g.cs
index 8608f18fee..a205c120f4 100644
--- a/Common/GeneratedCode/Quantities/LapseRate.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/LapseRate.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(LapseRate other, LapseRate maxError)
         /// <returns>A hash code for the current LapseRate.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(LapseRate), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Length.Common.g.cs b/Common/GeneratedCode/Quantities/Length.Common.g.cs
index 64a2dce872..89ebef9432 100644
--- a/Common/GeneratedCode/Quantities/Length.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Length.Common.g.cs
@@ -721,7 +721,7 @@ public bool Equals(Length other, Length maxError)
         /// <returns>A hash code for the current Length.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Length), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Level.Common.g.cs b/Common/GeneratedCode/Quantities/Level.Common.g.cs
index 9cc06211bc..5f3aec3ab0 100644
--- a/Common/GeneratedCode/Quantities/Level.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Level.Common.g.cs
@@ -340,7 +340,7 @@ public bool Equals(Level other, Level maxError)
         /// <returns>A hash code for the current Level.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Level), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/LinearDensity.Common.g.cs b/Common/GeneratedCode/Quantities/LinearDensity.Common.g.cs
index d0264b8d31..e4ac3858aa 100644
--- a/Common/GeneratedCode/Quantities/LinearDensity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/LinearDensity.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(LinearDensity other, LinearDensity maxError)
         /// <returns>A hash code for the current LinearDensity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(LinearDensity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/LuminousFlux.Common.g.cs b/Common/GeneratedCode/Quantities/LuminousFlux.Common.g.cs
index 00de3fcba2..9437604d12 100644
--- a/Common/GeneratedCode/Quantities/LuminousFlux.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/LuminousFlux.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(LuminousFlux other, LuminousFlux maxError)
         /// <returns>A hash code for the current LuminousFlux.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(LuminousFlux), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/LuminousIntensity.Common.g.cs b/Common/GeneratedCode/Quantities/LuminousIntensity.Common.g.cs
index bd8d4ae623..867223d7a9 100644
--- a/Common/GeneratedCode/Quantities/LuminousIntensity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/LuminousIntensity.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(LuminousIntensity other, LuminousIntensity maxError)
         /// <returns>A hash code for the current LuminousIntensity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(LuminousIntensity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/MagneticField.Common.g.cs b/Common/GeneratedCode/Quantities/MagneticField.Common.g.cs
index e3096d06f2..9af97c5edb 100644
--- a/Common/GeneratedCode/Quantities/MagneticField.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/MagneticField.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(MagneticField other, MagneticField maxError)
         /// <returns>A hash code for the current MagneticField.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(MagneticField), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/MagneticFlux.Common.g.cs b/Common/GeneratedCode/Quantities/MagneticFlux.Common.g.cs
index dc783e24e2..e955e87c0c 100644
--- a/Common/GeneratedCode/Quantities/MagneticFlux.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/MagneticFlux.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(MagneticFlux other, MagneticFlux maxError)
         /// <returns>A hash code for the current MagneticFlux.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(MagneticFlux), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Magnetization.Common.g.cs b/Common/GeneratedCode/Quantities/Magnetization.Common.g.cs
index 7d3ddbed73..13ce3c8227 100644
--- a/Common/GeneratedCode/Quantities/Magnetization.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Magnetization.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(Magnetization other, Magnetization maxError)
         /// <returns>A hash code for the current Magnetization.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Magnetization), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Mass.Common.g.cs b/Common/GeneratedCode/Quantities/Mass.Common.g.cs
index 7864376d84..08f9d4ba84 100644
--- a/Common/GeneratedCode/Quantities/Mass.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Mass.Common.g.cs
@@ -721,7 +721,7 @@ public bool Equals(Mass other, Mass maxError)
         /// <returns>A hash code for the current Mass.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Mass), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/MassFlow.Common.g.cs b/Common/GeneratedCode/Quantities/MassFlow.Common.g.cs
index 5e53f133aa..ecf7177876 100644
--- a/Common/GeneratedCode/Quantities/MassFlow.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/MassFlow.Common.g.cs
@@ -588,7 +588,7 @@ public bool Equals(MassFlow other, MassFlow maxError)
         /// <returns>A hash code for the current MassFlow.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(MassFlow), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/MassFlux.Common.g.cs b/Common/GeneratedCode/Quantities/MassFlux.Common.g.cs
index 5056e19a6a..1b2ad14461 100644
--- a/Common/GeneratedCode/Quantities/MassFlux.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/MassFlux.Common.g.cs
@@ -341,7 +341,7 @@ public bool Equals(MassFlux other, MassFlux maxError)
         /// <returns>A hash code for the current MassFlux.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(MassFlux), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/MassMomentOfInertia.Common.g.cs b/Common/GeneratedCode/Quantities/MassMomentOfInertia.Common.g.cs
index 9065cd6c7c..21e36b048f 100644
--- a/Common/GeneratedCode/Quantities/MassMomentOfInertia.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/MassMomentOfInertia.Common.g.cs
@@ -835,7 +835,7 @@ public bool Equals(MassMomentOfInertia other, MassMomentOfInertia maxError)
         /// <returns>A hash code for the current MassMomentOfInertia.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(MassMomentOfInertia), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/MolarEnergy.Common.g.cs b/Common/GeneratedCode/Quantities/MolarEnergy.Common.g.cs
index 7e16c5551f..cbaa9e67bf 100644
--- a/Common/GeneratedCode/Quantities/MolarEnergy.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/MolarEnergy.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(MolarEnergy other, MolarEnergy maxError)
         /// <returns>A hash code for the current MolarEnergy.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(MolarEnergy), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/MolarEntropy.Common.g.cs b/Common/GeneratedCode/Quantities/MolarEntropy.Common.g.cs
index f8af941059..f6771a8171 100644
--- a/Common/GeneratedCode/Quantities/MolarEntropy.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/MolarEntropy.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(MolarEntropy other, MolarEntropy maxError)
         /// <returns>A hash code for the current MolarEntropy.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(MolarEntropy), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/MolarMass.Common.g.cs b/Common/GeneratedCode/Quantities/MolarMass.Common.g.cs
index 3c4d10424a..507843e4a8 100644
--- a/Common/GeneratedCode/Quantities/MolarMass.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/MolarMass.Common.g.cs
@@ -531,7 +531,7 @@ public bool Equals(MolarMass other, MolarMass maxError)
         /// <returns>A hash code for the current MolarMass.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(MolarMass), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Molarity.Common.g.cs b/Common/GeneratedCode/Quantities/Molarity.Common.g.cs
index a5a589a4c4..dc0f223bbc 100644
--- a/Common/GeneratedCode/Quantities/Molarity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Molarity.Common.g.cs
@@ -455,7 +455,7 @@ public bool Equals(Molarity other, Molarity maxError)
         /// <returns>A hash code for the current Molarity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Molarity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Permeability.Common.g.cs b/Common/GeneratedCode/Quantities/Permeability.Common.g.cs
index 5e2f56764a..2126e0357b 100644
--- a/Common/GeneratedCode/Quantities/Permeability.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Permeability.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(Permeability other, Permeability maxError)
         /// <returns>A hash code for the current Permeability.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Permeability), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Permittivity.Common.g.cs b/Common/GeneratedCode/Quantities/Permittivity.Common.g.cs
index 3e1ff4bcb9..46749a560f 100644
--- a/Common/GeneratedCode/Quantities/Permittivity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Permittivity.Common.g.cs
@@ -322,7 +322,7 @@ public bool Equals(Permittivity other, Permittivity maxError)
         /// <returns>A hash code for the current Permittivity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Permittivity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Power.Common.g.cs b/Common/GeneratedCode/Quantities/Power.Common.g.cs
index 24421b01df..146d3f210b 100644
--- a/Common/GeneratedCode/Quantities/Power.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Power.Common.g.cs
@@ -682,7 +682,7 @@ public bool Equals(Power other, Power maxError)
         /// <returns>A hash code for the current Power.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Power), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/PowerDensity.Common.g.cs b/Common/GeneratedCode/Quantities/PowerDensity.Common.g.cs
index 13ff7f06cf..c6473dcfda 100644
--- a/Common/GeneratedCode/Quantities/PowerDensity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/PowerDensity.Common.g.cs
@@ -1139,7 +1139,7 @@ public bool Equals(PowerDensity other, PowerDensity maxError)
         /// <returns>A hash code for the current PowerDensity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(PowerDensity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/PowerRatio.Common.g.cs b/Common/GeneratedCode/Quantities/PowerRatio.Common.g.cs
index 7410b89210..8216e05547 100644
--- a/Common/GeneratedCode/Quantities/PowerRatio.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/PowerRatio.Common.g.cs
@@ -340,7 +340,7 @@ public bool Equals(PowerRatio other, PowerRatio maxError)
         /// <returns>A hash code for the current PowerRatio.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(PowerRatio), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Pressure.Common.g.cs b/Common/GeneratedCode/Quantities/Pressure.Common.g.cs
index b8dae6eb76..215c439ab2 100644
--- a/Common/GeneratedCode/Quantities/Pressure.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Pressure.Common.g.cs
@@ -1084,7 +1084,7 @@ public bool Equals(Pressure other, Pressure maxError)
         /// <returns>A hash code for the current Pressure.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Pressure), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/PressureChangeRate.Common.g.cs b/Common/GeneratedCode/Quantities/PressureChangeRate.Common.g.cs
index e512852ff3..2ef9715f91 100644
--- a/Common/GeneratedCode/Quantities/PressureChangeRate.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/PressureChangeRate.Common.g.cs
@@ -379,7 +379,7 @@ public bool Equals(PressureChangeRate other, PressureChangeRate maxError)
         /// <returns>A hash code for the current PressureChangeRate.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(PressureChangeRate), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Ratio.Common.g.cs b/Common/GeneratedCode/Quantities/Ratio.Common.g.cs
index d25b618e70..83acdd951b 100644
--- a/Common/GeneratedCode/Quantities/Ratio.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Ratio.Common.g.cs
@@ -416,7 +416,7 @@ public bool Equals(Ratio other, Ratio maxError)
         /// <returns>A hash code for the current Ratio.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Ratio), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ReactiveEnergy.Common.g.cs b/Common/GeneratedCode/Quantities/ReactiveEnergy.Common.g.cs
index d84b66a21e..834bb967f5 100644
--- a/Common/GeneratedCode/Quantities/ReactiveEnergy.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ReactiveEnergy.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(ReactiveEnergy other, ReactiveEnergy maxError)
         /// <returns>A hash code for the current ReactiveEnergy.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ReactiveEnergy), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ReactivePower.Common.g.cs b/Common/GeneratedCode/Quantities/ReactivePower.Common.g.cs
index 2ceda5b598..2f8422bf16 100644
--- a/Common/GeneratedCode/Quantities/ReactivePower.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ReactivePower.Common.g.cs
@@ -379,7 +379,7 @@ public bool Equals(ReactivePower other, ReactivePower maxError)
         /// <returns>A hash code for the current ReactivePower.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ReactivePower), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/RotationalAcceleration.Common.g.cs b/Common/GeneratedCode/Quantities/RotationalAcceleration.Common.g.cs
index ecc79c8309..c772fa7334 100644
--- a/Common/GeneratedCode/Quantities/RotationalAcceleration.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/RotationalAcceleration.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(RotationalAcceleration other, RotationalAcceleration maxError
         /// <returns>A hash code for the current RotationalAcceleration.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(RotationalAcceleration), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/RotationalSpeed.Common.g.cs b/Common/GeneratedCode/Quantities/RotationalSpeed.Common.g.cs
index 36103e8ff5..513a2f7812 100644
--- a/Common/GeneratedCode/Quantities/RotationalSpeed.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/RotationalSpeed.Common.g.cs
@@ -550,7 +550,7 @@ public bool Equals(RotationalSpeed other, RotationalSpeed maxError)
         /// <returns>A hash code for the current RotationalSpeed.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(RotationalSpeed), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/RotationalStiffness.Common.g.cs b/Common/GeneratedCode/Quantities/RotationalStiffness.Common.g.cs
index f876c05722..2233ff0d97 100644
--- a/Common/GeneratedCode/Quantities/RotationalStiffness.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/RotationalStiffness.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(RotationalStiffness other, RotationalStiffness maxError)
         /// <returns>A hash code for the current RotationalStiffness.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(RotationalStiffness), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/RotationalStiffnessPerLength.Common.g.cs b/Common/GeneratedCode/Quantities/RotationalStiffnessPerLength.Common.g.cs
index a2bba468f9..db435114f6 100644
--- a/Common/GeneratedCode/Quantities/RotationalStiffnessPerLength.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/RotationalStiffnessPerLength.Common.g.cs
@@ -360,7 +360,7 @@ public bool Equals(RotationalStiffnessPerLength other, RotationalStiffnessPerLen
         /// <returns>A hash code for the current RotationalStiffnessPerLength.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(RotationalStiffnessPerLength), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/SolidAngle.Common.g.cs b/Common/GeneratedCode/Quantities/SolidAngle.Common.g.cs
index c740b0e871..25b08561df 100644
--- a/Common/GeneratedCode/Quantities/SolidAngle.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/SolidAngle.Common.g.cs
@@ -321,7 +321,7 @@ public bool Equals(SolidAngle other, SolidAngle maxError)
         /// <returns>A hash code for the current SolidAngle.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(SolidAngle), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/SpecificEnergy.Common.g.cs b/Common/GeneratedCode/Quantities/SpecificEnergy.Common.g.cs
index 793837c4b0..a9feca8c9a 100644
--- a/Common/GeneratedCode/Quantities/SpecificEnergy.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/SpecificEnergy.Common.g.cs
@@ -455,7 +455,7 @@ public bool Equals(SpecificEnergy other, SpecificEnergy maxError)
         /// <returns>A hash code for the current SpecificEnergy.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(SpecificEnergy), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/SpecificEntropy.Common.g.cs b/Common/GeneratedCode/Quantities/SpecificEntropy.Common.g.cs
index 82c05e4ae7..b796d9cfdf 100644
--- a/Common/GeneratedCode/Quantities/SpecificEntropy.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/SpecificEntropy.Common.g.cs
@@ -455,7 +455,7 @@ public bool Equals(SpecificEntropy other, SpecificEntropy maxError)
         /// <returns>A hash code for the current SpecificEntropy.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(SpecificEntropy), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/SpecificVolume.Common.g.cs b/Common/GeneratedCode/Quantities/SpecificVolume.Common.g.cs
index 7eca216f6c..91328333c9 100644
--- a/Common/GeneratedCode/Quantities/SpecificVolume.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/SpecificVolume.Common.g.cs
@@ -341,7 +341,7 @@ public bool Equals(SpecificVolume other, SpecificVolume maxError)
         /// <returns>A hash code for the current SpecificVolume.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(SpecificVolume), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/SpecificWeight.Common.g.cs b/Common/GeneratedCode/Quantities/SpecificWeight.Common.g.cs
index 5cbdc51bed..691536ec9d 100644
--- a/Common/GeneratedCode/Quantities/SpecificWeight.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/SpecificWeight.Common.g.cs
@@ -626,7 +626,7 @@ public bool Equals(SpecificWeight other, SpecificWeight maxError)
         /// <returns>A hash code for the current SpecificWeight.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(SpecificWeight), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Speed.Common.g.cs b/Common/GeneratedCode/Quantities/Speed.Common.g.cs
index 965f41f5e6..2e23388506 100644
--- a/Common/GeneratedCode/Quantities/Speed.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Speed.Common.g.cs
@@ -911,7 +911,7 @@ public bool Equals(Speed other, Speed maxError)
         /// <returns>A hash code for the current Speed.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Speed), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Temperature.Common.g.cs b/Common/GeneratedCode/Quantities/Temperature.Common.g.cs
index 359d34c6e3..55e6a2636d 100644
--- a/Common/GeneratedCode/Quantities/Temperature.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Temperature.Common.g.cs
@@ -455,7 +455,7 @@ public bool Equals(Temperature other, Temperature maxError)
         /// <returns>A hash code for the current Temperature.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Temperature), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/TemperatureChangeRate.Common.g.cs b/Common/GeneratedCode/Quantities/TemperatureChangeRate.Common.g.cs
index 4ff17cca4f..e5cb82a96e 100644
--- a/Common/GeneratedCode/Quantities/TemperatureChangeRate.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/TemperatureChangeRate.Common.g.cs
@@ -493,7 +493,7 @@ public bool Equals(TemperatureChangeRate other, TemperatureChangeRate maxError)
         /// <returns>A hash code for the current TemperatureChangeRate.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(TemperatureChangeRate), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/TemperatureDelta.Common.g.cs b/Common/GeneratedCode/Quantities/TemperatureDelta.Common.g.cs
index e8550789c0..074579d050 100644
--- a/Common/GeneratedCode/Quantities/TemperatureDelta.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/TemperatureDelta.Common.g.cs
@@ -622,7 +622,7 @@ public bool Equals(TemperatureDelta other, TemperatureDelta maxError)
         /// <returns>A hash code for the current TemperatureDelta.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(TemperatureDelta), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ThermalConductivity.Common.g.cs b/Common/GeneratedCode/Quantities/ThermalConductivity.Common.g.cs
index 1c2ef610f4..111108a66c 100644
--- a/Common/GeneratedCode/Quantities/ThermalConductivity.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ThermalConductivity.Common.g.cs
@@ -341,7 +341,7 @@ public bool Equals(ThermalConductivity other, ThermalConductivity maxError)
         /// <returns>A hash code for the current ThermalConductivity.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ThermalConductivity), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/ThermalResistance.Common.g.cs b/Common/GeneratedCode/Quantities/ThermalResistance.Common.g.cs
index 4334da12cc..fefd9a6991 100644
--- a/Common/GeneratedCode/Quantities/ThermalResistance.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/ThermalResistance.Common.g.cs
@@ -398,7 +398,7 @@ public bool Equals(ThermalResistance other, ThermalResistance maxError)
         /// <returns>A hash code for the current ThermalResistance.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(ThermalResistance), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Torque.Common.g.cs b/Common/GeneratedCode/Quantities/Torque.Common.g.cs
index c5d451a342..cd6c2d4f81 100644
--- a/Common/GeneratedCode/Quantities/Torque.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Torque.Common.g.cs
@@ -702,7 +702,7 @@ public bool Equals(Torque other, Torque maxError)
         /// <returns>A hash code for the current Torque.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Torque), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/VitaminA.Common.g.cs b/Common/GeneratedCode/Quantities/VitaminA.Common.g.cs
index f982df818c..4d74b10761 100644
--- a/Common/GeneratedCode/Quantities/VitaminA.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/VitaminA.Common.g.cs
@@ -321,7 +321,7 @@ public bool Equals(VitaminA other, VitaminA maxError)
         /// <returns>A hash code for the current VitaminA.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(VitaminA), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/Volume.Common.g.cs b/Common/GeneratedCode/Quantities/Volume.Common.g.cs
index ef358c635e..fa1dc88fc3 100644
--- a/Common/GeneratedCode/Quantities/Volume.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/Volume.Common.g.cs
@@ -1143,7 +1143,7 @@ public bool Equals(Volume other, Volume maxError)
         /// <returns>A hash code for the current Volume.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(Volume), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs b/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs
index db1e565585..32ee3b5621 100644
--- a/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs
+++ b/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs
@@ -797,7 +797,7 @@ public bool Equals(VolumeFlow other, VolumeFlow maxError)
         /// <returns>A hash code for the current VolumeFlow.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof(VolumeFlow), Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.Tests/QuantityTests.cs b/UnitsNet.Tests/QuantityTests.cs
new file mode 100644
index 0000000000..cec7093e68
--- /dev/null
+++ b/UnitsNet.Tests/QuantityTests.cs
@@ -0,0 +1,38 @@
+// Copyright (c) 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com).
+// https://github.com/angularsen/UnitsNet
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using UnitsNet.Units;
+using Xunit;
+
+namespace UnitsNet.Tests
+{
+    public partial class QuantityTests
+    {
+        [Fact]
+        public void GetHashCodeForDifferentQuantitiesWithSameValuesAreNotEqual()
+        {
+            var length = new Length( 1.0, (LengthUnit)2 );
+            var area = new Area( 1.0, (AreaUnit)2 );
+
+            Assert.NotEqual( length.GetHashCode(), area.GetHashCode() );
+        }
+    }
+}
diff --git a/UnitsNet/Scripts/Include-GenerateQuantitySourceCodeCommon.ps1 b/UnitsNet/Scripts/Include-GenerateQuantitySourceCodeCommon.ps1
index 765955f3fd..5ef2055405 100644
--- a/UnitsNet/Scripts/Include-GenerateQuantitySourceCodeCommon.ps1
+++ b/UnitsNet/Scripts/Include-GenerateQuantitySourceCodeCommon.ps1
@@ -395,7 +395,7 @@ if ($obsoleteAttribute)
         /// <returns>A hash code for the current $quantityName.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { type = typeof($quantityName), Value, Unit }.GetHashCode();
         }
 
         #endregion