diff --git a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
index dfaa53af3d..09bf734e78 100644
--- a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
+++ b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
@@ -60,10 +60,10 @@ namespace UnitsNet
     /// </remarks>");
 
             Writer.WLIfText(1, GetObsoleteAttributeOrNull(_quantity));
-            Writer.WL(@$"
+            Writer.W(@$"
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct {_quantity.Name} :");
+    public readonly partial struct {_quantity.Name}");
             GenerateInterfaceExtensions();
 
             Writer.WL($@"
@@ -103,33 +103,26 @@ namespace UnitsNet
 
         private void GenerateInterfaceExtensions()
         {
-            // generate the base interface (either IVectorQuantity, IAffineQuantity or ILogarithmicQuantity)
+            Writer.W($" : IQuantity<{_quantity.Name}, {_unitEnumName}>, ");
+
+            // generate ILogarithmicQuantity, IAffineQuantity or ILinearQuantity
             if (_quantity.Logarithmic)
             {
-                Writer.WL(@$"
-        ILogarithmicQuantity<{_quantity.Name}, {_unitEnumName}>,");
+                Writer.WL($"ILogarithmicQuantity<{_quantity.Name}>");
             }
             else if (!string.IsNullOrEmpty(_quantity.AffineOffsetType))
             {
-                Writer.WL(@$"
-        IAffineQuantity<{_quantity.Name}, {_unitEnumName}, {_quantity.AffineOffsetType}>,");
+                Writer.WL($"IAffineQuantity<{_quantity.Name}, {_quantity.AffineOffsetType}>");
             }
-            else // the default quantity type implements the IVectorQuantity interface
+            else // the default quantity type implements the ILinearQuantity interface
             {
-                Writer.WL(@$"
-        IArithmeticQuantity<{_quantity.Name}, {_unitEnumName}>,");
-            }
-
-            Writer.WL(@"
-#if NET7_0_OR_GREATER");
-            if (!_quantity.IsAffine)
-            {
-                Writer.WL($@"
-        IDivisionOperators<{_quantity.Name}, {_quantity.Name}, double>,");
+                Writer.WL($"ILinearQuantity<{_quantity.Name}>");
             }
 
             if (_quantity.Relations.Any(r => r.Operator is "*" or "/"))
             {
+                Writer.WL(@"
+#if NET7_0_OR_GREATER");
                 foreach (QuantityRelation relation in _quantity.Relations)
                 {
                     if (relation.LeftQuantity != _quantity) continue;
@@ -137,28 +130,20 @@ private void GenerateInterfaceExtensions()
                     {
                         case "*":
                             Writer.W(@"
-        IMultiplyOperators");
+        , IMultiplyOperators");
                             break;
                         case "/":
                             Writer.W(@"
-        IDivisionOperators");
+        , IDivisionOperators");
                             break;
                         default:
                             continue;
                     }
-
-                    Writer.WL($"<{relation.LeftQuantity.Name}, {relation.RightQuantity.Name}, {relation.ResultQuantity.Name}>,");
+                    Writer.WL($"<{relation.LeftQuantity.Name}, {relation.RightQuantity.Name}, {relation.ResultQuantity.Name}>");
                 }
+                Writer.WL(@$"
+#endif");
             }
-
-            Writer.WL(@$"
-        IComparisonOperators<{_quantity.Name}, {_quantity.Name}, bool>,
-        IParsable<{_quantity.Name}>,
-#endif
-        IComparable,
-        IComparable<{_quantity.Name}>,
-        IEquatable<{_quantity.Name}>,
-        IFormattable");
         }
 
         private void GenerateQuantityInfo()
diff --git a/UnitsNet.Tests/CustomQuantities/HowMuch.cs b/UnitsNet.Tests/CustomQuantities/HowMuch.cs
index 7a59f20a8d..c6485a65d9 100644
--- a/UnitsNet.Tests/CustomQuantities/HowMuch.cs
+++ b/UnitsNet.Tests/CustomQuantities/HowMuch.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using UnitsNet.Units;
 
 namespace UnitsNet.Tests.CustomQuantities
@@ -100,6 +101,118 @@ QuantityInfo IQuantity.QuantityInfo
 
         Enum IQuantity.Unit => Unit;
 #endif
+
+        #endregion
+
+
+        #region Equality / IComparable
+
+        /// <summary>Returns true if less or equal to.</summary>
+        public static bool operator <=(HowMuch left, HowMuch right)
+        {
+            return left.Value <= right.ToUnit(left.Unit).Value;
+        }
+
+        /// <summary>Returns true if greater than or equal to.</summary>
+        public static bool operator >=(HowMuch left, HowMuch right)
+        {
+            return left.Value >= right.ToUnit(left.Unit).Value;
+        }
+
+        /// <summary>Returns true if less than.</summary>
+        public static bool operator <(HowMuch left, HowMuch right)
+        {
+            return left.Value < right.ToUnit(left.Unit).Value;
+        }
+
+        /// <summary>Returns true if greater than.</summary>
+        public static bool operator >(HowMuch left, HowMuch right)
+        {
+            return left.Value > right.ToUnit(left.Unit).Value;
+        }
+
+        // We use obsolete attribute to communicate the preferred equality members to use.
+        // CS0809: Obsolete member 'memberA' overrides non-obsolete member 'memberB'.
+#pragma warning disable CS0809
+
+        /// <summary>Indicates strict equality of two <see cref="HowMuch"/> quantities, where both <see cref="Value" /> and <see cref="Unit" /> are exactly equal.</summary>
+        [Obsolete(
+            "For null checks, use `x is null` syntax to not invoke overloads. For equality checks, use Equals(HowMuch other, HowMuch tolerance) instead, to check equality across units and to specify the max tolerance for rounding errors due to floating-point arithmetic when converting between units.")]
+        public static bool operator ==(HowMuch left, HowMuch right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>Indicates strict inequality of two <see cref="HowMuch"/> quantities, where both <see cref="Value" /> and <see cref="Unit" /> are exactly equal.</summary>
+        [Obsolete(
+            "For null checks, use `x is null` syntax to not invoke overloads. For equality checks, use Equals(HowMuch other, HowMuch tolerance) instead, to check equality across units and to specify the max tolerance for rounding errors due to floating-point arithmetic when converting between units.")]
+        public static bool operator !=(HowMuch left, HowMuch right)
+        {
+            return !(left == right);
+        }
+
+        /// <inheritdoc />
+        /// <summary>Indicates strict equality of two <see cref="HowMuch"/> quantities, where both <see cref="Value" /> and <see cref="Unit" /> are exactly equal.</summary>
+        [Obsolete(
+            "Use Equals(HowMuch other, HowMuch tolerance) instead, to check equality across units and to specify the max tolerance for rounding errors due to floating-point arithmetic when converting between units.")]
+        public override bool Equals(object? obj)
+        {
+            if (obj is null || !(obj is HowMuch otherQuantity))
+                return false;
+
+            return Equals(otherQuantity);
+        }
+
+        /// <inheritdoc />
+        /// <summary>Indicates strict equality of two <see cref="HowMuch"/> quantities, where both <see cref="Value" /> and <see cref="Unit" /> are exactly equal.</summary>
+        [Obsolete(
+            "Use Equals(HowMuch other, HowMuch tolerance) instead, to check equality across units and to specify the max tolerance for rounding errors due to floating-point arithmetic when converting between units.")]
+        public bool Equals(HowMuch other)
+        {
+            return new { Value, Unit }.Equals(new { other.Value, other.Unit });
+        }
+
+#pragma warning restore CS0809
+
+        public override int GetHashCode()
+        {
+            return Comparison.GetHashCode(Unit, Value);
+        }
+
+        public int CompareTo(object? obj)
+        {
+            if (obj is null) throw new ArgumentNullException(nameof(obj));
+            if (!(obj is HowMuch otherQuantity)) throw new ArgumentException("Expected type HowMuch.", nameof(obj));
+
+            return CompareTo(otherQuantity);
+        }
+
+        public int CompareTo(HowMuch other)
+        {
+            return Value.CompareTo(other.ToUnit(Unit).Value);
+        }
+
+        #endregion
+
+        #region IParsable
+
+        public static HowMuch Parse(string str, IFormatProvider? provider)
+        {
+            return UnitsNetSetup.Default.QuantityParser.Parse<HowMuch, HowMuchUnit>(
+                str,
+                provider,
+                From);
+        }
+
+        public static bool TryParse([NotNullWhen(true)] string? str, IFormatProvider? provider, out HowMuch result)
+        {
+            return UnitsNetSetup.Default.QuantityParser.TryParse<HowMuch, HowMuchUnit>(
+                str,
+                provider,
+                From,
+                out result);
+        }
+
         #endregion
     }
 }
diff --git a/UnitsNet/Extensions/LogarithmicQuantityExtensions.cs b/UnitsNet/Extensions/LogarithmicQuantityExtensions.cs
index 7f28720e05..af0f90853c 100644
--- a/UnitsNet/Extensions/LogarithmicQuantityExtensions.cs
+++ b/UnitsNet/Extensions/LogarithmicQuantityExtensions.cs
@@ -176,7 +176,7 @@ public static TQuantity Sum<TSource, TQuantity>(this IEnumerable<TSource> source
     ///     logarithmic space.
     /// </remarks>
     public static TQuantity Sum<TQuantity, TUnit>(this IEnumerable<TQuantity> quantities, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         if (quantities is null)
@@ -224,7 +224,7 @@ public static TQuantity Sum<TQuantity, TUnit>(this IEnumerable<TQuantity> quanti
     ///     logarithmic space.
     /// </remarks>
     public static TQuantity Sum<TSource, TQuantity, TUnit>(this IEnumerable<TSource> source, Func<TSource, TQuantity> selector, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         return source.Select(selector).Sum(targetUnit);
@@ -312,7 +312,7 @@ public static TQuantity ArithmeticMean<TSource, TQuantity>(this IEnumerable<TSou
     ///     averaged, and then the result is converted back to logarithmic space using the same unit.
     /// </remarks>
     public static TQuantity ArithmeticMean<TQuantity, TUnit>(this IEnumerable<TQuantity> quantities, TUnit unit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         if (quantities is null)
@@ -363,7 +363,7 @@ public static TQuantity ArithmeticMean<TQuantity, TUnit>(this IEnumerable<TQuant
     ///     averaged, and then the result is converted back to logarithmic space using the same unit.
     /// </remarks>
     public static TQuantity ArithmeticMean<TSource, TQuantity, TUnit>(this IEnumerable<TSource> source, Func<TSource, TQuantity> selector, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         return ArithmeticMean(source.Select(selector), targetUnit);
@@ -448,7 +448,7 @@ public static TQuantity GeometricMean<TSource, TQuantity>(this IEnumerable<TSour
     ///     logarithmic quantities is equal to the sum the values, converted in unit of the first element.
     /// </remarks>
     public static TQuantity GeometricMean<TQuantity, TUnit>(this IEnumerable<TQuantity> quantities, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         if (quantities is null)
@@ -494,7 +494,7 @@ public static TQuantity GeometricMean<TQuantity, TUnit>(this IEnumerable<TQuanti
     ///     logarithmic quantities is equal to the sum the values, converted in unit of the first element.
     /// </remarks>
     public static TQuantity GeometricMean<TSource, TQuantity, TUnit>(this IEnumerable<TSource> source, Func<TSource, TQuantity> selector, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         return source.Select(selector).GeometricMean(targetUnit);
diff --git a/UnitsNet/GeneratedCode/Quantities/AbsorbedDoseOfIonizingRadiation.g.cs b/UnitsNet/GeneratedCode/Quantities/AbsorbedDoseOfIonizingRadiation.g.cs
index d9f4ac2066..521cf9d4ee 100644
--- a/UnitsNet/GeneratedCode/Quantities/AbsorbedDoseOfIonizingRadiation.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AbsorbedDoseOfIonizingRadiation.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct AbsorbedDoseOfIonizingRadiation :
-        IArithmeticQuantity<AbsorbedDoseOfIonizingRadiation, AbsorbedDoseOfIonizingRadiationUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<AbsorbedDoseOfIonizingRadiation, AbsorbedDoseOfIonizingRadiation, double>,
-        IComparisonOperators<AbsorbedDoseOfIonizingRadiation, AbsorbedDoseOfIonizingRadiation, bool>,
-        IParsable<AbsorbedDoseOfIonizingRadiation>,
-#endif
-        IComparable,
-        IComparable<AbsorbedDoseOfIonizingRadiation>,
-        IEquatable<AbsorbedDoseOfIonizingRadiation>,
-        IFormattable
+    public readonly partial struct AbsorbedDoseOfIonizingRadiation : IQuantity<AbsorbedDoseOfIonizingRadiation, AbsorbedDoseOfIonizingRadiationUnit>, ILinearQuantity<AbsorbedDoseOfIonizingRadiation>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs
index 83b6c6add3..c6449c20ca 100644
--- a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs
@@ -36,22 +36,14 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Acceleration :
-        IArithmeticQuantity<Acceleration, AccelerationUnit>,
+    public readonly partial struct Acceleration : IQuantity<Acceleration, AccelerationUnit>, ILinearQuantity<Acceleration>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Acceleration, Acceleration, double>,
-        IDivisionOperators<Acceleration, Jerk, Duration>,
-        IMultiplyOperators<Acceleration, Mass, Force>,
-        IDivisionOperators<Acceleration, Duration, Jerk>,
-        IMultiplyOperators<Acceleration, Density, SpecificWeight>,
-        IMultiplyOperators<Acceleration, Duration, Speed>,
-        IComparisonOperators<Acceleration, Acceleration, bool>,
-        IParsable<Acceleration>,
+        , IDivisionOperators<Acceleration, Jerk, Duration>
+        , IMultiplyOperators<Acceleration, Mass, Force>
+        , IDivisionOperators<Acceleration, Duration, Jerk>
+        , IMultiplyOperators<Acceleration, Density, SpecificWeight>
+        , IMultiplyOperators<Acceleration, Duration, Speed>
 #endif
-        IComparable,
-        IComparable<Acceleration>,
-        IEquatable<Acceleration>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs b/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs
index 939a52084e..ba82b3828a 100644
--- a/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs
@@ -36,23 +36,15 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct AmountOfSubstance :
-        IArithmeticQuantity<AmountOfSubstance, AmountOfSubstanceUnit>,
+    public readonly partial struct AmountOfSubstance : IQuantity<AmountOfSubstance, AmountOfSubstanceUnit>, ILinearQuantity<AmountOfSubstance>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<AmountOfSubstance, AmountOfSubstance, double>,
-        IDivisionOperators<AmountOfSubstance, MolarFlow, Duration>,
-        IMultiplyOperators<AmountOfSubstance, MolarEnergy, Energy>,
-        IMultiplyOperators<AmountOfSubstance, MolarMass, Mass>,
-        IDivisionOperators<AmountOfSubstance, Duration, MolarFlow>,
-        IDivisionOperators<AmountOfSubstance, Volume, Molarity>,
-        IDivisionOperators<AmountOfSubstance, Molarity, Volume>,
-        IComparisonOperators<AmountOfSubstance, AmountOfSubstance, bool>,
-        IParsable<AmountOfSubstance>,
+        , IDivisionOperators<AmountOfSubstance, MolarFlow, Duration>
+        , IMultiplyOperators<AmountOfSubstance, MolarEnergy, Energy>
+        , IMultiplyOperators<AmountOfSubstance, MolarMass, Mass>
+        , IDivisionOperators<AmountOfSubstance, Duration, MolarFlow>
+        , IDivisionOperators<AmountOfSubstance, Volume, Molarity>
+        , IDivisionOperators<AmountOfSubstance, Molarity, Volume>
 #endif
-        IComparable,
-        IComparable<AmountOfSubstance>,
-        IEquatable<AmountOfSubstance>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs b/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs
index 0db3066f16..e8a32d0748 100644
--- a/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct AmplitudeRatio :
-        ILogarithmicQuantity<AmplitudeRatio, AmplitudeRatioUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<AmplitudeRatio, AmplitudeRatio, double>,
-        IComparisonOperators<AmplitudeRatio, AmplitudeRatio, bool>,
-        IParsable<AmplitudeRatio>,
-#endif
-        IComparable,
-        IComparable<AmplitudeRatio>,
-        IEquatable<AmplitudeRatio>,
-        IFormattable
+    public readonly partial struct AmplitudeRatio : IQuantity<AmplitudeRatio, AmplitudeRatioUnit>, ILogarithmicQuantity<AmplitudeRatio>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Angle.g.cs b/UnitsNet/GeneratedCode/Quantities/Angle.g.cs
index bb2822e031..4b17cc43f3 100644
--- a/UnitsNet/GeneratedCode/Quantities/Angle.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Angle.g.cs
@@ -36,20 +36,12 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Angle :
-        IArithmeticQuantity<Angle, AngleUnit>,
+    public readonly partial struct Angle : IQuantity<Angle, AngleUnit>, ILinearQuantity<Angle>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Angle, Angle, double>,
-        IDivisionOperators<Angle, RotationalSpeed, Duration>,
-        IDivisionOperators<Angle, Duration, RotationalSpeed>,
-        IMultiplyOperators<Angle, RotationalStiffness, Torque>,
-        IComparisonOperators<Angle, Angle, bool>,
-        IParsable<Angle>,
+        , IDivisionOperators<Angle, RotationalSpeed, Duration>
+        , IDivisionOperators<Angle, Duration, RotationalSpeed>
+        , IMultiplyOperators<Angle, RotationalStiffness, Torque>
 #endif
-        IComparable,
-        IComparable<Angle>,
-        IEquatable<Angle>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Area.g.cs b/UnitsNet/GeneratedCode/Quantities/Area.g.cs
index 971074a1b1..bd07281614 100644
--- a/UnitsNet/GeneratedCode/Quantities/Area.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Area.g.cs
@@ -36,33 +36,25 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Area :
-        IArithmeticQuantity<Area, AreaUnit>,
+    public readonly partial struct Area : IQuantity<Area, AreaUnit>, ILinearQuantity<Area>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Area, Area, double>,
-        IMultiplyOperators<Area, Pressure, Force>,
-        IMultiplyOperators<Area, SpecificWeight, ForcePerLength>,
-        IMultiplyOperators<Area, ReciprocalLength, Length>,
-        IDivisionOperators<Area, Length, Length>,
-        IMultiplyOperators<Area, Density, LinearDensity>,
-        IMultiplyOperators<Area, Illuminance, LuminousFlux>,
-        IMultiplyOperators<Area, Luminance, LuminousIntensity>,
-        IMultiplyOperators<Area, AreaDensity, Mass>,
-        IMultiplyOperators<Area, MassFlux, MassFlow>,
-        IMultiplyOperators<Area, HeatFlux, Power>,
-        IMultiplyOperators<Area, ReciprocalArea, Ratio>,
-        IDivisionOperators<Area, Volume, ReciprocalLength>,
-        IMultiplyOperators<Area, ForcePerLength, Torque>,
-        IMultiplyOperators<Area, Length, Volume>,
-        IDivisionOperators<Area, ReciprocalLength, Volume>,
-        IMultiplyOperators<Area, Speed, VolumeFlow>,
-        IComparisonOperators<Area, Area, bool>,
-        IParsable<Area>,
+        , IMultiplyOperators<Area, Pressure, Force>
+        , IMultiplyOperators<Area, SpecificWeight, ForcePerLength>
+        , IMultiplyOperators<Area, ReciprocalLength, Length>
+        , IDivisionOperators<Area, Length, Length>
+        , IMultiplyOperators<Area, Density, LinearDensity>
+        , IMultiplyOperators<Area, Illuminance, LuminousFlux>
+        , IMultiplyOperators<Area, Luminance, LuminousIntensity>
+        , IMultiplyOperators<Area, AreaDensity, Mass>
+        , IMultiplyOperators<Area, MassFlux, MassFlow>
+        , IMultiplyOperators<Area, HeatFlux, Power>
+        , IMultiplyOperators<Area, ReciprocalArea, Ratio>
+        , IDivisionOperators<Area, Volume, ReciprocalLength>
+        , IMultiplyOperators<Area, ForcePerLength, Torque>
+        , IMultiplyOperators<Area, Length, Volume>
+        , IDivisionOperators<Area, ReciprocalLength, Volume>
+        , IMultiplyOperators<Area, Speed, VolumeFlow>
 #endif
-        IComparable,
-        IComparable<Area>,
-        IEquatable<Area>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs
index 2b662909c4..760f8151b6 100644
--- a/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct AreaDensity :
-        IArithmeticQuantity<AreaDensity, AreaDensityUnit>,
+    public readonly partial struct AreaDensity : IQuantity<AreaDensity, AreaDensityUnit>, ILinearQuantity<AreaDensity>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<AreaDensity, AreaDensity, double>,
-        IMultiplyOperators<AreaDensity, Area, Mass>,
-        IComparisonOperators<AreaDensity, AreaDensity, bool>,
-        IParsable<AreaDensity>,
+        , IMultiplyOperators<AreaDensity, Area, Mass>
 #endif
-        IComparable,
-        IComparable<AreaDensity>,
-        IEquatable<AreaDensity>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
index 77fd67fa9f..f2d526aa0a 100644
--- a/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
@@ -36,19 +36,11 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct AreaMomentOfInertia :
-        IArithmeticQuantity<AreaMomentOfInertia, AreaMomentOfInertiaUnit>,
+    public readonly partial struct AreaMomentOfInertia : IQuantity<AreaMomentOfInertia, AreaMomentOfInertiaUnit>, ILinearQuantity<AreaMomentOfInertia>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<AreaMomentOfInertia, AreaMomentOfInertia, double>,
-        IDivisionOperators<AreaMomentOfInertia, Volume, Length>,
-        IDivisionOperators<AreaMomentOfInertia, Length, Volume>,
-        IComparisonOperators<AreaMomentOfInertia, AreaMomentOfInertia, bool>,
-        IParsable<AreaMomentOfInertia>,
+        , IDivisionOperators<AreaMomentOfInertia, Volume, Length>
+        , IDivisionOperators<AreaMomentOfInertia, Length, Volume>
 #endif
-        IComparable,
-        IComparable<AreaMomentOfInertia>,
-        IEquatable<AreaMomentOfInertia>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs b/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs
index ef08cdfb3d..b14102381e 100644
--- a/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct BitRate :
-        IArithmeticQuantity<BitRate, BitRateUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<BitRate, BitRate, double>,
-        IComparisonOperators<BitRate, BitRate, bool>,
-        IParsable<BitRate>,
-#endif
-        IComparable,
-        IComparable<BitRate>,
-        IEquatable<BitRate>,
-        IFormattable
+    public readonly partial struct BitRate : IQuantity<BitRate, BitRateUnit>, ILinearQuantity<BitRate>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs b/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
index fc7b253fa6..79d072afca 100644
--- a/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
@@ -36,19 +36,11 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct BrakeSpecificFuelConsumption :
-        IArithmeticQuantity<BrakeSpecificFuelConsumption, BrakeSpecificFuelConsumptionUnit>,
+    public readonly partial struct BrakeSpecificFuelConsumption : IQuantity<BrakeSpecificFuelConsumption, BrakeSpecificFuelConsumptionUnit>, ILinearQuantity<BrakeSpecificFuelConsumption>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<BrakeSpecificFuelConsumption, BrakeSpecificFuelConsumption, double>,
-        IMultiplyOperators<BrakeSpecificFuelConsumption, Power, MassFlow>,
-        IMultiplyOperators<BrakeSpecificFuelConsumption, SpecificEnergy, double>,
-        IComparisonOperators<BrakeSpecificFuelConsumption, BrakeSpecificFuelConsumption, bool>,
-        IParsable<BrakeSpecificFuelConsumption>,
+        , IMultiplyOperators<BrakeSpecificFuelConsumption, Power, MassFlow>
+        , IMultiplyOperators<BrakeSpecificFuelConsumption, SpecificEnergy, double>
 #endif
-        IComparable,
-        IComparable<BrakeSpecificFuelConsumption>,
-        IEquatable<BrakeSpecificFuelConsumption>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs b/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
index 25671ba248..3fc937a95c 100644
--- a/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct CoefficientOfThermalExpansion :
-        IArithmeticQuantity<CoefficientOfThermalExpansion, CoefficientOfThermalExpansionUnit>,
+    public readonly partial struct CoefficientOfThermalExpansion : IQuantity<CoefficientOfThermalExpansion, CoefficientOfThermalExpansionUnit>, ILinearQuantity<CoefficientOfThermalExpansion>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<CoefficientOfThermalExpansion, CoefficientOfThermalExpansion, double>,
-        IMultiplyOperators<CoefficientOfThermalExpansion, TemperatureDelta, Ratio>,
-        IComparisonOperators<CoefficientOfThermalExpansion, CoefficientOfThermalExpansion, bool>,
-        IParsable<CoefficientOfThermalExpansion>,
+        , IMultiplyOperators<CoefficientOfThermalExpansion, TemperatureDelta, Ratio>
 #endif
-        IComparable,
-        IComparable<CoefficientOfThermalExpansion>,
-        IEquatable<CoefficientOfThermalExpansion>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Compressibility.g.cs b/UnitsNet/GeneratedCode/Quantities/Compressibility.g.cs
index 6aafee49bf..e816f03eaf 100644
--- a/UnitsNet/GeneratedCode/Quantities/Compressibility.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Compressibility.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Compressibility :
-        IArithmeticQuantity<Compressibility, CompressibilityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Compressibility, Compressibility, double>,
-        IComparisonOperators<Compressibility, Compressibility, bool>,
-        IParsable<Compressibility>,
-#endif
-        IComparable,
-        IComparable<Compressibility>,
-        IEquatable<Compressibility>,
-        IFormattable
+    public readonly partial struct Compressibility : IQuantity<Compressibility, CompressibilityUnit>, ILinearQuantity<Compressibility>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Density.g.cs b/UnitsNet/GeneratedCode/Quantities/Density.g.cs
index 43aa68b621..bbe670f0e9 100644
--- a/UnitsNet/GeneratedCode/Quantities/Density.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Density.g.cs
@@ -39,24 +39,16 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Density :
-        IArithmeticQuantity<Density, DensityUnit>,
+    public readonly partial struct Density : IQuantity<Density, DensityUnit>, ILinearQuantity<Density>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Density, Density, double>,
-        IMultiplyOperators<Density, KinematicViscosity, DynamicViscosity>,
-        IMultiplyOperators<Density, Area, LinearDensity>,
-        IMultiplyOperators<Density, Volume, Mass>,
-        IMultiplyOperators<Density, VolumeConcentration, MassConcentration>,
-        IMultiplyOperators<Density, VolumeFlow, MassFlow>,
-        IMultiplyOperators<Density, Speed, MassFlux>,
-        IMultiplyOperators<Density, Acceleration, SpecificWeight>,
-        IComparisonOperators<Density, Density, bool>,
-        IParsable<Density>,
+        , IMultiplyOperators<Density, KinematicViscosity, DynamicViscosity>
+        , IMultiplyOperators<Density, Area, LinearDensity>
+        , IMultiplyOperators<Density, Volume, Mass>
+        , IMultiplyOperators<Density, VolumeConcentration, MassConcentration>
+        , IMultiplyOperators<Density, VolumeFlow, MassFlow>
+        , IMultiplyOperators<Density, Speed, MassFlux>
+        , IMultiplyOperators<Density, Acceleration, SpecificWeight>
 #endif
-        IComparable,
-        IComparable<Density>,
-        IEquatable<Density>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/DoseAreaProduct.g.cs b/UnitsNet/GeneratedCode/Quantities/DoseAreaProduct.g.cs
index d2ee657131..84fefaf708 100644
--- a/UnitsNet/GeneratedCode/Quantities/DoseAreaProduct.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/DoseAreaProduct.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct DoseAreaProduct :
-        IArithmeticQuantity<DoseAreaProduct, DoseAreaProductUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<DoseAreaProduct, DoseAreaProduct, double>,
-        IComparisonOperators<DoseAreaProduct, DoseAreaProduct, bool>,
-        IParsable<DoseAreaProduct>,
-#endif
-        IComparable,
-        IComparable<DoseAreaProduct>,
-        IEquatable<DoseAreaProduct>,
-        IFormattable
+    public readonly partial struct DoseAreaProduct : IQuantity<DoseAreaProduct, DoseAreaProductUnit>, ILinearQuantity<DoseAreaProduct>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Duration.g.cs b/UnitsNet/GeneratedCode/Quantities/Duration.g.cs
index 53509ba4eb..baa75f13f6 100644
--- a/UnitsNet/GeneratedCode/Quantities/Duration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Duration.g.cs
@@ -36,32 +36,24 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Duration :
-        IArithmeticQuantity<Duration, DurationUnit>,
+    public readonly partial struct Duration : IQuantity<Duration, DurationUnit>, ILinearQuantity<Duration>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Duration, Duration, double>,
-        IMultiplyOperators<Duration, Jerk, Acceleration>,
-        IMultiplyOperators<Duration, MolarFlow, AmountOfSubstance>,
-        IMultiplyOperators<Duration, RotationalSpeed, Angle>,
-        IMultiplyOperators<Duration, KinematicViscosity, Area>,
-        IMultiplyOperators<Duration, ElectricCurrent, ElectricCharge>,
-        IMultiplyOperators<Duration, ElectricCurrentGradient, ElectricCurrent>,
-        IMultiplyOperators<Duration, Power, Energy>,
-        IMultiplyOperators<Duration, ForceChangeRate, Force>,
-        IMultiplyOperators<Duration, Speed, Length>,
-        IMultiplyOperators<Duration, MassFlow, Mass>,
-        IMultiplyOperators<Duration, PressureChangeRate, Pressure>,
-        IMultiplyOperators<Duration, RadiationEquivalentDoseRate, RadiationEquivalentDose>,
-        IMultiplyOperators<Duration, Acceleration, Speed>,
-        IMultiplyOperators<Duration, TemperatureChangeRate, TemperatureDelta>,
-        IMultiplyOperators<Duration, VolumeFlow, Volume>,
-        IComparisonOperators<Duration, Duration, bool>,
-        IParsable<Duration>,
+        , IMultiplyOperators<Duration, Jerk, Acceleration>
+        , IMultiplyOperators<Duration, MolarFlow, AmountOfSubstance>
+        , IMultiplyOperators<Duration, RotationalSpeed, Angle>
+        , IMultiplyOperators<Duration, KinematicViscosity, Area>
+        , IMultiplyOperators<Duration, ElectricCurrent, ElectricCharge>
+        , IMultiplyOperators<Duration, ElectricCurrentGradient, ElectricCurrent>
+        , IMultiplyOperators<Duration, Power, Energy>
+        , IMultiplyOperators<Duration, ForceChangeRate, Force>
+        , IMultiplyOperators<Duration, Speed, Length>
+        , IMultiplyOperators<Duration, MassFlow, Mass>
+        , IMultiplyOperators<Duration, PressureChangeRate, Pressure>
+        , IMultiplyOperators<Duration, RadiationEquivalentDoseRate, RadiationEquivalentDose>
+        , IMultiplyOperators<Duration, Acceleration, Speed>
+        , IMultiplyOperators<Duration, TemperatureChangeRate, TemperatureDelta>
+        , IMultiplyOperators<Duration, VolumeFlow, Volume>
 #endif
-        IComparable,
-        IComparable<Duration>,
-        IEquatable<Duration>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs b/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs
index 7f0bc8028f..c5e6b6c601 100644
--- a/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs
@@ -39,19 +39,11 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct DynamicViscosity :
-        IArithmeticQuantity<DynamicViscosity, DynamicViscosityUnit>,
+    public readonly partial struct DynamicViscosity : IQuantity<DynamicViscosity, DynamicViscosityUnit>, ILinearQuantity<DynamicViscosity>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<DynamicViscosity, DynamicViscosity, double>,
-        IDivisionOperators<DynamicViscosity, KinematicViscosity, Density>,
-        IDivisionOperators<DynamicViscosity, Density, KinematicViscosity>,
-        IComparisonOperators<DynamicViscosity, DynamicViscosity, bool>,
-        IParsable<DynamicViscosity>,
+        , IDivisionOperators<DynamicViscosity, KinematicViscosity, Density>
+        , IDivisionOperators<DynamicViscosity, Density, KinematicViscosity>
 #endif
-        IComparable,
-        IComparable<DynamicViscosity>,
-        IEquatable<DynamicViscosity>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs
index a0f4670b56..940f1ae267 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs
@@ -40,17 +40,7 @@ namespace UnitsNet
     [Obsolete("Admittance is a complex number, which is not currently supported by UnitsNet. Please use either ElectricConductance or ElectricSusceptance instead.")]
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricAdmittance :
-        IArithmeticQuantity<ElectricAdmittance, ElectricAdmittanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricAdmittance, ElectricAdmittance, double>,
-        IComparisonOperators<ElectricAdmittance, ElectricAdmittance, bool>,
-        IParsable<ElectricAdmittance>,
-#endif
-        IComparable,
-        IComparable<ElectricAdmittance>,
-        IEquatable<ElectricAdmittance>,
-        IFormattable
+    public readonly partial struct ElectricAdmittance : IQuantity<ElectricAdmittance, ElectricAdmittanceUnit>, ILinearQuantity<ElectricAdmittance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricApparentEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricApparentEnergy.g.cs
index 299daa8292..953a509a13 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricApparentEnergy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricApparentEnergy.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricApparentEnergy :
-        IArithmeticQuantity<ElectricApparentEnergy, ElectricApparentEnergyUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricApparentEnergy, ElectricApparentEnergy, double>,
-        IComparisonOperators<ElectricApparentEnergy, ElectricApparentEnergy, bool>,
-        IParsable<ElectricApparentEnergy>,
-#endif
-        IComparable,
-        IComparable<ElectricApparentEnergy>,
-        IEquatable<ElectricApparentEnergy>,
-        IFormattable
+    public readonly partial struct ElectricApparentEnergy : IQuantity<ElectricApparentEnergy, ElectricApparentEnergyUnit>, ILinearQuantity<ElectricApparentEnergy>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricApparentPower.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricApparentPower.g.cs
index 9eaa4f4fd6..50a60ffd31 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricApparentPower.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricApparentPower.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricApparentPower :
-        IArithmeticQuantity<ElectricApparentPower, ElectricApparentPowerUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricApparentPower, ElectricApparentPower, double>,
-        IComparisonOperators<ElectricApparentPower, ElectricApparentPower, bool>,
-        IParsable<ElectricApparentPower>,
-#endif
-        IComparable,
-        IComparable<ElectricApparentPower>,
-        IEquatable<ElectricApparentPower>,
-        IFormattable
+    public readonly partial struct ElectricApparentPower : IQuantity<ElectricApparentPower, ElectricApparentPowerUnit>, ILinearQuantity<ElectricApparentPower>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCapacitance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCapacitance.g.cs
index bb23cae42d..595170f823 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCapacitance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCapacitance.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricCapacitance :
-        IArithmeticQuantity<ElectricCapacitance, ElectricCapacitanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricCapacitance, ElectricCapacitance, double>,
-        IComparisonOperators<ElectricCapacitance, ElectricCapacitance, bool>,
-        IParsable<ElectricCapacitance>,
-#endif
-        IComparable,
-        IComparable<ElectricCapacitance>,
-        IEquatable<ElectricCapacitance>,
-        IFormattable
+    public readonly partial struct ElectricCapacitance : IQuantity<ElectricCapacitance, ElectricCapacitanceUnit>, ILinearQuantity<ElectricCapacitance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs
index 1a42c24f6c..54b6b9aac5 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs
@@ -39,20 +39,12 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricCharge :
-        IArithmeticQuantity<ElectricCharge, ElectricChargeUnit>,
+    public readonly partial struct ElectricCharge : IQuantity<ElectricCharge, ElectricChargeUnit>, ILinearQuantity<ElectricCharge>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricCharge, ElectricCharge, double>,
-        IDivisionOperators<ElectricCharge, ElectricCurrent, Duration>,
-        IDivisionOperators<ElectricCharge, Duration, ElectricCurrent>,
-        IMultiplyOperators<ElectricCharge, ElectricPotential, Energy>,
-        IComparisonOperators<ElectricCharge, ElectricCharge, bool>,
-        IParsable<ElectricCharge>,
+        , IDivisionOperators<ElectricCharge, ElectricCurrent, Duration>
+        , IDivisionOperators<ElectricCharge, Duration, ElectricCurrent>
+        , IMultiplyOperators<ElectricCharge, ElectricPotential, Energy>
 #endif
-        IComparable,
-        IComparable<ElectricCharge>,
-        IEquatable<ElectricCharge>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
index 7c358b5237..b8bfc02a69 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricChargeDensity :
-        IArithmeticQuantity<ElectricChargeDensity, ElectricChargeDensityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricChargeDensity, ElectricChargeDensity, double>,
-        IComparisonOperators<ElectricChargeDensity, ElectricChargeDensity, bool>,
-        IParsable<ElectricChargeDensity>,
-#endif
-        IComparable,
-        IComparable<ElectricChargeDensity>,
-        IEquatable<ElectricChargeDensity>,
-        IFormattable
+    public readonly partial struct ElectricChargeDensity : IQuantity<ElectricChargeDensity, ElectricChargeDensityUnit>, ILinearQuantity<ElectricChargeDensity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs
index f7a94f512f..20bb4ed77a 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricConductance :
-        IArithmeticQuantity<ElectricConductance, ElectricConductanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricConductance, ElectricConductance, double>,
-        IComparisonOperators<ElectricConductance, ElectricConductance, bool>,
-        IParsable<ElectricConductance>,
-#endif
-        IComparable,
-        IComparable<ElectricConductance>,
-        IEquatable<ElectricConductance>,
-        IFormattable
+    public readonly partial struct ElectricConductance : IQuantity<ElectricConductance, ElectricConductanceUnit>, ILinearQuantity<ElectricConductance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs
index 42a8281ef0..8a3accd3de 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricConductivity :
-        IArithmeticQuantity<ElectricConductivity, ElectricConductivityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricConductivity, ElectricConductivity, double>,
-        IComparisonOperators<ElectricConductivity, ElectricConductivity, bool>,
-        IParsable<ElectricConductivity>,
-#endif
-        IComparable,
-        IComparable<ElectricConductivity>,
-        IEquatable<ElectricConductivity>,
-        IFormattable
+    public readonly partial struct ElectricConductivity : IQuantity<ElectricConductivity, ElectricConductivityUnit>, ILinearQuantity<ElectricConductivity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs
index 1328d94480..faa3d52679 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs
@@ -39,22 +39,14 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricCurrent :
-        IArithmeticQuantity<ElectricCurrent, ElectricCurrentUnit>,
+    public readonly partial struct ElectricCurrent : IQuantity<ElectricCurrent, ElectricCurrentUnit>, ILinearQuantity<ElectricCurrent>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricCurrent, ElectricCurrent, double>,
-        IDivisionOperators<ElectricCurrent, ElectricCurrentGradient, Duration>,
-        IMultiplyOperators<ElectricCurrent, Duration, ElectricCharge>,
-        IDivisionOperators<ElectricCurrent, Duration, ElectricCurrentGradient>,
-        IMultiplyOperators<ElectricCurrent, ElectricResistance, ElectricPotential>,
-        IMultiplyOperators<ElectricCurrent, ElectricPotential, Power>,
-        IComparisonOperators<ElectricCurrent, ElectricCurrent, bool>,
-        IParsable<ElectricCurrent>,
+        , IDivisionOperators<ElectricCurrent, ElectricCurrentGradient, Duration>
+        , IMultiplyOperators<ElectricCurrent, Duration, ElectricCharge>
+        , IDivisionOperators<ElectricCurrent, Duration, ElectricCurrentGradient>
+        , IMultiplyOperators<ElectricCurrent, ElectricResistance, ElectricPotential>
+        , IMultiplyOperators<ElectricCurrent, ElectricPotential, Power>
 #endif
-        IComparable,
-        IComparable<ElectricCurrent>,
-        IEquatable<ElectricCurrent>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
index 6952796ae2..c0edd918ed 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricCurrentDensity :
-        IArithmeticQuantity<ElectricCurrentDensity, ElectricCurrentDensityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricCurrentDensity, ElectricCurrentDensity, double>,
-        IComparisonOperators<ElectricCurrentDensity, ElectricCurrentDensity, bool>,
-        IParsable<ElectricCurrentDensity>,
-#endif
-        IComparable,
-        IComparable<ElectricCurrentDensity>,
-        IEquatable<ElectricCurrentDensity>,
-        IFormattable
+    public readonly partial struct ElectricCurrentDensity : IQuantity<ElectricCurrentDensity, ElectricCurrentDensityUnit>, ILinearQuantity<ElectricCurrentDensity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
index 328c852d27..2065acd06f 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricCurrentGradient :
-        IArithmeticQuantity<ElectricCurrentGradient, ElectricCurrentGradientUnit>,
+    public readonly partial struct ElectricCurrentGradient : IQuantity<ElectricCurrentGradient, ElectricCurrentGradientUnit>, ILinearQuantity<ElectricCurrentGradient>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricCurrentGradient, ElectricCurrentGradient, double>,
-        IMultiplyOperators<ElectricCurrentGradient, Duration, ElectricCurrent>,
-        IComparisonOperators<ElectricCurrentGradient, ElectricCurrentGradient, bool>,
-        IParsable<ElectricCurrentGradient>,
+        , IMultiplyOperators<ElectricCurrentGradient, Duration, ElectricCurrent>
 #endif
-        IComparable,
-        IComparable<ElectricCurrentGradient>,
-        IEquatable<ElectricCurrentGradient>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs
index 0cffdfb99a..26176744d9 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricField :
-        IArithmeticQuantity<ElectricField, ElectricFieldUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricField, ElectricField, double>,
-        IComparisonOperators<ElectricField, ElectricField, bool>,
-        IParsable<ElectricField>,
-#endif
-        IComparable,
-        IComparable<ElectricField>,
-        IEquatable<ElectricField>,
-        IFormattable
+    public readonly partial struct ElectricField : IQuantity<ElectricField, ElectricFieldUnit>, ILinearQuantity<ElectricField>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricImpedance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricImpedance.g.cs
index 0664d9e4e5..7a76d68a95 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricImpedance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricImpedance.g.cs
@@ -40,17 +40,7 @@ namespace UnitsNet
     [Obsolete("Impedance is a complex number, which is not currently supported by UnitsNet. Please use either ElectricResistance or ElectricReactance instead.")]
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricImpedance :
-        IArithmeticQuantity<ElectricImpedance, ElectricImpedanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricImpedance, ElectricImpedance, double>,
-        IComparisonOperators<ElectricImpedance, ElectricImpedance, bool>,
-        IParsable<ElectricImpedance>,
-#endif
-        IComparable,
-        IComparable<ElectricImpedance>,
-        IEquatable<ElectricImpedance>,
-        IFormattable
+    public readonly partial struct ElectricImpedance : IQuantity<ElectricImpedance, ElectricImpedanceUnit>, ILinearQuantity<ElectricImpedance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs
index b23b44fce0..f17762b15c 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricInductance :
-        IArithmeticQuantity<ElectricInductance, ElectricInductanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricInductance, ElectricInductance, double>,
-        IComparisonOperators<ElectricInductance, ElectricInductance, bool>,
-        IParsable<ElectricInductance>,
-#endif
-        IComparable,
-        IComparable<ElectricInductance>,
-        IEquatable<ElectricInductance>,
-        IFormattable
+    public readonly partial struct ElectricInductance : IQuantity<ElectricInductance, ElectricInductanceUnit>, ILinearQuantity<ElectricInductance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs
index 82a074d2a1..2ca25698f0 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs
@@ -39,21 +39,13 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricPotential :
-        IArithmeticQuantity<ElectricPotential, ElectricPotentialUnit>,
+    public readonly partial struct ElectricPotential : IQuantity<ElectricPotential, ElectricPotentialUnit>, ILinearQuantity<ElectricPotential>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricPotential, ElectricPotential, double>,
-        IDivisionOperators<ElectricPotential, ElectricResistance, ElectricCurrent>,
-        IDivisionOperators<ElectricPotential, ElectricCurrent, ElectricResistance>,
-        IMultiplyOperators<ElectricPotential, ElectricCharge, Energy>,
-        IMultiplyOperators<ElectricPotential, ElectricCurrent, Power>,
-        IComparisonOperators<ElectricPotential, ElectricPotential, bool>,
-        IParsable<ElectricPotential>,
+        , IDivisionOperators<ElectricPotential, ElectricResistance, ElectricCurrent>
+        , IDivisionOperators<ElectricPotential, ElectricCurrent, ElectricResistance>
+        , IMultiplyOperators<ElectricPotential, ElectricCharge, Energy>
+        , IMultiplyOperators<ElectricPotential, ElectricCurrent, Power>
 #endif
-        IComparable,
-        IComparable<ElectricPotential>,
-        IEquatable<ElectricPotential>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
index 1ab1aff852..853a8ba64b 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricPotentialChangeRate :
-        IArithmeticQuantity<ElectricPotentialChangeRate, ElectricPotentialChangeRateUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricPotentialChangeRate, ElectricPotentialChangeRate, double>,
-        IComparisonOperators<ElectricPotentialChangeRate, ElectricPotentialChangeRate, bool>,
-        IParsable<ElectricPotentialChangeRate>,
-#endif
-        IComparable,
-        IComparable<ElectricPotentialChangeRate>,
-        IEquatable<ElectricPotentialChangeRate>,
-        IFormattable
+    public readonly partial struct ElectricPotentialChangeRate : IQuantity<ElectricPotentialChangeRate, ElectricPotentialChangeRateUnit>, ILinearQuantity<ElectricPotentialChangeRate>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricReactance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricReactance.g.cs
index 0876ea916a..bf59e7f0b8 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricReactance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricReactance.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricReactance :
-        IArithmeticQuantity<ElectricReactance, ElectricReactanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricReactance, ElectricReactance, double>,
-        IComparisonOperators<ElectricReactance, ElectricReactance, bool>,
-        IParsable<ElectricReactance>,
-#endif
-        IComparable,
-        IComparable<ElectricReactance>,
-        IEquatable<ElectricReactance>,
-        IFormattable
+    public readonly partial struct ElectricReactance : IQuantity<ElectricReactance, ElectricReactanceUnit>, ILinearQuantity<ElectricReactance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricReactiveEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricReactiveEnergy.g.cs
index dde516150d..22ca97a53b 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricReactiveEnergy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricReactiveEnergy.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricReactiveEnergy :
-        IArithmeticQuantity<ElectricReactiveEnergy, ElectricReactiveEnergyUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricReactiveEnergy, ElectricReactiveEnergy, double>,
-        IComparisonOperators<ElectricReactiveEnergy, ElectricReactiveEnergy, bool>,
-        IParsable<ElectricReactiveEnergy>,
-#endif
-        IComparable,
-        IComparable<ElectricReactiveEnergy>,
-        IEquatable<ElectricReactiveEnergy>,
-        IFormattable
+    public readonly partial struct ElectricReactiveEnergy : IQuantity<ElectricReactiveEnergy, ElectricReactiveEnergyUnit>, ILinearQuantity<ElectricReactiveEnergy>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricReactivePower.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricReactivePower.g.cs
index 6bd91d9da5..42f52f8fa6 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricReactivePower.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricReactivePower.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricReactivePower :
-        IArithmeticQuantity<ElectricReactivePower, ElectricReactivePowerUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricReactivePower, ElectricReactivePower, double>,
-        IComparisonOperators<ElectricReactivePower, ElectricReactivePower, bool>,
-        IParsable<ElectricReactivePower>,
-#endif
-        IComparable,
-        IComparable<ElectricReactivePower>,
-        IEquatable<ElectricReactivePower>,
-        IFormattable
+    public readonly partial struct ElectricReactivePower : IQuantity<ElectricReactivePower, ElectricReactivePowerUnit>, ILinearQuantity<ElectricReactivePower>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs
index 1b483957e0..c5baaa959b 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs
@@ -39,18 +39,10 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricResistance :
-        IArithmeticQuantity<ElectricResistance, ElectricResistanceUnit>,
+    public readonly partial struct ElectricResistance : IQuantity<ElectricResistance, ElectricResistanceUnit>, ILinearQuantity<ElectricResistance>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricResistance, ElectricResistance, double>,
-        IMultiplyOperators<ElectricResistance, ElectricCurrent, ElectricPotential>,
-        IComparisonOperators<ElectricResistance, ElectricResistance, bool>,
-        IParsable<ElectricResistance>,
+        , IMultiplyOperators<ElectricResistance, ElectricCurrent, ElectricPotential>
 #endif
-        IComparable,
-        IComparable<ElectricResistance>,
-        IEquatable<ElectricResistance>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs
index 0a20865a27..7582e95bf2 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricResistivity :
-        IArithmeticQuantity<ElectricResistivity, ElectricResistivityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricResistivity, ElectricResistivity, double>,
-        IComparisonOperators<ElectricResistivity, ElectricResistivity, bool>,
-        IParsable<ElectricResistivity>,
-#endif
-        IComparable,
-        IComparable<ElectricResistivity>,
-        IEquatable<ElectricResistivity>,
-        IFormattable
+    public readonly partial struct ElectricResistivity : IQuantity<ElectricResistivity, ElectricResistivityUnit>, ILinearQuantity<ElectricResistivity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
index 35f23bb0ff..0b89b4d6f3 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricSurfaceChargeDensity :
-        IArithmeticQuantity<ElectricSurfaceChargeDensity, ElectricSurfaceChargeDensityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricSurfaceChargeDensity, ElectricSurfaceChargeDensity, double>,
-        IComparisonOperators<ElectricSurfaceChargeDensity, ElectricSurfaceChargeDensity, bool>,
-        IParsable<ElectricSurfaceChargeDensity>,
-#endif
-        IComparable,
-        IComparable<ElectricSurfaceChargeDensity>,
-        IEquatable<ElectricSurfaceChargeDensity>,
-        IFormattable
+    public readonly partial struct ElectricSurfaceChargeDensity : IQuantity<ElectricSurfaceChargeDensity, ElectricSurfaceChargeDensityUnit>, ILinearQuantity<ElectricSurfaceChargeDensity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricSusceptance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricSusceptance.g.cs
index c6f5ca9ef8..f789e92196 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricSusceptance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricSusceptance.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ElectricSusceptance :
-        IArithmeticQuantity<ElectricSusceptance, ElectricSusceptanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ElectricSusceptance, ElectricSusceptance, double>,
-        IComparisonOperators<ElectricSusceptance, ElectricSusceptance, bool>,
-        IParsable<ElectricSusceptance>,
-#endif
-        IComparable,
-        IComparable<ElectricSusceptance>,
-        IEquatable<ElectricSusceptance>,
-        IFormattable
+    public readonly partial struct ElectricSusceptance : IQuantity<ElectricSusceptance, ElectricSusceptanceUnit>, ILinearQuantity<ElectricSusceptance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Energy.g.cs b/UnitsNet/GeneratedCode/Quantities/Energy.g.cs
index 982a1785f2..6a6cb4fcf7 100644
--- a/UnitsNet/GeneratedCode/Quantities/Energy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Energy.g.cs
@@ -36,30 +36,22 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Energy :
-        IArithmeticQuantity<Energy, EnergyUnit>,
+    public readonly partial struct Energy : IQuantity<Energy, EnergyUnit>, ILinearQuantity<Energy>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Energy, Energy, double>,
-        IDivisionOperators<Energy, MolarEnergy, AmountOfSubstance>,
-        IDivisionOperators<Energy, Power, Duration>,
-        IDivisionOperators<Energy, ElectricPotential, ElectricCharge>,
-        IDivisionOperators<Energy, ElectricCharge, ElectricPotential>,
-        IDivisionOperators<Energy, Volume, EnergyDensity>,
-        IDivisionOperators<Energy, TemperatureDelta, Entropy>,
-        IDivisionOperators<Energy, SpecificEnergy, Mass>,
-        IDivisionOperators<Energy, AmountOfSubstance, MolarEnergy>,
-        IMultiplyOperators<Energy, Frequency, Power>,
-        IDivisionOperators<Energy, Duration, Power>,
-        IDivisionOperators<Energy, Mass, SpecificEnergy>,
-        IDivisionOperators<Energy, Entropy, TemperatureDelta>,
-        IDivisionOperators<Energy, EnergyDensity, Volume>,
-        IComparisonOperators<Energy, Energy, bool>,
-        IParsable<Energy>,
+        , IDivisionOperators<Energy, MolarEnergy, AmountOfSubstance>
+        , IDivisionOperators<Energy, Power, Duration>
+        , IDivisionOperators<Energy, ElectricPotential, ElectricCharge>
+        , IDivisionOperators<Energy, ElectricCharge, ElectricPotential>
+        , IDivisionOperators<Energy, Volume, EnergyDensity>
+        , IDivisionOperators<Energy, TemperatureDelta, Entropy>
+        , IDivisionOperators<Energy, SpecificEnergy, Mass>
+        , IDivisionOperators<Energy, AmountOfSubstance, MolarEnergy>
+        , IMultiplyOperators<Energy, Frequency, Power>
+        , IDivisionOperators<Energy, Duration, Power>
+        , IDivisionOperators<Energy, Mass, SpecificEnergy>
+        , IDivisionOperators<Energy, Entropy, TemperatureDelta>
+        , IDivisionOperators<Energy, EnergyDensity, Volume>
 #endif
-        IComparable,
-        IComparable<Energy>,
-        IEquatable<Energy>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/EnergyDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/EnergyDensity.g.cs
index 3766c54268..c698be2ca0 100644
--- a/UnitsNet/GeneratedCode/Quantities/EnergyDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/EnergyDensity.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct EnergyDensity :
-        IArithmeticQuantity<EnergyDensity, EnergyDensityUnit>,
+    public readonly partial struct EnergyDensity : IQuantity<EnergyDensity, EnergyDensityUnit>, ILinearQuantity<EnergyDensity>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<EnergyDensity, EnergyDensity, double>,
-        IMultiplyOperators<EnergyDensity, Volume, Energy>,
-        IComparisonOperators<EnergyDensity, EnergyDensity, bool>,
-        IParsable<EnergyDensity>,
+        , IMultiplyOperators<EnergyDensity, Volume, Energy>
 #endif
-        IComparable,
-        IComparable<EnergyDensity>,
-        IEquatable<EnergyDensity>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs b/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs
index 0f6fe8c8d9..876e66447c 100644
--- a/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs
@@ -36,20 +36,12 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Entropy :
-        IArithmeticQuantity<Entropy, EntropyUnit>,
+    public readonly partial struct Entropy : IQuantity<Entropy, EntropyUnit>, ILinearQuantity<Entropy>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Entropy, Entropy, double>,
-        IMultiplyOperators<Entropy, TemperatureDelta, Energy>,
-        IDivisionOperators<Entropy, SpecificEntropy, Mass>,
-        IDivisionOperators<Entropy, Mass, SpecificEntropy>,
-        IComparisonOperators<Entropy, Entropy, bool>,
-        IParsable<Entropy>,
+        , IMultiplyOperators<Entropy, TemperatureDelta, Energy>
+        , IDivisionOperators<Entropy, SpecificEntropy, Mass>
+        , IDivisionOperators<Entropy, Mass, SpecificEntropy>
 #endif
-        IComparable,
-        IComparable<Entropy>,
-        IEquatable<Entropy>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/FluidResistance.g.cs b/UnitsNet/GeneratedCode/Quantities/FluidResistance.g.cs
index d92219473d..7299172a2f 100644
--- a/UnitsNet/GeneratedCode/Quantities/FluidResistance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/FluidResistance.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct FluidResistance :
-        IArithmeticQuantity<FluidResistance, FluidResistanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<FluidResistance, FluidResistance, double>,
-        IComparisonOperators<FluidResistance, FluidResistance, bool>,
-        IParsable<FluidResistance>,
-#endif
-        IComparable,
-        IComparable<FluidResistance>,
-        IEquatable<FluidResistance>,
-        IFormattable
+    public readonly partial struct FluidResistance : IQuantity<FluidResistance, FluidResistanceUnit>, ILinearQuantity<FluidResistance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Force.g.cs b/UnitsNet/GeneratedCode/Quantities/Force.g.cs
index 3e6e0cf3e2..06064b4386 100644
--- a/UnitsNet/GeneratedCode/Quantities/Force.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Force.g.cs
@@ -36,29 +36,21 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Force :
-        IArithmeticQuantity<Force, ForceUnit>,
+    public readonly partial struct Force : IQuantity<Force, ForceUnit>, ILinearQuantity<Force>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Force, Force, double>,
-        IDivisionOperators<Force, Mass, Acceleration>,
-        IDivisionOperators<Force, Pressure, Area>,
-        IDivisionOperators<Force, ForceChangeRate, Duration>,
-        IDivisionOperators<Force, Duration, ForceChangeRate>,
-        IMultiplyOperators<Force, ReciprocalLength, ForcePerLength>,
-        IDivisionOperators<Force, Length, ForcePerLength>,
-        IDivisionOperators<Force, ForcePerLength, Length>,
-        IDivisionOperators<Force, Acceleration, Mass>,
-        IMultiplyOperators<Force, Speed, Power>,
-        IMultiplyOperators<Force, ReciprocalArea, Pressure>,
-        IDivisionOperators<Force, Area, Pressure>,
-        IMultiplyOperators<Force, Length, Torque>,
-        IComparisonOperators<Force, Force, bool>,
-        IParsable<Force>,
+        , IDivisionOperators<Force, Mass, Acceleration>
+        , IDivisionOperators<Force, Pressure, Area>
+        , IDivisionOperators<Force, ForceChangeRate, Duration>
+        , IDivisionOperators<Force, Duration, ForceChangeRate>
+        , IMultiplyOperators<Force, ReciprocalLength, ForcePerLength>
+        , IDivisionOperators<Force, Length, ForcePerLength>
+        , IDivisionOperators<Force, ForcePerLength, Length>
+        , IDivisionOperators<Force, Acceleration, Mass>
+        , IMultiplyOperators<Force, Speed, Power>
+        , IMultiplyOperators<Force, ReciprocalArea, Pressure>
+        , IDivisionOperators<Force, Area, Pressure>
+        , IMultiplyOperators<Force, Length, Torque>
 #endif
-        IComparable,
-        IComparable<Force>,
-        IEquatable<Force>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs
index 031760cc0e..5f70a6a282 100644
--- a/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ForceChangeRate :
-        IArithmeticQuantity<ForceChangeRate, ForceChangeRateUnit>,
+    public readonly partial struct ForceChangeRate : IQuantity<ForceChangeRate, ForceChangeRateUnit>, ILinearQuantity<ForceChangeRate>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ForceChangeRate, ForceChangeRate, double>,
-        IMultiplyOperators<ForceChangeRate, Duration, Force>,
-        IComparisonOperators<ForceChangeRate, ForceChangeRate, bool>,
-        IParsable<ForceChangeRate>,
+        , IMultiplyOperators<ForceChangeRate, Duration, Force>
 #endif
-        IComparable,
-        IComparable<ForceChangeRate>,
-        IEquatable<ForceChangeRate>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs
index af311d6eb2..bc6f65ae4b 100644
--- a/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs
@@ -36,26 +36,18 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ForcePerLength :
-        IArithmeticQuantity<ForcePerLength, ForcePerLengthUnit>,
+    public readonly partial struct ForcePerLength : IQuantity<ForcePerLength, ForcePerLengthUnit>, ILinearQuantity<ForcePerLength>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ForcePerLength, ForcePerLength, double>,
-        IDivisionOperators<ForcePerLength, SpecificWeight, Area>,
-        IMultiplyOperators<ForcePerLength, Length, Force>,
-        IDivisionOperators<ForcePerLength, ReciprocalLength, Force>,
-        IDivisionOperators<ForcePerLength, Pressure, Length>,
-        IMultiplyOperators<ForcePerLength, ReciprocalLength, Pressure>,
-        IDivisionOperators<ForcePerLength, Length, Pressure>,
-        IDivisionOperators<ForcePerLength, Force, ReciprocalLength>,
-        IDivisionOperators<ForcePerLength, Area, SpecificWeight>,
-        IMultiplyOperators<ForcePerLength, Area, Torque>,
-        IComparisonOperators<ForcePerLength, ForcePerLength, bool>,
-        IParsable<ForcePerLength>,
+        , IDivisionOperators<ForcePerLength, SpecificWeight, Area>
+        , IMultiplyOperators<ForcePerLength, Length, Force>
+        , IDivisionOperators<ForcePerLength, ReciprocalLength, Force>
+        , IDivisionOperators<ForcePerLength, Pressure, Length>
+        , IMultiplyOperators<ForcePerLength, ReciprocalLength, Pressure>
+        , IDivisionOperators<ForcePerLength, Length, Pressure>
+        , IDivisionOperators<ForcePerLength, Force, ReciprocalLength>
+        , IDivisionOperators<ForcePerLength, Area, SpecificWeight>
+        , IMultiplyOperators<ForcePerLength, Area, Torque>
 #endif
-        IComparable,
-        IComparable<ForcePerLength>,
-        IEquatable<ForcePerLength>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs b/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs
index fa5f67b223..80207eb7ad 100644
--- a/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Frequency :
-        IArithmeticQuantity<Frequency, FrequencyUnit>,
+    public readonly partial struct Frequency : IQuantity<Frequency, FrequencyUnit>, ILinearQuantity<Frequency>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Frequency, Frequency, double>,
-        IMultiplyOperators<Frequency, Energy, Power>,
-        IComparisonOperators<Frequency, Frequency, bool>,
-        IParsable<Frequency>,
+        , IMultiplyOperators<Frequency, Energy, Power>
 #endif
-        IComparable,
-        IComparable<Frequency>,
-        IEquatable<Frequency>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs b/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs
index 36feac40b9..a6a8e6c24c 100644
--- a/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct FuelEfficiency :
-        IArithmeticQuantity<FuelEfficiency, FuelEfficiencyUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<FuelEfficiency, FuelEfficiency, double>,
-        IComparisonOperators<FuelEfficiency, FuelEfficiency, bool>,
-        IParsable<FuelEfficiency>,
-#endif
-        IComparable,
-        IComparable<FuelEfficiency>,
-        IEquatable<FuelEfficiency>,
-        IFormattable
+    public readonly partial struct FuelEfficiency : IQuantity<FuelEfficiency, FuelEfficiencyUnit>, ILinearQuantity<FuelEfficiency>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs
index f04aa3dc7c..d6071a719a 100644
--- a/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct HeatFlux :
-        IArithmeticQuantity<HeatFlux, HeatFluxUnit>,
+    public readonly partial struct HeatFlux : IQuantity<HeatFlux, HeatFluxUnit>, ILinearQuantity<HeatFlux>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<HeatFlux, HeatFlux, double>,
-        IMultiplyOperators<HeatFlux, Area, Power>,
-        IComparisonOperators<HeatFlux, HeatFlux, bool>,
-        IParsable<HeatFlux>,
+        , IMultiplyOperators<HeatFlux, Area, Power>
 #endif
-        IComparable,
-        IComparable<HeatFlux>,
-        IEquatable<HeatFlux>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs b/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
index ded5a527e7..97a7489f0a 100644
--- a/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct HeatTransferCoefficient :
-        IArithmeticQuantity<HeatTransferCoefficient, HeatTransferCoefficientUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<HeatTransferCoefficient, HeatTransferCoefficient, double>,
-        IComparisonOperators<HeatTransferCoefficient, HeatTransferCoefficient, bool>,
-        IParsable<HeatTransferCoefficient>,
-#endif
-        IComparable,
-        IComparable<HeatTransferCoefficient>,
-        IEquatable<HeatTransferCoefficient>,
-        IFormattable
+    public readonly partial struct HeatTransferCoefficient : IQuantity<HeatTransferCoefficient, HeatTransferCoefficientUnit>, ILinearQuantity<HeatTransferCoefficient>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs b/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs
index 097895cf58..6e6d2927a2 100644
--- a/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs
@@ -39,18 +39,10 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Illuminance :
-        IArithmeticQuantity<Illuminance, IlluminanceUnit>,
+    public readonly partial struct Illuminance : IQuantity<Illuminance, IlluminanceUnit>, ILinearQuantity<Illuminance>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Illuminance, Illuminance, double>,
-        IMultiplyOperators<Illuminance, Area, LuminousFlux>,
-        IComparisonOperators<Illuminance, Illuminance, bool>,
-        IParsable<Illuminance>,
+        , IMultiplyOperators<Illuminance, Area, LuminousFlux>
 #endif
-        IComparable,
-        IComparable<Illuminance>,
-        IEquatable<Illuminance>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Impulse.g.cs b/UnitsNet/GeneratedCode/Quantities/Impulse.g.cs
index e627a492d4..859212a5d1 100644
--- a/UnitsNet/GeneratedCode/Quantities/Impulse.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Impulse.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Impulse :
-        IArithmeticQuantity<Impulse, ImpulseUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Impulse, Impulse, double>,
-        IComparisonOperators<Impulse, Impulse, bool>,
-        IParsable<Impulse>,
-#endif
-        IComparable,
-        IComparable<Impulse>,
-        IEquatable<Impulse>,
-        IFormattable
+    public readonly partial struct Impulse : IQuantity<Impulse, ImpulseUnit>, ILinearQuantity<Impulse>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Information.g.cs b/UnitsNet/GeneratedCode/Quantities/Information.g.cs
index 37fc7a4f44..b66a5cbd0e 100644
--- a/UnitsNet/GeneratedCode/Quantities/Information.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Information.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Information :
-        IArithmeticQuantity<Information, InformationUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Information, Information, double>,
-        IComparisonOperators<Information, Information, bool>,
-        IParsable<Information>,
-#endif
-        IComparable,
-        IComparable<Information>,
-        IEquatable<Information>,
-        IFormattable
+    public readonly partial struct Information : IQuantity<Information, InformationUnit>, ILinearQuantity<Information>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs b/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs
index 2807557480..d7af785d38 100644
--- a/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Irradiance :
-        IArithmeticQuantity<Irradiance, IrradianceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Irradiance, Irradiance, double>,
-        IComparisonOperators<Irradiance, Irradiance, bool>,
-        IParsable<Irradiance>,
-#endif
-        IComparable,
-        IComparable<Irradiance>,
-        IEquatable<Irradiance>,
-        IFormattable
+    public readonly partial struct Irradiance : IQuantity<Irradiance, IrradianceUnit>, ILinearQuantity<Irradiance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs b/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs
index d16db7fef3..e4da975bb2 100644
--- a/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Irradiation :
-        IArithmeticQuantity<Irradiation, IrradiationUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Irradiation, Irradiation, double>,
-        IComparisonOperators<Irradiation, Irradiation, bool>,
-        IParsable<Irradiation>,
-#endif
-        IComparable,
-        IComparable<Irradiation>,
-        IEquatable<Irradiation>,
-        IFormattable
+    public readonly partial struct Irradiation : IQuantity<Irradiation, IrradiationUnit>, ILinearQuantity<Irradiation>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Jerk.g.cs b/UnitsNet/GeneratedCode/Quantities/Jerk.g.cs
index ac104b30b8..d6e55c2143 100644
--- a/UnitsNet/GeneratedCode/Quantities/Jerk.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Jerk.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Jerk :
-        IArithmeticQuantity<Jerk, JerkUnit>,
+    public readonly partial struct Jerk : IQuantity<Jerk, JerkUnit>, ILinearQuantity<Jerk>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Jerk, Jerk, double>,
-        IMultiplyOperators<Jerk, Duration, Acceleration>,
-        IComparisonOperators<Jerk, Jerk, bool>,
-        IParsable<Jerk>,
+        , IMultiplyOperators<Jerk, Duration, Acceleration>
 #endif
-        IComparable,
-        IComparable<Jerk>,
-        IEquatable<Jerk>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs b/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs
index e7828f6640..8ca5ec8dbe 100644
--- a/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs
@@ -39,21 +39,13 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct KinematicViscosity :
-        IArithmeticQuantity<KinematicViscosity, KinematicViscosityUnit>,
+    public readonly partial struct KinematicViscosity : IQuantity<KinematicViscosity, KinematicViscosityUnit>, ILinearQuantity<KinematicViscosity>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<KinematicViscosity, KinematicViscosity, double>,
-        IMultiplyOperators<KinematicViscosity, Duration, Area>,
-        IMultiplyOperators<KinematicViscosity, Density, DynamicViscosity>,
-        IDivisionOperators<KinematicViscosity, Speed, Length>,
-        IDivisionOperators<KinematicViscosity, Length, Speed>,
-        IComparisonOperators<KinematicViscosity, KinematicViscosity, bool>,
-        IParsable<KinematicViscosity>,
+        , IMultiplyOperators<KinematicViscosity, Duration, Area>
+        , IMultiplyOperators<KinematicViscosity, Density, DynamicViscosity>
+        , IDivisionOperators<KinematicViscosity, Speed, Length>
+        , IDivisionOperators<KinematicViscosity, Length, Speed>
 #endif
-        IComparable,
-        IComparable<KinematicViscosity>,
-        IEquatable<KinematicViscosity>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/LeakRate.g.cs b/UnitsNet/GeneratedCode/Quantities/LeakRate.g.cs
index b19b295670..b133933cd0 100644
--- a/UnitsNet/GeneratedCode/Quantities/LeakRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LeakRate.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct LeakRate :
-        IArithmeticQuantity<LeakRate, LeakRateUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<LeakRate, LeakRate, double>,
-        IComparisonOperators<LeakRate, LeakRate, bool>,
-        IParsable<LeakRate>,
-#endif
-        IComparable,
-        IComparable<LeakRate>,
-        IEquatable<LeakRate>,
-        IFormattable
+    public readonly partial struct LeakRate : IQuantity<LeakRate, LeakRateUnit>, ILinearQuantity<LeakRate>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Length.g.cs b/UnitsNet/GeneratedCode/Quantities/Length.g.cs
index 9974ed8191..b7e2d781d1 100644
--- a/UnitsNet/GeneratedCode/Quantities/Length.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Length.g.cs
@@ -36,35 +36,27 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Length :
-        IArithmeticQuantity<Length, LengthUnit>,
+    public readonly partial struct Length : IQuantity<Length, LengthUnit>, ILinearQuantity<Length>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Length, Length, double>,
-        IMultiplyOperators<Length, Length, Area>,
-        IDivisionOperators<Length, ReciprocalLength, Area>,
-        IMultiplyOperators<Length, Volume, AreaMomentOfInertia>,
-        IDivisionOperators<Length, Speed, Duration>,
-        IMultiplyOperators<Length, ForcePerLength, Force>,
-        IMultiplyOperators<Length, Pressure, ForcePerLength>,
-        IMultiplyOperators<Length, Speed, KinematicViscosity>,
-        IMultiplyOperators<Length, LinearDensity, Mass>,
-        IMultiplyOperators<Length, SpecificWeight, Pressure>,
-        IDivisionOperators<Length, Volume, ReciprocalArea>,
-        IMultiplyOperators<Length, ReciprocalArea, ReciprocalLength>,
-        IDivisionOperators<Length, Area, ReciprocalLength>,
-        IMultiplyOperators<Length, RotationalStiffnessPerLength, RotationalStiffness>,
-        IDivisionOperators<Length, Duration, Speed>,
-        IMultiplyOperators<Length, TemperatureGradient, TemperatureDelta>,
-        IMultiplyOperators<Length, Force, Torque>,
-        IMultiplyOperators<Length, Area, Volume>,
-        IDivisionOperators<Length, ReciprocalArea, Volume>,
-        IComparisonOperators<Length, Length, bool>,
-        IParsable<Length>,
+        , IMultiplyOperators<Length, Length, Area>
+        , IDivisionOperators<Length, ReciprocalLength, Area>
+        , IMultiplyOperators<Length, Volume, AreaMomentOfInertia>
+        , IDivisionOperators<Length, Speed, Duration>
+        , IMultiplyOperators<Length, ForcePerLength, Force>
+        , IMultiplyOperators<Length, Pressure, ForcePerLength>
+        , IMultiplyOperators<Length, Speed, KinematicViscosity>
+        , IMultiplyOperators<Length, LinearDensity, Mass>
+        , IMultiplyOperators<Length, SpecificWeight, Pressure>
+        , IDivisionOperators<Length, Volume, ReciprocalArea>
+        , IMultiplyOperators<Length, ReciprocalArea, ReciprocalLength>
+        , IDivisionOperators<Length, Area, ReciprocalLength>
+        , IMultiplyOperators<Length, RotationalStiffnessPerLength, RotationalStiffness>
+        , IDivisionOperators<Length, Duration, Speed>
+        , IMultiplyOperators<Length, TemperatureGradient, TemperatureDelta>
+        , IMultiplyOperators<Length, Force, Torque>
+        , IMultiplyOperators<Length, Area, Volume>
+        , IDivisionOperators<Length, ReciprocalArea, Volume>
 #endif
-        IComparable,
-        IComparable<Length>,
-        IEquatable<Length>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Level.g.cs b/UnitsNet/GeneratedCode/Quantities/Level.g.cs
index e7bb8464fc..967e031ad9 100644
--- a/UnitsNet/GeneratedCode/Quantities/Level.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Level.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Level :
-        ILogarithmicQuantity<Level, LevelUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Level, Level, double>,
-        IComparisonOperators<Level, Level, bool>,
-        IParsable<Level>,
-#endif
-        IComparable,
-        IComparable<Level>,
-        IEquatable<Level>,
-        IFormattable
+    public readonly partial struct Level : IQuantity<Level, LevelUnit>, ILogarithmicQuantity<Level>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs
index a6d4bcc7e7..3985ab74fb 100644
--- a/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs
@@ -39,20 +39,12 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct LinearDensity :
-        IArithmeticQuantity<LinearDensity, LinearDensityUnit>,
+    public readonly partial struct LinearDensity : IQuantity<LinearDensity, LinearDensityUnit>, ILinearQuantity<LinearDensity>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<LinearDensity, LinearDensity, double>,
-        IDivisionOperators<LinearDensity, Density, Area>,
-        IDivisionOperators<LinearDensity, Area, Density>,
-        IMultiplyOperators<LinearDensity, Length, Mass>,
-        IComparisonOperators<LinearDensity, LinearDensity, bool>,
-        IParsable<LinearDensity>,
+        , IDivisionOperators<LinearDensity, Density, Area>
+        , IDivisionOperators<LinearDensity, Area, Density>
+        , IMultiplyOperators<LinearDensity, Length, Mass>
 #endif
-        IComparable,
-        IComparable<LinearDensity>,
-        IEquatable<LinearDensity>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs
index b395fa2690..17483f02de 100644
--- a/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct LinearPowerDensity :
-        IArithmeticQuantity<LinearPowerDensity, LinearPowerDensityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<LinearPowerDensity, LinearPowerDensity, double>,
-        IComparisonOperators<LinearPowerDensity, LinearPowerDensity, bool>,
-        IParsable<LinearPowerDensity>,
-#endif
-        IComparable,
-        IComparable<LinearPowerDensity>,
-        IEquatable<LinearPowerDensity>,
-        IFormattable
+    public readonly partial struct LinearPowerDensity : IQuantity<LinearPowerDensity, LinearPowerDensityUnit>, ILinearQuantity<LinearPowerDensity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Luminance.g.cs b/UnitsNet/GeneratedCode/Quantities/Luminance.g.cs
index 6fced29fcb..67e38344c5 100644
--- a/UnitsNet/GeneratedCode/Quantities/Luminance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Luminance.g.cs
@@ -39,18 +39,10 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Luminance :
-        IArithmeticQuantity<Luminance, LuminanceUnit>,
+    public readonly partial struct Luminance : IQuantity<Luminance, LuminanceUnit>, ILinearQuantity<Luminance>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Luminance, Luminance, double>,
-        IMultiplyOperators<Luminance, Area, LuminousIntensity>,
-        IComparisonOperators<Luminance, Luminance, bool>,
-        IParsable<Luminance>,
+        , IMultiplyOperators<Luminance, Area, LuminousIntensity>
 #endif
-        IComparable,
-        IComparable<Luminance>,
-        IEquatable<Luminance>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs b/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs
index 8781a3c8c0..78cbb393c7 100644
--- a/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Luminosity :
-        IArithmeticQuantity<Luminosity, LuminosityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Luminosity, Luminosity, double>,
-        IComparisonOperators<Luminosity, Luminosity, bool>,
-        IParsable<Luminosity>,
-#endif
-        IComparable,
-        IComparable<Luminosity>,
-        IEquatable<Luminosity>,
-        IFormattable
+    public readonly partial struct Luminosity : IQuantity<Luminosity, LuminosityUnit>, ILinearQuantity<Luminosity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs
index 37a00f6f4d..c9dac8a2ea 100644
--- a/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs
@@ -39,19 +39,11 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct LuminousFlux :
-        IArithmeticQuantity<LuminousFlux, LuminousFluxUnit>,
+    public readonly partial struct LuminousFlux : IQuantity<LuminousFlux, LuminousFluxUnit>, ILinearQuantity<LuminousFlux>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<LuminousFlux, LuminousFlux, double>,
-        IDivisionOperators<LuminousFlux, Illuminance, Area>,
-        IDivisionOperators<LuminousFlux, Area, Illuminance>,
-        IComparisonOperators<LuminousFlux, LuminousFlux, bool>,
-        IParsable<LuminousFlux>,
+        , IDivisionOperators<LuminousFlux, Illuminance, Area>
+        , IDivisionOperators<LuminousFlux, Area, Illuminance>
 #endif
-        IComparable,
-        IComparable<LuminousFlux>,
-        IEquatable<LuminousFlux>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs
index 151f67d3d5..21c55659de 100644
--- a/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs
@@ -39,19 +39,11 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct LuminousIntensity :
-        IArithmeticQuantity<LuminousIntensity, LuminousIntensityUnit>,
+    public readonly partial struct LuminousIntensity : IQuantity<LuminousIntensity, LuminousIntensityUnit>, ILinearQuantity<LuminousIntensity>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<LuminousIntensity, LuminousIntensity, double>,
-        IDivisionOperators<LuminousIntensity, Luminance, Area>,
-        IDivisionOperators<LuminousIntensity, Area, Luminance>,
-        IComparisonOperators<LuminousIntensity, LuminousIntensity, bool>,
-        IParsable<LuminousIntensity>,
+        , IDivisionOperators<LuminousIntensity, Luminance, Area>
+        , IDivisionOperators<LuminousIntensity, Area, Luminance>
 #endif
-        IComparable,
-        IComparable<LuminousIntensity>,
-        IEquatable<LuminousIntensity>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs b/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs
index 157f308cc9..9c696c9b63 100644
--- a/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MagneticField :
-        IArithmeticQuantity<MagneticField, MagneticFieldUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<MagneticField, MagneticField, double>,
-        IComparisonOperators<MagneticField, MagneticField, bool>,
-        IParsable<MagneticField>,
-#endif
-        IComparable,
-        IComparable<MagneticField>,
-        IEquatable<MagneticField>,
-        IFormattable
+    public readonly partial struct MagneticField : IQuantity<MagneticField, MagneticFieldUnit>, ILinearQuantity<MagneticField>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs
index bfe7b01062..e898612c08 100644
--- a/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MagneticFlux :
-        IArithmeticQuantity<MagneticFlux, MagneticFluxUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<MagneticFlux, MagneticFlux, double>,
-        IComparisonOperators<MagneticFlux, MagneticFlux, bool>,
-        IParsable<MagneticFlux>,
-#endif
-        IComparable,
-        IComparable<MagneticFlux>,
-        IEquatable<MagneticFlux>,
-        IFormattable
+    public readonly partial struct MagneticFlux : IQuantity<MagneticFlux, MagneticFluxUnit>, ILinearQuantity<MagneticFlux>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs b/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs
index 0147a53206..fcdebdc7c3 100644
--- a/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Magnetization :
-        IArithmeticQuantity<Magnetization, MagnetizationUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Magnetization, Magnetization, double>,
-        IComparisonOperators<Magnetization, Magnetization, bool>,
-        IParsable<Magnetization>,
-#endif
-        IComparable,
-        IComparable<Magnetization>,
-        IEquatable<Magnetization>,
-        IFormattable
+    public readonly partial struct Magnetization : IQuantity<Magnetization, MagnetizationUnit>, ILinearQuantity<Magnetization>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Mass.g.cs b/UnitsNet/GeneratedCode/Quantities/Mass.g.cs
index d8cc7d7126..d838377d2c 100644
--- a/UnitsNet/GeneratedCode/Quantities/Mass.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Mass.g.cs
@@ -36,33 +36,25 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Mass :
-        IArithmeticQuantity<Mass, MassUnit>,
+    public readonly partial struct Mass : IQuantity<Mass, MassUnit>, ILinearQuantity<Mass>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Mass, Mass, double>,
-        IDivisionOperators<Mass, MolarMass, AmountOfSubstance>,
-        IDivisionOperators<Mass, AreaDensity, Area>,
-        IDivisionOperators<Mass, Area, AreaDensity>,
-        IDivisionOperators<Mass, Volume, Density>,
-        IDivisionOperators<Mass, MassFlow, Duration>,
-        IMultiplyOperators<Mass, SpecificEnergy, Energy>,
-        IMultiplyOperators<Mass, SpecificEntropy, Entropy>,
-        IMultiplyOperators<Mass, Acceleration, Force>,
-        IDivisionOperators<Mass, LinearDensity, Length>,
-        IDivisionOperators<Mass, Length, LinearDensity>,
-        IMultiplyOperators<Mass, MassFraction, Mass>,
-        IDivisionOperators<Mass, MassFraction, Mass>,
-        IDivisionOperators<Mass, Duration, MassFlow>,
-        IDivisionOperators<Mass, AmountOfSubstance, MolarMass>,
-        IMultiplyOperators<Mass, SpecificVolume, Volume>,
-        IDivisionOperators<Mass, Density, Volume>,
-        IComparisonOperators<Mass, Mass, bool>,
-        IParsable<Mass>,
+        , IDivisionOperators<Mass, MolarMass, AmountOfSubstance>
+        , IDivisionOperators<Mass, AreaDensity, Area>
+        , IDivisionOperators<Mass, Area, AreaDensity>
+        , IDivisionOperators<Mass, Volume, Density>
+        , IDivisionOperators<Mass, MassFlow, Duration>
+        , IMultiplyOperators<Mass, SpecificEnergy, Energy>
+        , IMultiplyOperators<Mass, SpecificEntropy, Entropy>
+        , IMultiplyOperators<Mass, Acceleration, Force>
+        , IDivisionOperators<Mass, LinearDensity, Length>
+        , IDivisionOperators<Mass, Length, LinearDensity>
+        , IMultiplyOperators<Mass, MassFraction, Mass>
+        , IDivisionOperators<Mass, MassFraction, Mass>
+        , IDivisionOperators<Mass, Duration, MassFlow>
+        , IDivisionOperators<Mass, AmountOfSubstance, MolarMass>
+        , IMultiplyOperators<Mass, SpecificVolume, Volume>
+        , IDivisionOperators<Mass, Density, Volume>
 #endif
-        IComparable,
-        IComparable<Mass>,
-        IEquatable<Mass>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs b/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs
index b58c5046af..608cc702a7 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs
@@ -39,22 +39,14 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MassConcentration :
-        IArithmeticQuantity<MassConcentration, MassConcentrationUnit>,
+    public readonly partial struct MassConcentration : IQuantity<MassConcentration, MassConcentrationUnit>, ILinearQuantity<MassConcentration>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<MassConcentration, MassConcentration, double>,
-        IDivisionOperators<MassConcentration, VolumeConcentration, Density>,
-        IMultiplyOperators<MassConcentration, Volume, Mass>,
-        IDivisionOperators<MassConcentration, Molarity, MolarMass>,
-        IDivisionOperators<MassConcentration, MolarMass, Molarity>,
-        IDivisionOperators<MassConcentration, Density, VolumeConcentration>,
-        IComparisonOperators<MassConcentration, MassConcentration, bool>,
-        IParsable<MassConcentration>,
+        , IDivisionOperators<MassConcentration, VolumeConcentration, Density>
+        , IMultiplyOperators<MassConcentration, Volume, Mass>
+        , IDivisionOperators<MassConcentration, Molarity, MolarMass>
+        , IDivisionOperators<MassConcentration, MolarMass, Molarity>
+        , IDivisionOperators<MassConcentration, Density, VolumeConcentration>
 #endif
-        IComparable,
-        IComparable<MassConcentration>,
-        IEquatable<MassConcentration>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs
index 72cc1c5344..c844315428 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs
@@ -36,27 +36,19 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MassFlow :
-        IArithmeticQuantity<MassFlow, MassFlowUnit>,
+    public readonly partial struct MassFlow : IQuantity<MassFlow, MassFlowUnit>, ILinearQuantity<MassFlow>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<MassFlow, MassFlow, double>,
-        IDivisionOperators<MassFlow, MassFlux, Area>,
-        IDivisionOperators<MassFlow, Power, BrakeSpecificFuelConsumption>,
-        IDivisionOperators<MassFlow, VolumeFlow, Density>,
-        IMultiplyOperators<MassFlow, Duration, Mass>,
-        IDivisionOperators<MassFlow, Area, MassFlux>,
-        IDivisionOperators<MassFlow, MolarMass, MolarFlow>,
-        IDivisionOperators<MassFlow, MolarFlow, MolarMass>,
-        IMultiplyOperators<MassFlow, SpecificEnergy, Power>,
-        IDivisionOperators<MassFlow, BrakeSpecificFuelConsumption, Power>,
-        IDivisionOperators<MassFlow, Density, VolumeFlow>,
-        IComparisonOperators<MassFlow, MassFlow, bool>,
-        IParsable<MassFlow>,
+        , IDivisionOperators<MassFlow, MassFlux, Area>
+        , IDivisionOperators<MassFlow, Power, BrakeSpecificFuelConsumption>
+        , IDivisionOperators<MassFlow, VolumeFlow, Density>
+        , IMultiplyOperators<MassFlow, Duration, Mass>
+        , IDivisionOperators<MassFlow, Area, MassFlux>
+        , IDivisionOperators<MassFlow, MolarMass, MolarFlow>
+        , IDivisionOperators<MassFlow, MolarFlow, MolarMass>
+        , IMultiplyOperators<MassFlow, SpecificEnergy, Power>
+        , IDivisionOperators<MassFlow, BrakeSpecificFuelConsumption, Power>
+        , IDivisionOperators<MassFlow, Density, VolumeFlow>
 #endif
-        IComparable,
-        IComparable<MassFlow>,
-        IEquatable<MassFlow>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs
index f2e84a2d0c..19726466e0 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs
@@ -36,20 +36,12 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MassFlux :
-        IArithmeticQuantity<MassFlux, MassFluxUnit>,
+    public readonly partial struct MassFlux : IQuantity<MassFlux, MassFluxUnit>, ILinearQuantity<MassFlux>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<MassFlux, MassFlux, double>,
-        IDivisionOperators<MassFlux, Speed, Density>,
-        IMultiplyOperators<MassFlux, Area, MassFlow>,
-        IDivisionOperators<MassFlux, Density, Speed>,
-        IComparisonOperators<MassFlux, MassFlux, bool>,
-        IParsable<MassFlux>,
+        , IDivisionOperators<MassFlux, Speed, Density>
+        , IMultiplyOperators<MassFlux, Area, MassFlow>
+        , IDivisionOperators<MassFlux, Density, Speed>
 #endif
-        IComparable,
-        IComparable<MassFlux>,
-        IEquatable<MassFlux>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs
index 5a3a2755f9..3868e07649 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs
@@ -39,18 +39,10 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MassFraction :
-        IArithmeticQuantity<MassFraction, MassFractionUnit>,
+    public readonly partial struct MassFraction : IQuantity<MassFraction, MassFractionUnit>, ILinearQuantity<MassFraction>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<MassFraction, MassFraction, double>,
-        IMultiplyOperators<MassFraction, Mass, Mass>,
-        IComparisonOperators<MassFraction, MassFraction, bool>,
-        IParsable<MassFraction>,
+        , IMultiplyOperators<MassFraction, Mass, Mass>
 #endif
-        IComparable,
-        IComparable<MassFraction>,
-        IEquatable<MassFraction>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
index 1cd21a64a7..119a17eb97 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MassMomentOfInertia :
-        IArithmeticQuantity<MassMomentOfInertia, MassMomentOfInertiaUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<MassMomentOfInertia, MassMomentOfInertia, double>,
-        IComparisonOperators<MassMomentOfInertia, MassMomentOfInertia, bool>,
-        IParsable<MassMomentOfInertia>,
-#endif
-        IComparable,
-        IComparable<MassMomentOfInertia>,
-        IEquatable<MassMomentOfInertia>,
-        IFormattable
+    public readonly partial struct MassMomentOfInertia : IQuantity<MassMomentOfInertia, MassMomentOfInertiaUnit>, ILinearQuantity<MassMomentOfInertia>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Molality.g.cs b/UnitsNet/GeneratedCode/Quantities/Molality.g.cs
index 63837b108d..bc8463a2ce 100644
--- a/UnitsNet/GeneratedCode/Quantities/Molality.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Molality.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Molality :
-        IArithmeticQuantity<Molality, MolalityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Molality, Molality, double>,
-        IComparisonOperators<Molality, Molality, bool>,
-        IParsable<Molality>,
-#endif
-        IComparable,
-        IComparable<Molality>,
-        IEquatable<Molality>,
-        IFormattable
+    public readonly partial struct Molality : IQuantity<Molality, MolalityUnit>, ILinearQuantity<Molality>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs
index d1427d6250..d150d634bc 100644
--- a/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MolarEnergy :
-        IArithmeticQuantity<MolarEnergy, MolarEnergyUnit>,
+    public readonly partial struct MolarEnergy : IQuantity<MolarEnergy, MolarEnergyUnit>, ILinearQuantity<MolarEnergy>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<MolarEnergy, MolarEnergy, double>,
-        IMultiplyOperators<MolarEnergy, AmountOfSubstance, Energy>,
-        IComparisonOperators<MolarEnergy, MolarEnergy, bool>,
-        IParsable<MolarEnergy>,
+        , IMultiplyOperators<MolarEnergy, AmountOfSubstance, Energy>
 #endif
-        IComparable,
-        IComparable<MolarEnergy>,
-        IEquatable<MolarEnergy>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs
index df7026eb59..98b5627232 100644
--- a/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MolarEntropy :
-        IArithmeticQuantity<MolarEntropy, MolarEntropyUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<MolarEntropy, MolarEntropy, double>,
-        IComparisonOperators<MolarEntropy, MolarEntropy, bool>,
-        IParsable<MolarEntropy>,
-#endif
-        IComparable,
-        IComparable<MolarEntropy>,
-        IEquatable<MolarEntropy>,
-        IFormattable
+    public readonly partial struct MolarEntropy : IQuantity<MolarEntropy, MolarEntropyUnit>, ILinearQuantity<MolarEntropy>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MolarFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarFlow.g.cs
index cfaf99aa5f..73e87bf737 100644
--- a/UnitsNet/GeneratedCode/Quantities/MolarFlow.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MolarFlow.g.cs
@@ -36,21 +36,13 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MolarFlow :
-        IArithmeticQuantity<MolarFlow, MolarFlowUnit>,
+    public readonly partial struct MolarFlow : IQuantity<MolarFlow, MolarFlowUnit>, ILinearQuantity<MolarFlow>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<MolarFlow, MolarFlow, double>,
-        IMultiplyOperators<MolarFlow, Duration, AmountOfSubstance>,
-        IMultiplyOperators<MolarFlow, MolarMass, MassFlow>,
-        IDivisionOperators<MolarFlow, VolumeFlow, Molarity>,
-        IDivisionOperators<MolarFlow, Molarity, VolumeFlow>,
-        IComparisonOperators<MolarFlow, MolarFlow, bool>,
-        IParsable<MolarFlow>,
+        , IMultiplyOperators<MolarFlow, Duration, AmountOfSubstance>
+        , IMultiplyOperators<MolarFlow, MolarMass, MassFlow>
+        , IDivisionOperators<MolarFlow, VolumeFlow, Molarity>
+        , IDivisionOperators<MolarFlow, Molarity, VolumeFlow>
 #endif
-        IComparable,
-        IComparable<MolarFlow>,
-        IEquatable<MolarFlow>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs
index d20e489b04..301f73a817 100644
--- a/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs
@@ -36,20 +36,12 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct MolarMass :
-        IArithmeticQuantity<MolarMass, MolarMassUnit>,
+    public readonly partial struct MolarMass : IQuantity<MolarMass, MolarMassUnit>, ILinearQuantity<MolarMass>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<MolarMass, MolarMass, double>,
-        IMultiplyOperators<MolarMass, AmountOfSubstance, Mass>,
-        IMultiplyOperators<MolarMass, Molarity, MassConcentration>,
-        IMultiplyOperators<MolarMass, MolarFlow, MassFlow>,
-        IComparisonOperators<MolarMass, MolarMass, bool>,
-        IParsable<MolarMass>,
+        , IMultiplyOperators<MolarMass, AmountOfSubstance, Mass>
+        , IMultiplyOperators<MolarMass, Molarity, MassConcentration>
+        , IMultiplyOperators<MolarMass, MolarFlow, MassFlow>
 #endif
-        IComparable,
-        IComparable<MolarMass>,
-        IEquatable<MolarMass>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs b/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs
index 83c4ff33fb..f38b44b2d7 100644
--- a/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs
@@ -39,22 +39,14 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Molarity :
-        IArithmeticQuantity<Molarity, MolarityUnit>,
+    public readonly partial struct Molarity : IQuantity<Molarity, MolarityUnit>, ILinearQuantity<Molarity>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Molarity, Molarity, double>,
-        IMultiplyOperators<Molarity, Volume, AmountOfSubstance>,
-        IMultiplyOperators<Molarity, MolarMass, MassConcentration>,
-        IMultiplyOperators<Molarity, VolumeFlow, MolarFlow>,
-        IMultiplyOperators<Molarity, VolumeConcentration, Molarity>,
-        IDivisionOperators<Molarity, VolumeConcentration, Molarity>,
-        IComparisonOperators<Molarity, Molarity, bool>,
-        IParsable<Molarity>,
+        , IMultiplyOperators<Molarity, Volume, AmountOfSubstance>
+        , IMultiplyOperators<Molarity, MolarMass, MassConcentration>
+        , IMultiplyOperators<Molarity, VolumeFlow, MolarFlow>
+        , IMultiplyOperators<Molarity, VolumeConcentration, Molarity>
+        , IDivisionOperators<Molarity, VolumeConcentration, Molarity>
 #endif
-        IComparable,
-        IComparable<Molarity>,
-        IEquatable<Molarity>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs b/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs
index 25987bbc99..e91b827d63 100644
--- a/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Permeability :
-        IArithmeticQuantity<Permeability, PermeabilityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Permeability, Permeability, double>,
-        IComparisonOperators<Permeability, Permeability, bool>,
-        IParsable<Permeability>,
-#endif
-        IComparable,
-        IComparable<Permeability>,
-        IEquatable<Permeability>,
-        IFormattable
+    public readonly partial struct Permeability : IQuantity<Permeability, PermeabilityUnit>, ILinearQuantity<Permeability>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs b/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs
index 35b62f63d6..22f422396c 100644
--- a/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Permittivity :
-        IArithmeticQuantity<Permittivity, PermittivityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Permittivity, Permittivity, double>,
-        IComparisonOperators<Permittivity, Permittivity, bool>,
-        IParsable<Permittivity>,
-#endif
-        IComparable,
-        IComparable<Permittivity>,
-        IEquatable<Permittivity>,
-        IFormattable
+    public readonly partial struct Permittivity : IQuantity<Permittivity, PermittivityUnit>, ILinearQuantity<Permittivity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/PorousMediumPermeability.g.cs b/UnitsNet/GeneratedCode/Quantities/PorousMediumPermeability.g.cs
index 3d228d91f6..e45dff84c7 100644
--- a/UnitsNet/GeneratedCode/Quantities/PorousMediumPermeability.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/PorousMediumPermeability.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct PorousMediumPermeability :
-        IArithmeticQuantity<PorousMediumPermeability, PorousMediumPermeabilityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<PorousMediumPermeability, PorousMediumPermeability, double>,
-        IComparisonOperators<PorousMediumPermeability, PorousMediumPermeability, bool>,
-        IParsable<PorousMediumPermeability>,
-#endif
-        IComparable,
-        IComparable<PorousMediumPermeability>,
-        IEquatable<PorousMediumPermeability>,
-        IFormattable
+    public readonly partial struct PorousMediumPermeability : IQuantity<PorousMediumPermeability, PorousMediumPermeabilityUnit>, ILinearQuantity<PorousMediumPermeability>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Power.g.cs b/UnitsNet/GeneratedCode/Quantities/Power.g.cs
index 2f49d5080e..b77d4434d1 100644
--- a/UnitsNet/GeneratedCode/Quantities/Power.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Power.g.cs
@@ -36,31 +36,23 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Power :
-        IArithmeticQuantity<Power, PowerUnit>,
+    public readonly partial struct Power : IQuantity<Power, PowerUnit>, ILinearQuantity<Power>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Power, Power, double>,
-        IDivisionOperators<Power, HeatFlux, Area>,
-        IDivisionOperators<Power, ElectricPotential, ElectricCurrent>,
-        IDivisionOperators<Power, ElectricCurrent, ElectricPotential>,
-        IMultiplyOperators<Power, Duration, Energy>,
-        IDivisionOperators<Power, Frequency, Energy>,
-        IDivisionOperators<Power, Speed, Force>,
-        IDivisionOperators<Power, Energy, Frequency>,
-        IDivisionOperators<Power, Area, HeatFlux>,
-        IMultiplyOperators<Power, BrakeSpecificFuelConsumption, MassFlow>,
-        IDivisionOperators<Power, SpecificEnergy, MassFlow>,
-        IDivisionOperators<Power, Torque, RotationalSpeed>,
-        IDivisionOperators<Power, MassFlow, SpecificEnergy>,
-        IDivisionOperators<Power, Force, Speed>,
-        IDivisionOperators<Power, RotationalSpeed, Torque>,
-        IComparisonOperators<Power, Power, bool>,
-        IParsable<Power>,
+        , IDivisionOperators<Power, HeatFlux, Area>
+        , IDivisionOperators<Power, ElectricPotential, ElectricCurrent>
+        , IDivisionOperators<Power, ElectricCurrent, ElectricPotential>
+        , IMultiplyOperators<Power, Duration, Energy>
+        , IDivisionOperators<Power, Frequency, Energy>
+        , IDivisionOperators<Power, Speed, Force>
+        , IDivisionOperators<Power, Energy, Frequency>
+        , IDivisionOperators<Power, Area, HeatFlux>
+        , IMultiplyOperators<Power, BrakeSpecificFuelConsumption, MassFlow>
+        , IDivisionOperators<Power, SpecificEnergy, MassFlow>
+        , IDivisionOperators<Power, Torque, RotationalSpeed>
+        , IDivisionOperators<Power, MassFlow, SpecificEnergy>
+        , IDivisionOperators<Power, Force, Speed>
+        , IDivisionOperators<Power, RotationalSpeed, Torque>
 #endif
-        IComparable,
-        IComparable<Power>,
-        IEquatable<Power>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs
index 24c67a9352..63057d556b 100644
--- a/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct PowerDensity :
-        IArithmeticQuantity<PowerDensity, PowerDensityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<PowerDensity, PowerDensity, double>,
-        IComparisonOperators<PowerDensity, PowerDensity, bool>,
-        IParsable<PowerDensity>,
-#endif
-        IComparable,
-        IComparable<PowerDensity>,
-        IEquatable<PowerDensity>,
-        IFormattable
+    public readonly partial struct PowerDensity : IQuantity<PowerDensity, PowerDensityUnit>, ILinearQuantity<PowerDensity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs b/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs
index eee3ae332b..e06a842103 100644
--- a/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct PowerRatio :
-        ILogarithmicQuantity<PowerRatio, PowerRatioUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<PowerRatio, PowerRatio, double>,
-        IComparisonOperators<PowerRatio, PowerRatio, bool>,
-        IParsable<PowerRatio>,
-#endif
-        IComparable,
-        IComparable<PowerRatio>,
-        IEquatable<PowerRatio>,
-        IFormattable
+    public readonly partial struct PowerRatio : IQuantity<PowerRatio, PowerRatioUnit>, ILogarithmicQuantity<PowerRatio>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs
index 2a91befa59..658a35c36f 100644
--- a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs
@@ -36,27 +36,19 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Pressure :
-        IArithmeticQuantity<Pressure, PressureUnit>,
+    public readonly partial struct Pressure : IQuantity<Pressure, PressureUnit>, ILinearQuantity<Pressure>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Pressure, Pressure, double>,
-        IDivisionOperators<Pressure, PressureChangeRate, Duration>,
-        IDivisionOperators<Pressure, ReciprocalArea, Force>,
-        IMultiplyOperators<Pressure, Area, Force>,
-        IMultiplyOperators<Pressure, Length, ForcePerLength>,
-        IDivisionOperators<Pressure, ReciprocalLength, ForcePerLength>,
-        IDivisionOperators<Pressure, SpecificWeight, Length>,
-        IDivisionOperators<Pressure, Duration, PressureChangeRate>,
-        IDivisionOperators<Pressure, Force, ReciprocalArea>,
-        IDivisionOperators<Pressure, ForcePerLength, ReciprocalLength>,
-        IDivisionOperators<Pressure, Length, SpecificWeight>,
-        IComparisonOperators<Pressure, Pressure, bool>,
-        IParsable<Pressure>,
+        , IDivisionOperators<Pressure, PressureChangeRate, Duration>
+        , IDivisionOperators<Pressure, ReciprocalArea, Force>
+        , IMultiplyOperators<Pressure, Area, Force>
+        , IMultiplyOperators<Pressure, Length, ForcePerLength>
+        , IDivisionOperators<Pressure, ReciprocalLength, ForcePerLength>
+        , IDivisionOperators<Pressure, SpecificWeight, Length>
+        , IDivisionOperators<Pressure, Duration, PressureChangeRate>
+        , IDivisionOperators<Pressure, Force, ReciprocalArea>
+        , IDivisionOperators<Pressure, ForcePerLength, ReciprocalLength>
+        , IDivisionOperators<Pressure, Length, SpecificWeight>
 #endif
-        IComparable,
-        IComparable<Pressure>,
-        IEquatable<Pressure>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs
index 2d54c32e54..b7df37699c 100644
--- a/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct PressureChangeRate :
-        IArithmeticQuantity<PressureChangeRate, PressureChangeRateUnit>,
+    public readonly partial struct PressureChangeRate : IQuantity<PressureChangeRate, PressureChangeRateUnit>, ILinearQuantity<PressureChangeRate>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<PressureChangeRate, PressureChangeRate, double>,
-        IMultiplyOperators<PressureChangeRate, Duration, Pressure>,
-        IComparisonOperators<PressureChangeRate, PressureChangeRate, bool>,
-        IParsable<PressureChangeRate>,
+        , IMultiplyOperators<PressureChangeRate, Duration, Pressure>
 #endif
-        IComparable,
-        IComparable<PressureChangeRate>,
-        IEquatable<PressureChangeRate>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RadiationEquivalentDose.g.cs b/UnitsNet/GeneratedCode/Quantities/RadiationEquivalentDose.g.cs
index 66133892c4..b1b0813bb4 100644
--- a/UnitsNet/GeneratedCode/Quantities/RadiationEquivalentDose.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RadiationEquivalentDose.g.cs
@@ -36,19 +36,11 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RadiationEquivalentDose :
-        IArithmeticQuantity<RadiationEquivalentDose, RadiationEquivalentDoseUnit>,
+    public readonly partial struct RadiationEquivalentDose : IQuantity<RadiationEquivalentDose, RadiationEquivalentDoseUnit>, ILinearQuantity<RadiationEquivalentDose>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<RadiationEquivalentDose, RadiationEquivalentDose, double>,
-        IDivisionOperators<RadiationEquivalentDose, RadiationEquivalentDoseRate, Duration>,
-        IDivisionOperators<RadiationEquivalentDose, Duration, RadiationEquivalentDoseRate>,
-        IComparisonOperators<RadiationEquivalentDose, RadiationEquivalentDose, bool>,
-        IParsable<RadiationEquivalentDose>,
+        , IDivisionOperators<RadiationEquivalentDose, RadiationEquivalentDoseRate, Duration>
+        , IDivisionOperators<RadiationEquivalentDose, Duration, RadiationEquivalentDoseRate>
 #endif
-        IComparable,
-        IComparable<RadiationEquivalentDose>,
-        IEquatable<RadiationEquivalentDose>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RadiationEquivalentDoseRate.g.cs b/UnitsNet/GeneratedCode/Quantities/RadiationEquivalentDoseRate.g.cs
index d3e02da4f9..bd3317dbe3 100644
--- a/UnitsNet/GeneratedCode/Quantities/RadiationEquivalentDoseRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RadiationEquivalentDoseRate.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RadiationEquivalentDoseRate :
-        IArithmeticQuantity<RadiationEquivalentDoseRate, RadiationEquivalentDoseRateUnit>,
+    public readonly partial struct RadiationEquivalentDoseRate : IQuantity<RadiationEquivalentDoseRate, RadiationEquivalentDoseRateUnit>, ILinearQuantity<RadiationEquivalentDoseRate>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<RadiationEquivalentDoseRate, RadiationEquivalentDoseRate, double>,
-        IMultiplyOperators<RadiationEquivalentDoseRate, Duration, RadiationEquivalentDose>,
-        IComparisonOperators<RadiationEquivalentDoseRate, RadiationEquivalentDoseRate, bool>,
-        IParsable<RadiationEquivalentDoseRate>,
+        , IMultiplyOperators<RadiationEquivalentDoseRate, Duration, RadiationEquivalentDose>
 #endif
-        IComparable,
-        IComparable<RadiationEquivalentDoseRate>,
-        IEquatable<RadiationEquivalentDoseRate>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RadiationExposure.g.cs b/UnitsNet/GeneratedCode/Quantities/RadiationExposure.g.cs
index 812da76551..dcb6b71088 100644
--- a/UnitsNet/GeneratedCode/Quantities/RadiationExposure.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RadiationExposure.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RadiationExposure :
-        IArithmeticQuantity<RadiationExposure, RadiationExposureUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<RadiationExposure, RadiationExposure, double>,
-        IComparisonOperators<RadiationExposure, RadiationExposure, bool>,
-        IParsable<RadiationExposure>,
-#endif
-        IComparable,
-        IComparable<RadiationExposure>,
-        IEquatable<RadiationExposure>,
-        IFormattable
+    public readonly partial struct RadiationExposure : IQuantity<RadiationExposure, RadiationExposureUnit>, ILinearQuantity<RadiationExposure>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Radioactivity.g.cs b/UnitsNet/GeneratedCode/Quantities/Radioactivity.g.cs
index a96a95c519..5ba53498df 100644
--- a/UnitsNet/GeneratedCode/Quantities/Radioactivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Radioactivity.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Radioactivity :
-        IArithmeticQuantity<Radioactivity, RadioactivityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Radioactivity, Radioactivity, double>,
-        IComparisonOperators<Radioactivity, Radioactivity, bool>,
-        IParsable<Radioactivity>,
-#endif
-        IComparable,
-        IComparable<Radioactivity>,
-        IEquatable<Radioactivity>,
-        IFormattable
+    public readonly partial struct Radioactivity : IQuantity<Radioactivity, RadioactivityUnit>, ILinearQuantity<Radioactivity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs b/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs
index 6512dc48b9..50f8a43c7b 100644
--- a/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Ratio :
-        IArithmeticQuantity<Ratio, RatioUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Ratio, Ratio, double>,
-        IComparisonOperators<Ratio, Ratio, bool>,
-        IParsable<Ratio>,
-#endif
-        IComparable,
-        IComparable<Ratio>,
-        IEquatable<Ratio>,
-        IFormattable
+    public readonly partial struct Ratio : IQuantity<Ratio, RatioUnit>, ILinearQuantity<Ratio>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs
index 82ae527d99..57e71d05d7 100644
--- a/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RatioChangeRate :
-        IArithmeticQuantity<RatioChangeRate, RatioChangeRateUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<RatioChangeRate, RatioChangeRate, double>,
-        IComparisonOperators<RatioChangeRate, RatioChangeRate, bool>,
-        IParsable<RatioChangeRate>,
-#endif
-        IComparable,
-        IComparable<RatioChangeRate>,
-        IEquatable<RatioChangeRate>,
-        IFormattable
+    public readonly partial struct RatioChangeRate : IQuantity<RatioChangeRate, RatioChangeRateUnit>, ILinearQuantity<RatioChangeRate>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ReciprocalArea.g.cs b/UnitsNet/GeneratedCode/Quantities/ReciprocalArea.g.cs
index fa16223844..16ceea00ab 100644
--- a/UnitsNet/GeneratedCode/Quantities/ReciprocalArea.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ReciprocalArea.g.cs
@@ -39,22 +39,14 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ReciprocalArea :
-        IArithmeticQuantity<ReciprocalArea, ReciprocalAreaUnit>,
+    public readonly partial struct ReciprocalArea : IQuantity<ReciprocalArea, ReciprocalAreaUnit>, ILinearQuantity<ReciprocalArea>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ReciprocalArea, ReciprocalArea, double>,
-        IMultiplyOperators<ReciprocalArea, Volume, Length>,
-        IMultiplyOperators<ReciprocalArea, Force, Pressure>,
-        IMultiplyOperators<ReciprocalArea, Area, Ratio>,
-        IMultiplyOperators<ReciprocalArea, Length, ReciprocalLength>,
-        IDivisionOperators<ReciprocalArea, ReciprocalLength, ReciprocalLength>,
-        IComparisonOperators<ReciprocalArea, ReciprocalArea, bool>,
-        IParsable<ReciprocalArea>,
+        , IMultiplyOperators<ReciprocalArea, Volume, Length>
+        , IMultiplyOperators<ReciprocalArea, Force, Pressure>
+        , IMultiplyOperators<ReciprocalArea, Area, Ratio>
+        , IMultiplyOperators<ReciprocalArea, Length, ReciprocalLength>
+        , IDivisionOperators<ReciprocalArea, ReciprocalLength, ReciprocalLength>
 #endif
-        IComparable,
-        IComparable<ReciprocalArea>,
-        IEquatable<ReciprocalArea>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ReciprocalLength.g.cs b/UnitsNet/GeneratedCode/Quantities/ReciprocalLength.g.cs
index 0750dace25..037ff711d8 100644
--- a/UnitsNet/GeneratedCode/Quantities/ReciprocalLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ReciprocalLength.g.cs
@@ -39,24 +39,16 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ReciprocalLength :
-        IArithmeticQuantity<ReciprocalLength, ReciprocalLengthUnit>,
+    public readonly partial struct ReciprocalLength : IQuantity<ReciprocalLength, ReciprocalLengthUnit>, ILinearQuantity<ReciprocalLength>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<ReciprocalLength, ReciprocalLength, double>,
-        IMultiplyOperators<ReciprocalLength, Volume, Area>,
-        IMultiplyOperators<ReciprocalLength, Force, ForcePerLength>,
-        IMultiplyOperators<ReciprocalLength, Area, Length>,
-        IDivisionOperators<ReciprocalLength, ReciprocalArea, Length>,
-        IMultiplyOperators<ReciprocalLength, ForcePerLength, Pressure>,
-        IMultiplyOperators<ReciprocalLength, ReciprocalLength, ReciprocalArea>,
-        IDivisionOperators<ReciprocalLength, Length, ReciprocalArea>,
-        IComparisonOperators<ReciprocalLength, ReciprocalLength, bool>,
-        IParsable<ReciprocalLength>,
+        , IMultiplyOperators<ReciprocalLength, Volume, Area>
+        , IMultiplyOperators<ReciprocalLength, Force, ForcePerLength>
+        , IMultiplyOperators<ReciprocalLength, Area, Length>
+        , IDivisionOperators<ReciprocalLength, ReciprocalArea, Length>
+        , IMultiplyOperators<ReciprocalLength, ForcePerLength, Pressure>
+        , IMultiplyOperators<ReciprocalLength, ReciprocalLength, ReciprocalArea>
+        , IDivisionOperators<ReciprocalLength, Length, ReciprocalArea>
 #endif
-        IComparable,
-        IComparable<ReciprocalLength>,
-        IEquatable<ReciprocalLength>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs b/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs
index 6c12b06e53..922236a077 100644
--- a/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RelativeHumidity :
-        IArithmeticQuantity<RelativeHumidity, RelativeHumidityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<RelativeHumidity, RelativeHumidity, double>,
-        IComparisonOperators<RelativeHumidity, RelativeHumidity, bool>,
-        IParsable<RelativeHumidity>,
-#endif
-        IComparable,
-        IComparable<RelativeHumidity>,
-        IEquatable<RelativeHumidity>,
-        IFormattable
+    public readonly partial struct RelativeHumidity : IQuantity<RelativeHumidity, RelativeHumidityUnit>, ILinearQuantity<RelativeHumidity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs
index ed0f6dde57..1735222b20 100644
--- a/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RotationalAcceleration :
-        IArithmeticQuantity<RotationalAcceleration, RotationalAccelerationUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<RotationalAcceleration, RotationalAcceleration, double>,
-        IComparisonOperators<RotationalAcceleration, RotationalAcceleration, bool>,
-        IParsable<RotationalAcceleration>,
-#endif
-        IComparable,
-        IComparable<RotationalAcceleration>,
-        IEquatable<RotationalAcceleration>,
-        IFormattable
+    public readonly partial struct RotationalAcceleration : IQuantity<RotationalAcceleration, RotationalAccelerationUnit>, ILinearQuantity<RotationalAcceleration>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs
index 7262bc7e78..783b734b78 100644
--- a/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs
@@ -36,19 +36,11 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RotationalSpeed :
-        IArithmeticQuantity<RotationalSpeed, RotationalSpeedUnit>,
+    public readonly partial struct RotationalSpeed : IQuantity<RotationalSpeed, RotationalSpeedUnit>, ILinearQuantity<RotationalSpeed>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<RotationalSpeed, RotationalSpeed, double>,
-        IMultiplyOperators<RotationalSpeed, Duration, Angle>,
-        IMultiplyOperators<RotationalSpeed, Torque, Power>,
-        IComparisonOperators<RotationalSpeed, RotationalSpeed, bool>,
-        IParsable<RotationalSpeed>,
+        , IMultiplyOperators<RotationalSpeed, Duration, Angle>
+        , IMultiplyOperators<RotationalSpeed, Torque, Power>
 #endif
-        IComparable,
-        IComparable<RotationalSpeed>,
-        IEquatable<RotationalSpeed>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs
index f2994ea8fd..8eb3f44599 100644
--- a/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs
@@ -36,20 +36,12 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RotationalStiffness :
-        IArithmeticQuantity<RotationalStiffness, RotationalStiffnessUnit>,
+    public readonly partial struct RotationalStiffness : IQuantity<RotationalStiffness, RotationalStiffnessUnit>, ILinearQuantity<RotationalStiffness>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<RotationalStiffness, RotationalStiffness, double>,
-        IDivisionOperators<RotationalStiffness, RotationalStiffnessPerLength, Length>,
-        IDivisionOperators<RotationalStiffness, Length, RotationalStiffnessPerLength>,
-        IMultiplyOperators<RotationalStiffness, Angle, Torque>,
-        IComparisonOperators<RotationalStiffness, RotationalStiffness, bool>,
-        IParsable<RotationalStiffness>,
+        , IDivisionOperators<RotationalStiffness, RotationalStiffnessPerLength, Length>
+        , IDivisionOperators<RotationalStiffness, Length, RotationalStiffnessPerLength>
+        , IMultiplyOperators<RotationalStiffness, Angle, Torque>
 #endif
-        IComparable,
-        IComparable<RotationalStiffness>,
-        IEquatable<RotationalStiffness>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
index f8eb0afebf..9952dcf713 100644
--- a/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct RotationalStiffnessPerLength :
-        IArithmeticQuantity<RotationalStiffnessPerLength, RotationalStiffnessPerLengthUnit>,
+    public readonly partial struct RotationalStiffnessPerLength : IQuantity<RotationalStiffnessPerLength, RotationalStiffnessPerLengthUnit>, ILinearQuantity<RotationalStiffnessPerLength>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<RotationalStiffnessPerLength, RotationalStiffnessPerLength, double>,
-        IMultiplyOperators<RotationalStiffnessPerLength, Length, RotationalStiffness>,
-        IComparisonOperators<RotationalStiffnessPerLength, RotationalStiffnessPerLength, bool>,
-        IParsable<RotationalStiffnessPerLength>,
+        , IMultiplyOperators<RotationalStiffnessPerLength, Length, RotationalStiffness>
 #endif
-        IComparable,
-        IComparable<RotationalStiffnessPerLength>,
-        IEquatable<RotationalStiffnessPerLength>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Scalar.g.cs b/UnitsNet/GeneratedCode/Quantities/Scalar.g.cs
index abc9a24426..25a19e6f00 100644
--- a/UnitsNet/GeneratedCode/Quantities/Scalar.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Scalar.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Scalar :
-        IArithmeticQuantity<Scalar, ScalarUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Scalar, Scalar, double>,
-        IComparisonOperators<Scalar, Scalar, bool>,
-        IParsable<Scalar>,
-#endif
-        IComparable,
-        IComparable<Scalar>,
-        IEquatable<Scalar>,
-        IFormattable
+    public readonly partial struct Scalar : IQuantity<Scalar, ScalarUnit>, ILinearQuantity<Scalar>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs b/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs
index 2a0570adc9..e5d8fcb751 100644
--- a/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct SolidAngle :
-        IArithmeticQuantity<SolidAngle, SolidAngleUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<SolidAngle, SolidAngle, double>,
-        IComparisonOperators<SolidAngle, SolidAngle, bool>,
-        IParsable<SolidAngle>,
-#endif
-        IComparable,
-        IComparable<SolidAngle>,
-        IEquatable<SolidAngle>,
-        IFormattable
+    public readonly partial struct SolidAngle : IQuantity<SolidAngle, SolidAngleUnit>, ILinearQuantity<SolidAngle>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs
index 26e37a9e26..e3ee123f92 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs
@@ -39,23 +39,15 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct SpecificEnergy :
-        IArithmeticQuantity<SpecificEnergy, SpecificEnergyUnit>,
+    public readonly partial struct SpecificEnergy : IQuantity<SpecificEnergy, SpecificEnergyUnit>, ILinearQuantity<SpecificEnergy>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<SpecificEnergy, SpecificEnergy, double>,
-        IMultiplyOperators<SpecificEnergy, Mass, Energy>,
-        IMultiplyOperators<SpecificEnergy, MassFlow, Power>,
-        IDivisionOperators<SpecificEnergy, TemperatureDelta, SpecificEntropy>,
-        IDivisionOperators<SpecificEnergy, Speed, Speed>,
-        IDivisionOperators<SpecificEnergy, SpecificEntropy, TemperatureDelta>,
-        IMultiplyOperators<SpecificEnergy, BrakeSpecificFuelConsumption, double>,
-        IComparisonOperators<SpecificEnergy, SpecificEnergy, bool>,
-        IParsable<SpecificEnergy>,
+        , IMultiplyOperators<SpecificEnergy, Mass, Energy>
+        , IMultiplyOperators<SpecificEnergy, MassFlow, Power>
+        , IDivisionOperators<SpecificEnergy, TemperatureDelta, SpecificEntropy>
+        , IDivisionOperators<SpecificEnergy, Speed, Speed>
+        , IDivisionOperators<SpecificEnergy, SpecificEntropy, TemperatureDelta>
+        , IMultiplyOperators<SpecificEnergy, BrakeSpecificFuelConsumption, double>
 #endif
-        IComparable,
-        IComparable<SpecificEnergy>,
-        IEquatable<SpecificEnergy>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs
index 97c2ee7c4c..8cba65d3d7 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs
@@ -36,19 +36,11 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct SpecificEntropy :
-        IArithmeticQuantity<SpecificEntropy, SpecificEntropyUnit>,
+    public readonly partial struct SpecificEntropy : IQuantity<SpecificEntropy, SpecificEntropyUnit>, ILinearQuantity<SpecificEntropy>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<SpecificEntropy, SpecificEntropy, double>,
-        IMultiplyOperators<SpecificEntropy, Mass, Entropy>,
-        IMultiplyOperators<SpecificEntropy, TemperatureDelta, SpecificEnergy>,
-        IComparisonOperators<SpecificEntropy, SpecificEntropy, bool>,
-        IParsable<SpecificEntropy>,
+        , IMultiplyOperators<SpecificEntropy, Mass, Entropy>
+        , IMultiplyOperators<SpecificEntropy, TemperatureDelta, SpecificEnergy>
 #endif
-        IComparable,
-        IComparable<SpecificEntropy>,
-        IEquatable<SpecificEntropy>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
index 0bbf00f424..972cd0e096 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct SpecificFuelConsumption :
-        IArithmeticQuantity<SpecificFuelConsumption, SpecificFuelConsumptionUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<SpecificFuelConsumption, SpecificFuelConsumption, double>,
-        IComparisonOperators<SpecificFuelConsumption, SpecificFuelConsumption, bool>,
-        IParsable<SpecificFuelConsumption>,
-#endif
-        IComparable,
-        IComparable<SpecificFuelConsumption>,
-        IEquatable<SpecificFuelConsumption>,
-        IFormattable
+    public readonly partial struct SpecificFuelConsumption : IQuantity<SpecificFuelConsumption, SpecificFuelConsumptionUnit>, ILinearQuantity<SpecificFuelConsumption>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs
index 7ef2f228ec..d8d3897b79 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct SpecificVolume :
-        IArithmeticQuantity<SpecificVolume, SpecificVolumeUnit>,
+    public readonly partial struct SpecificVolume : IQuantity<SpecificVolume, SpecificVolumeUnit>, ILinearQuantity<SpecificVolume>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<SpecificVolume, SpecificVolume, double>,
-        IMultiplyOperators<SpecificVolume, Mass, Volume>,
-        IComparisonOperators<SpecificVolume, SpecificVolume, bool>,
-        IParsable<SpecificVolume>,
+        , IMultiplyOperators<SpecificVolume, Mass, Volume>
 #endif
-        IComparable,
-        IComparable<SpecificVolume>,
-        IEquatable<SpecificVolume>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs
index 5903a099c5..dd5ae33f9d 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs
@@ -39,21 +39,13 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct SpecificWeight :
-        IArithmeticQuantity<SpecificWeight, SpecificWeightUnit>,
+    public readonly partial struct SpecificWeight : IQuantity<SpecificWeight, SpecificWeightUnit>, ILinearQuantity<SpecificWeight>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<SpecificWeight, SpecificWeight, double>,
-        IDivisionOperators<SpecificWeight, Density, Acceleration>,
-        IDivisionOperators<SpecificWeight, Acceleration, Density>,
-        IMultiplyOperators<SpecificWeight, Area, ForcePerLength>,
-        IMultiplyOperators<SpecificWeight, Length, Pressure>,
-        IComparisonOperators<SpecificWeight, SpecificWeight, bool>,
-        IParsable<SpecificWeight>,
+        , IDivisionOperators<SpecificWeight, Density, Acceleration>
+        , IDivisionOperators<SpecificWeight, Acceleration, Density>
+        , IMultiplyOperators<SpecificWeight, Area, ForcePerLength>
+        , IMultiplyOperators<SpecificWeight, Length, Pressure>
 #endif
-        IComparable,
-        IComparable<SpecificWeight>,
-        IEquatable<SpecificWeight>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Speed.g.cs b/UnitsNet/GeneratedCode/Quantities/Speed.g.cs
index 35a005752d..efd84dc90a 100644
--- a/UnitsNet/GeneratedCode/Quantities/Speed.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Speed.g.cs
@@ -36,25 +36,17 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Speed :
-        IArithmeticQuantity<Speed, SpeedUnit>,
+    public readonly partial struct Speed : IQuantity<Speed, SpeedUnit>, ILinearQuantity<Speed>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Speed, Speed, double>,
-        IDivisionOperators<Speed, Duration, Acceleration>,
-        IDivisionOperators<Speed, Acceleration, Duration>,
-        IMultiplyOperators<Speed, Length, KinematicViscosity>,
-        IMultiplyOperators<Speed, Duration, Length>,
-        IMultiplyOperators<Speed, Density, MassFlux>,
-        IMultiplyOperators<Speed, Force, Power>,
-        IMultiplyOperators<Speed, Speed, SpecificEnergy>,
-        IMultiplyOperators<Speed, Area, VolumeFlow>,
-        IComparisonOperators<Speed, Speed, bool>,
-        IParsable<Speed>,
+        , IDivisionOperators<Speed, Duration, Acceleration>
+        , IDivisionOperators<Speed, Acceleration, Duration>
+        , IMultiplyOperators<Speed, Length, KinematicViscosity>
+        , IMultiplyOperators<Speed, Duration, Length>
+        , IMultiplyOperators<Speed, Density, MassFlux>
+        , IMultiplyOperators<Speed, Force, Power>
+        , IMultiplyOperators<Speed, Speed, SpecificEnergy>
+        , IMultiplyOperators<Speed, Area, VolumeFlow>
 #endif
-        IComparable,
-        IComparable<Speed>,
-        IEquatable<Speed>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/StandardVolumeFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
index 34a3c09609..f187baca26 100644
--- a/UnitsNet/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct StandardVolumeFlow :
-        IArithmeticQuantity<StandardVolumeFlow, StandardVolumeFlowUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<StandardVolumeFlow, StandardVolumeFlow, double>,
-        IComparisonOperators<StandardVolumeFlow, StandardVolumeFlow, bool>,
-        IParsable<StandardVolumeFlow>,
-#endif
-        IComparable,
-        IComparable<StandardVolumeFlow>,
-        IEquatable<StandardVolumeFlow>,
-        IFormattable
+    public readonly partial struct StandardVolumeFlow : IQuantity<StandardVolumeFlow, StandardVolumeFlowUnit>, ILinearQuantity<StandardVolumeFlow>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs b/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs
index 94e66aff64..33882d3ca7 100644
--- a/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs
@@ -36,16 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Temperature :
-        IAffineQuantity<Temperature, TemperatureUnit, TemperatureDelta>,
-#if NET7_0_OR_GREATER
-        IComparisonOperators<Temperature, Temperature, bool>,
-        IParsable<Temperature>,
-#endif
-        IComparable,
-        IComparable<Temperature>,
-        IEquatable<Temperature>,
-        IFormattable
+    public readonly partial struct Temperature : IQuantity<Temperature, TemperatureUnit>, IAffineQuantity<Temperature, TemperatureDelta>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
index 1fac793995..76725227cd 100644
--- a/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct TemperatureChangeRate :
-        IArithmeticQuantity<TemperatureChangeRate, TemperatureChangeRateUnit>,
+    public readonly partial struct TemperatureChangeRate : IQuantity<TemperatureChangeRate, TemperatureChangeRateUnit>, ILinearQuantity<TemperatureChangeRate>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<TemperatureChangeRate, TemperatureChangeRate, double>,
-        IMultiplyOperators<TemperatureChangeRate, Duration, TemperatureDelta>,
-        IComparisonOperators<TemperatureChangeRate, TemperatureChangeRate, bool>,
-        IParsable<TemperatureChangeRate>,
+        , IMultiplyOperators<TemperatureChangeRate, Duration, TemperatureDelta>
 #endif
-        IComparable,
-        IComparable<TemperatureChangeRate>,
-        IEquatable<TemperatureChangeRate>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs b/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs
index 6951bd5d09..79a933c636 100644
--- a/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs
@@ -36,24 +36,16 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct TemperatureDelta :
-        IArithmeticQuantity<TemperatureDelta, TemperatureDeltaUnit>,
+    public readonly partial struct TemperatureDelta : IQuantity<TemperatureDelta, TemperatureDeltaUnit>, ILinearQuantity<TemperatureDelta>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<TemperatureDelta, TemperatureDelta, double>,
-        IDivisionOperators<TemperatureDelta, TemperatureChangeRate, Duration>,
-        IMultiplyOperators<TemperatureDelta, Entropy, Energy>,
-        IDivisionOperators<TemperatureDelta, TemperatureGradient, Length>,
-        IMultiplyOperators<TemperatureDelta, CoefficientOfThermalExpansion, Ratio>,
-        IMultiplyOperators<TemperatureDelta, SpecificEntropy, SpecificEnergy>,
-        IDivisionOperators<TemperatureDelta, Duration, TemperatureChangeRate>,
-        IDivisionOperators<TemperatureDelta, Length, TemperatureGradient>,
-        IComparisonOperators<TemperatureDelta, TemperatureDelta, bool>,
-        IParsable<TemperatureDelta>,
+        , IDivisionOperators<TemperatureDelta, TemperatureChangeRate, Duration>
+        , IMultiplyOperators<TemperatureDelta, Entropy, Energy>
+        , IDivisionOperators<TemperatureDelta, TemperatureGradient, Length>
+        , IMultiplyOperators<TemperatureDelta, CoefficientOfThermalExpansion, Ratio>
+        , IMultiplyOperators<TemperatureDelta, SpecificEntropy, SpecificEnergy>
+        , IDivisionOperators<TemperatureDelta, Duration, TemperatureChangeRate>
+        , IDivisionOperators<TemperatureDelta, Length, TemperatureGradient>
 #endif
-        IComparable,
-        IComparable<TemperatureDelta>,
-        IEquatable<TemperatureDelta>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/TemperatureGradient.g.cs b/UnitsNet/GeneratedCode/Quantities/TemperatureGradient.g.cs
index f215eb31ca..16baea4113 100644
--- a/UnitsNet/GeneratedCode/Quantities/TemperatureGradient.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/TemperatureGradient.g.cs
@@ -36,18 +36,10 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct TemperatureGradient :
-        IArithmeticQuantity<TemperatureGradient, TemperatureGradientUnit>,
+    public readonly partial struct TemperatureGradient : IQuantity<TemperatureGradient, TemperatureGradientUnit>, ILinearQuantity<TemperatureGradient>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<TemperatureGradient, TemperatureGradient, double>,
-        IMultiplyOperators<TemperatureGradient, Length, TemperatureDelta>,
-        IComparisonOperators<TemperatureGradient, TemperatureGradient, bool>,
-        IParsable<TemperatureGradient>,
+        , IMultiplyOperators<TemperatureGradient, Length, TemperatureDelta>
 #endif
-        IComparable,
-        IComparable<TemperatureGradient>,
-        IEquatable<TemperatureGradient>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs
index 3821de1292..28d35890ab 100644
--- a/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ThermalConductivity :
-        IArithmeticQuantity<ThermalConductivity, ThermalConductivityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ThermalConductivity, ThermalConductivity, double>,
-        IComparisonOperators<ThermalConductivity, ThermalConductivity, bool>,
-        IParsable<ThermalConductivity>,
-#endif
-        IComparable,
-        IComparable<ThermalConductivity>,
-        IEquatable<ThermalConductivity>,
-        IFormattable
+    public readonly partial struct ThermalConductivity : IQuantity<ThermalConductivity, ThermalConductivityUnit>, ILinearQuantity<ThermalConductivity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalInsulance.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalInsulance.g.cs
index 3c08dc9c5a..ea9597c73a 100644
--- a/UnitsNet/GeneratedCode/Quantities/ThermalInsulance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ThermalInsulance.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ThermalInsulance :
-        IArithmeticQuantity<ThermalInsulance, ThermalInsulanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ThermalInsulance, ThermalInsulance, double>,
-        IComparisonOperators<ThermalInsulance, ThermalInsulance, bool>,
-        IParsable<ThermalInsulance>,
-#endif
-        IComparable,
-        IComparable<ThermalInsulance>,
-        IEquatable<ThermalInsulance>,
-        IFormattable
+    public readonly partial struct ThermalInsulance : IQuantity<ThermalInsulance, ThermalInsulanceUnit>, ILinearQuantity<ThermalInsulance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs
index 11693deb43..f89c344a49 100644
--- a/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct ThermalResistance :
-        IArithmeticQuantity<ThermalResistance, ThermalResistanceUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<ThermalResistance, ThermalResistance, double>,
-        IComparisonOperators<ThermalResistance, ThermalResistance, bool>,
-        IParsable<ThermalResistance>,
-#endif
-        IComparable,
-        IComparable<ThermalResistance>,
-        IEquatable<ThermalResistance>,
-        IFormattable
+    public readonly partial struct ThermalResistance : IQuantity<ThermalResistance, ThermalResistanceUnit>, ILinearQuantity<ThermalResistance>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Torque.g.cs b/UnitsNet/GeneratedCode/Quantities/Torque.g.cs
index 8a260baeef..b26e16436a 100644
--- a/UnitsNet/GeneratedCode/Quantities/Torque.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Torque.g.cs
@@ -36,24 +36,16 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Torque :
-        IArithmeticQuantity<Torque, TorqueUnit>,
+    public readonly partial struct Torque : IQuantity<Torque, TorqueUnit>, ILinearQuantity<Torque>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Torque, Torque, double>,
-        IDivisionOperators<Torque, RotationalStiffness, Angle>,
-        IDivisionOperators<Torque, ForcePerLength, Area>,
-        IDivisionOperators<Torque, Length, Force>,
-        IDivisionOperators<Torque, Area, ForcePerLength>,
-        IDivisionOperators<Torque, Force, Length>,
-        IMultiplyOperators<Torque, RotationalSpeed, Power>,
-        IDivisionOperators<Torque, Angle, RotationalStiffness>,
-        IComparisonOperators<Torque, Torque, bool>,
-        IParsable<Torque>,
+        , IDivisionOperators<Torque, RotationalStiffness, Angle>
+        , IDivisionOperators<Torque, ForcePerLength, Area>
+        , IDivisionOperators<Torque, Length, Force>
+        , IDivisionOperators<Torque, Area, ForcePerLength>
+        , IDivisionOperators<Torque, Force, Length>
+        , IMultiplyOperators<Torque, RotationalSpeed, Power>
+        , IDivisionOperators<Torque, Angle, RotationalStiffness>
 #endif
-        IComparable,
-        IComparable<Torque>,
-        IEquatable<Torque>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs b/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs
index 483b6c6be3..2cd96f9654 100644
--- a/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Turbidity :
-        IArithmeticQuantity<Turbidity, TurbidityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<Turbidity, Turbidity, double>,
-        IComparisonOperators<Turbidity, Turbidity, bool>,
-        IParsable<Turbidity>,
-#endif
-        IComparable,
-        IComparable<Turbidity>,
-        IEquatable<Turbidity>,
-        IFormattable
+    public readonly partial struct Turbidity : IQuantity<Turbidity, TurbidityUnit>, ILinearQuantity<Turbidity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs b/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs
index 1528ba9318..01af6ae7c0 100644
--- a/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct VitaminA :
-        IArithmeticQuantity<VitaminA, VitaminAUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<VitaminA, VitaminA, double>,
-        IComparisonOperators<VitaminA, VitaminA, bool>,
-        IParsable<VitaminA>,
-#endif
-        IComparable,
-        IComparable<VitaminA>,
-        IEquatable<VitaminA>,
-        IFormattable
+    public readonly partial struct VitaminA : IQuantity<VitaminA, VitaminAUnit>, ILinearQuantity<VitaminA>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/Volume.g.cs b/UnitsNet/GeneratedCode/Quantities/Volume.g.cs
index 223437b961..c82b027571 100644
--- a/UnitsNet/GeneratedCode/Quantities/Volume.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Volume.g.cs
@@ -36,30 +36,22 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct Volume :
-        IArithmeticQuantity<Volume, VolumeUnit>,
+    public readonly partial struct Volume : IQuantity<Volume, VolumeUnit>, ILinearQuantity<Volume>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<Volume, Volume, double>,
-        IMultiplyOperators<Volume, Molarity, AmountOfSubstance>,
-        IMultiplyOperators<Volume, ReciprocalLength, Area>,
-        IDivisionOperators<Volume, Length, Area>,
-        IMultiplyOperators<Volume, Length, AreaMomentOfInertia>,
-        IDivisionOperators<Volume, VolumeFlow, Duration>,
-        IMultiplyOperators<Volume, EnergyDensity, Energy>,
-        IMultiplyOperators<Volume, ReciprocalArea, Length>,
-        IDivisionOperators<Volume, Area, Length>,
-        IMultiplyOperators<Volume, Density, Mass>,
-        IMultiplyOperators<Volume, MassConcentration, Mass>,
-        IDivisionOperators<Volume, SpecificVolume, Mass>,
-        IDivisionOperators<Volume, Mass, SpecificVolume>,
-        IDivisionOperators<Volume, Duration, VolumeFlow>,
-        IComparisonOperators<Volume, Volume, bool>,
-        IParsable<Volume>,
+        , IMultiplyOperators<Volume, Molarity, AmountOfSubstance>
+        , IMultiplyOperators<Volume, ReciprocalLength, Area>
+        , IDivisionOperators<Volume, Length, Area>
+        , IMultiplyOperators<Volume, Length, AreaMomentOfInertia>
+        , IDivisionOperators<Volume, VolumeFlow, Duration>
+        , IMultiplyOperators<Volume, EnergyDensity, Energy>
+        , IMultiplyOperators<Volume, ReciprocalArea, Length>
+        , IDivisionOperators<Volume, Area, Length>
+        , IMultiplyOperators<Volume, Density, Mass>
+        , IMultiplyOperators<Volume, MassConcentration, Mass>
+        , IDivisionOperators<Volume, SpecificVolume, Mass>
+        , IDivisionOperators<Volume, Mass, SpecificVolume>
+        , IDivisionOperators<Volume, Duration, VolumeFlow>
 #endif
-        IComparable,
-        IComparable<Volume>,
-        IEquatable<Volume>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs
index 2b33114983..dfc2040541 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs
@@ -39,19 +39,11 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct VolumeConcentration :
-        IArithmeticQuantity<VolumeConcentration, VolumeConcentrationUnit>,
+    public readonly partial struct VolumeConcentration : IQuantity<VolumeConcentration, VolumeConcentrationUnit>, ILinearQuantity<VolumeConcentration>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<VolumeConcentration, VolumeConcentration, double>,
-        IMultiplyOperators<VolumeConcentration, Density, MassConcentration>,
-        IMultiplyOperators<VolumeConcentration, Molarity, Molarity>,
-        IComparisonOperators<VolumeConcentration, VolumeConcentration, bool>,
-        IParsable<VolumeConcentration>,
+        , IMultiplyOperators<VolumeConcentration, Density, MassConcentration>
+        , IMultiplyOperators<VolumeConcentration, Molarity, Molarity>
 #endif
-        IComparable,
-        IComparable<VolumeConcentration>,
-        IEquatable<VolumeConcentration>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs
index 95ab4f9d45..8503a98ba6 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs
@@ -36,22 +36,14 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct VolumeFlow :
-        IArithmeticQuantity<VolumeFlow, VolumeFlowUnit>,
+    public readonly partial struct VolumeFlow : IQuantity<VolumeFlow, VolumeFlowUnit>, ILinearQuantity<VolumeFlow>
 #if NET7_0_OR_GREATER
-        IDivisionOperators<VolumeFlow, VolumeFlow, double>,
-        IDivisionOperators<VolumeFlow, Speed, Area>,
-        IMultiplyOperators<VolumeFlow, Density, MassFlow>,
-        IMultiplyOperators<VolumeFlow, Molarity, MolarFlow>,
-        IDivisionOperators<VolumeFlow, Area, Speed>,
-        IMultiplyOperators<VolumeFlow, Duration, Volume>,
-        IComparisonOperators<VolumeFlow, VolumeFlow, bool>,
-        IParsable<VolumeFlow>,
+        , IDivisionOperators<VolumeFlow, Speed, Area>
+        , IMultiplyOperators<VolumeFlow, Density, MassFlow>
+        , IMultiplyOperators<VolumeFlow, Molarity, MolarFlow>
+        , IDivisionOperators<VolumeFlow, Area, Speed>
+        , IMultiplyOperators<VolumeFlow, Duration, Volume>
 #endif
-        IComparable,
-        IComparable<VolumeFlow>,
-        IEquatable<VolumeFlow>,
-        IFormattable
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
index e184bb5cd8..02a222645c 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct VolumeFlowPerArea :
-        IArithmeticQuantity<VolumeFlowPerArea, VolumeFlowPerAreaUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<VolumeFlowPerArea, VolumeFlowPerArea, double>,
-        IComparisonOperators<VolumeFlowPerArea, VolumeFlowPerArea, bool>,
-        IParsable<VolumeFlowPerArea>,
-#endif
-        IComparable,
-        IComparable<VolumeFlowPerArea>,
-        IEquatable<VolumeFlowPerArea>,
-        IFormattable
+    public readonly partial struct VolumeFlowPerArea : IQuantity<VolumeFlowPerArea, VolumeFlowPerAreaUnit>, ILinearQuantity<VolumeFlowPerArea>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs
index ce3022be10..d819563a30 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct VolumePerLength :
-        IArithmeticQuantity<VolumePerLength, VolumePerLengthUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<VolumePerLength, VolumePerLength, double>,
-        IComparisonOperators<VolumePerLength, VolumePerLength, bool>,
-        IParsable<VolumePerLength>,
-#endif
-        IComparable,
-        IComparable<VolumePerLength>,
-        IEquatable<VolumePerLength>,
-        IFormattable
+    public readonly partial struct VolumePerLength : IQuantity<VolumePerLength, VolumePerLengthUnit>, ILinearQuantity<VolumePerLength>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
index 650743addb..6363be1a85 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
@@ -39,17 +39,7 @@ namespace UnitsNet
     /// </remarks>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct VolumetricHeatCapacity :
-        IArithmeticQuantity<VolumetricHeatCapacity, VolumetricHeatCapacityUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<VolumetricHeatCapacity, VolumetricHeatCapacity, double>,
-        IComparisonOperators<VolumetricHeatCapacity, VolumetricHeatCapacity, bool>,
-        IParsable<VolumetricHeatCapacity>,
-#endif
-        IComparable,
-        IComparable<VolumetricHeatCapacity>,
-        IEquatable<VolumetricHeatCapacity>,
-        IFormattable
+    public readonly partial struct VolumetricHeatCapacity : IQuantity<VolumetricHeatCapacity, VolumetricHeatCapacityUnit>, ILinearQuantity<VolumetricHeatCapacity>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
index bd87fe23e2..eaff5ee15f 100644
--- a/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
@@ -36,17 +36,7 @@ namespace UnitsNet
     /// </summary>
     [DataContract]
     [DebuggerTypeProxy(typeof(QuantityDisplay))]
-    public readonly partial struct WarpingMomentOfInertia :
-        IArithmeticQuantity<WarpingMomentOfInertia, WarpingMomentOfInertiaUnit>,
-#if NET7_0_OR_GREATER
-        IDivisionOperators<WarpingMomentOfInertia, WarpingMomentOfInertia, double>,
-        IComparisonOperators<WarpingMomentOfInertia, WarpingMomentOfInertia, bool>,
-        IParsable<WarpingMomentOfInertia>,
-#endif
-        IComparable,
-        IComparable<WarpingMomentOfInertia>,
-        IEquatable<WarpingMomentOfInertia>,
-        IFormattable
+    public readonly partial struct WarpingMomentOfInertia : IQuantity<WarpingMomentOfInertia, WarpingMomentOfInertiaUnit>, ILinearQuantity<WarpingMomentOfInertia>
     {
         /// <summary>
         ///     The numeric value this quantity was constructed with.
diff --git a/UnitsNet/IAffineQuantity.cs b/UnitsNet/IAffineQuantity.cs
index 0a8028f784..7820473e19 100644
--- a/UnitsNet/IAffineQuantity.cs
+++ b/UnitsNet/IAffineQuantity.cs
@@ -7,23 +7,6 @@
 
 namespace UnitsNet;
 
-/// <summary>
-///     An <see cref="IQuantity{TSelf, TUnitType}"/> that (in .NET 7+) implements generic math interfaces for arithmetic operations.
-/// </summary>
-/// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
-/// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
-/// <typeparam name="TOffset"></typeparam>
-public interface IAffineQuantity<TSelf, TUnitType, TOffset> : IQuantity<TSelf, TUnitType>, IAffineQuantity<TSelf, TOffset>
-#if NET7_0_OR_GREATER
-    , IAdditionOperators<TSelf, TOffset, TSelf>
-    , ISubtractionOperators<TSelf, TSelf, TOffset>
-    where TOffset : IAdditiveIdentity<TOffset, TOffset>
-#endif
-    where TSelf : IAffineQuantity<TSelf, TUnitType, TOffset>
-    where TUnitType : struct, Enum
-{
-}
-
 /// <summary>
 ///     An <see cref="IQuantity{TSelf}"/> that (in .NET 7+) implements generic math interfaces for arithmetic operations.
 /// </summary>
@@ -32,6 +15,8 @@ public interface IAffineQuantity<TSelf, TUnitType, TOffset> : IQuantity<TSelf, T
 public interface IAffineQuantity<TSelf, TOffset> : IQuantityOfType<TSelf>
 #if NET7_0_OR_GREATER
     , IAdditiveIdentity<TSelf, TOffset>
+    , IAdditionOperators<TSelf, TOffset, TSelf>
+    , ISubtractionOperators<TSelf, TSelf, TOffset>
     where TOffset : IAdditiveIdentity<TOffset, TOffset>
 #endif
     where TSelf : IAffineQuantity<TSelf, TOffset>
diff --git a/UnitsNet/IArithmeticQuantity.cs b/UnitsNet/IArithmeticQuantity.cs
index d9d075d19e..86615a4c5a 100644
--- a/UnitsNet/IArithmeticQuantity.cs
+++ b/UnitsNet/IArithmeticQuantity.cs
@@ -7,60 +7,19 @@
 
 namespace UnitsNet;
 
-/// <summary>
-///     Represents a quantity that has both magnitude and direction, supporting various arithmetic operations and
-///     comparisons.
-/// </summary>
-/// <remarks>
-///     This interface defines standard linear arithmetic operations such as addition, subtraction, multiplication, and
-///     division.
-///     These types of quantities naturally support comparison operations with either absolute or relative tolerance, which
-///     is useful for determining equality within a certain margin of error.
-///     <para>
-///         For more information, see the Wikipedia page on
-///         <a href="https://en.wikipedia.org/wiki/Dimensional_analysis#Geometry:_position_vs._displacement">
-///             Dimensional
-///             Analysis
-///         </a>
-///         .
-///     </para>
-/// </remarks>
-/// <typeparam name="TSelf">The type that implements this interface.</typeparam>
-public interface ILinearQuantity<TSelf> : IQuantityOfType<TSelf>
-#if NET7_0_OR_GREATER
-    , IAdditiveIdentity<TSelf, TSelf>
-#endif
-    where TSelf : ILinearQuantity<TSelf>
-{
-#if NET7_0_OR_GREATER
-    /// <summary>
-    ///     The zero value of this quantity.
-    /// </summary>
-    static abstract TSelf Zero { get; }
-
-    static TSelf IAdditiveIdentity<TSelf, TSelf>.AdditiveIdentity
-    {
-        get => TSelf.Zero;
-    }
-
-#endif
-}
-
 /// <summary>
 ///     An <see cref="IQuantity{TSelf, TUnitType}" /> that (in .NET 7+) implements generic math interfaces for arithmetic
 ///     operations.
 /// </summary>
 /// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
-/// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
-public interface IArithmeticQuantity<TSelf, TUnitType> : IQuantity<TSelf, TUnitType>, ILinearQuantity<TSelf>
+public interface IArithmeticQuantity<TSelf>
 #if NET7_0_OR_GREATER
-    , IAdditionOperators<TSelf, TSelf, TSelf>
+    : IAdditionOperators<TSelf, TSelf, TSelf>
     , ISubtractionOperators<TSelf, TSelf, TSelf>
     , IMultiplyOperators<TSelf, double, TSelf>
     , IDivisionOperators<TSelf, double, TSelf>
     , IUnaryNegationOperators<TSelf, TSelf>
 #endif
-    where TSelf : IArithmeticQuantity<TSelf, TUnitType>
-    where TUnitType : struct, Enum
+    where TSelf : IArithmeticQuantity<TSelf>
 {
 }
diff --git a/UnitsNet/ILinearQuantity.cs b/UnitsNet/ILinearQuantity.cs
new file mode 100644
index 0000000000..d7d3bb4e05
--- /dev/null
+++ b/UnitsNet/ILinearQuantity.cs
@@ -0,0 +1,47 @@
+// Licensed under MIT No Attribution, see LICENSE file at the root.
+// Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
+
+#if NET
+using System.Numerics;
+#endif
+
+namespace UnitsNet;
+
+/// <summary>
+///     Represents a quantity that has both magnitude and direction, supporting various arithmetic operations and
+///     comparisons.
+/// </summary>
+/// <remarks>
+///     This interface defines standard linear arithmetic operations such as addition, subtraction, multiplication, and
+///     division.
+///     These types of quantities naturally support comparison operations with either absolute or relative tolerance, which
+///     is useful for determining equality within a certain margin of error.
+///     <para>
+///         For more information, see the Wikipedia page on
+///         <a href="https://en.wikipedia.org/wiki/Dimensional_analysis#Geometry:_position_vs._displacement">
+///             Dimensional
+///             Analysis
+///         </a>
+///         .
+///     </para>
+/// </remarks>
+/// <typeparam name="TSelf">The type that implements this interface.</typeparam>
+public interface ILinearQuantity<TSelf> : IQuantityOfType<TSelf>, IArithmeticQuantity<TSelf>
+#if NET7_0_OR_GREATER
+    , IAdditiveIdentity<TSelf, TSelf>
+#endif
+    where TSelf : ILinearQuantity<TSelf>
+{
+#if NET7_0_OR_GREATER
+    /// <summary>
+    ///     The zero value of this quantity.
+    /// </summary>
+    static abstract TSelf Zero { get; }
+
+    static TSelf IAdditiveIdentity<TSelf, TSelf>.AdditiveIdentity
+    {
+        get => TSelf.Zero;
+    }
+
+#endif
+}
diff --git a/UnitsNet/ILogarithmicQuantity.cs b/UnitsNet/ILogarithmicQuantity.cs
index eb35775ac1..425f7abccc 100644
--- a/UnitsNet/ILogarithmicQuantity.cs
+++ b/UnitsNet/ILogarithmicQuantity.cs
@@ -7,22 +7,6 @@
 
 namespace UnitsNet;
 
-/// <inheritdoc cref="ILogarithmicQuantity{TSelf}"/>
-/// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
-/// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
-public interface ILogarithmicQuantity<TSelf, TUnitType> : IQuantity<TSelf, TUnitType>, ILogarithmicQuantity<TSelf>
-#if NET7_0_OR_GREATER
-    , IAdditionOperators<TSelf, TSelf, TSelf>
-    , ISubtractionOperators<TSelf, TSelf, TSelf>
-    , IMultiplyOperators<TSelf, double, TSelf>
-    , IDivisionOperators<TSelf, double, TSelf>
-    , IUnaryNegationOperators<TSelf, TSelf>
-#endif
-    where TSelf : ILogarithmicQuantity<TSelf, TUnitType>
-    where TUnitType : struct, Enum
-{
-}
-
 /// <summary>
 ///     Represents a logarithmic quantity that supports arithmetic operations and implements generic math interfaces 
 ///     (in .NET 7+). This interface is designed for quantities that are logarithmic in nature, such as decibels.
@@ -34,7 +18,7 @@ public interface ILogarithmicQuantity<TSelf, TUnitType> : IQuantity<TSelf, TUnit
 ///     to logarithmic quantities, including arithmetic operations and a logarithmic scaling factor.
 ///     The logarithmic scale assumed here is base-10.
 /// </remarks>
-public interface ILogarithmicQuantity<TSelf> : IQuantityOfType<TSelf>
+public interface ILogarithmicQuantity<TSelf> : IQuantityOfType<TSelf>, IArithmeticQuantity<TSelf>
 #if NET7_0_OR_GREATER
     , IMultiplicativeIdentity<TSelf, TSelf>
 #endif
diff --git a/UnitsNet/IQuantity.cs b/UnitsNet/IQuantity.cs
index 149b3f9dd0..4d1e0af4dc 100644
--- a/UnitsNet/IQuantity.cs
+++ b/UnitsNet/IQuantity.cs
@@ -1,12 +1,14 @@
 // Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
+using System.Numerics;
+
 namespace UnitsNet
 {
     /// <summary>
     ///     Represents a quantity.
     /// </summary>
-    public interface IQuantity : IFormattable
+    public interface IQuantity : IComparable, IFormattable
     {
         /// <summary>
         ///     Information about the quantity type, such as unit values and names.
@@ -117,8 +119,18 @@ Enum IQuantity.Unit
     ///     methods, without having to include the unit type as additional generic parameter.
     /// </remarks>
     /// <typeparam name="TQuantity"></typeparam>
-    public interface IQuantityOfType<out TQuantity> : IQuantity
+    public interface IQuantityOfType<TQuantity> : IQuantity
+#if NET7_0_OR_GREATER
+        , IComparisonOperators<TQuantity, TQuantity, bool>
+        , IParsable<TQuantity>
+#endif
+        , IComparable<TQuantity>
+        , IEquatable<TQuantity>
         where TQuantity : IQuantity
+#if NET7_0_OR_GREATER
+        , IComparisonOperators<TQuantity, TQuantity, bool>
+        , IParsable<TQuantity>
+#endif
     {
 #if NET
         /// <summary>