diff --git a/Common/UnitDefinitions/FluidResistance.json b/Common/UnitDefinitions/FluidResistance.json
index 1c2c3b2692..6b90951bdc 100644
--- a/Common/UnitDefinitions/FluidResistance.json
+++ b/Common/UnitDefinitions/FluidResistance.json
@@ -12,11 +12,6 @@
     {
       "SingularName": "PascalSecondPerLiter",
       "PluralName": "PascalSecondsPerLiter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 1e3",
       "FromBaseToUnitFunc": "{x} / 1e3",
       "Localization": [
@@ -36,7 +31,7 @@
       "BaseUnits": {
         "M": "Kilogram",
         "L": "Meter",
-        "T": "Second"
+        "T": "Minute"
       },
       "FromUnitToBaseFunc": "{x} * 6e4",
       "FromBaseToUnitFunc": "{x} / 6e4",
@@ -55,7 +50,7 @@
       "SingularName": "PascalSecondPerMilliliter",
       "PluralName": "PascalSecondsPerMilliliter",
       "BaseUnits": {
-        "M": "Kilogram",
+        "M": "Gram",
         "L": "Meter",
         "T": "Second"
       },
@@ -75,11 +70,6 @@
     {
       "SingularName": "PascalMinutePerMilliliter",
       "PluralName": "PascalMinutesPerMilliliter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 6e7",
       "FromBaseToUnitFunc": "{x} / 6e7",
       "Localization": [
@@ -121,7 +111,7 @@
       "BaseUnits": {
         "M": "Kilogram",
         "L": "Meter",
-        "T": "Second"
+        "T": "Minute"
       },
       "FromUnitToBaseFunc": "{x} * 60",
       "FromBaseToUnitFunc": "{x} / 60",
@@ -139,11 +129,6 @@
     {
       "SingularName": "PascalSecondPerCubicCentimeter",
       "PluralName": "PascalSecondsPerCubicCentimeter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 1e6",
       "FromBaseToUnitFunc": "{x} / 1e6",
       "Localization": [
@@ -160,11 +145,6 @@
     {
       "SingularName": "PascalMinutePerCubicCentimeter",
       "PluralName": "PascalMinutesPerCubicCentimeter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 6e7",
       "FromBaseToUnitFunc": "{x} / 6e7",
       "Localization": [
@@ -181,11 +161,6 @@
     {
       "SingularName": "DyneSecondPerCentimeterToTheFifth",
       "PluralName": "DyneSecondsPerCentimeterToTheFifth",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 1e5",
       "FromBaseToUnitFunc": "{x} / 1e5",
       "XmlDocRemarks": "https://en.wikipedia.org/wiki/Vascular_resistance",
@@ -203,11 +178,6 @@
     {
       "SingularName": "MillimeterMercurySecondPerLiter",
       "PluralName": "MillimeterMercurySecondsPerLiter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 1.33322368e5",
       "FromBaseToUnitFunc": "{x} / 1.33322368e5",
       "Localization": [
@@ -224,11 +194,6 @@
     {
       "SingularName": "MillimeterMercuryMinutePerLiter",
       "PluralName": "MillimeterMercuryMinutesPerLiter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 7.99934208e6",
       "FromBaseToUnitFunc": "{x} / 7.99934208e6",
       "Localization": [
@@ -245,11 +210,6 @@
     {
       "SingularName": "MillimeterMercurySecondPerMilliliter",
       "PluralName": "MillimeterMercurySecondsPerMilliliter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 1.33322368e8",
       "FromBaseToUnitFunc": "{x} / 1.33322368e8",
       "Localization": [
@@ -266,11 +226,6 @@
     {
       "SingularName": "MillimeterMercuryMinutePerMilliliter",
       "PluralName": "MillimeterMercuryMinutesPerMilliliter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 7.99934208e9",
       "FromBaseToUnitFunc": "{x} / 7.99934208e9",
       "Localization": [
@@ -287,11 +242,6 @@
     {
       "SingularName": "MillimeterMercurySecondPerCubicCentimeter",
       "PluralName": "MillimeterMercurySecondsPerCubicCentimeter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 1.33322368e8",
       "FromBaseToUnitFunc": "{x} / 1.33322368e8",
       "Localization": [
@@ -308,11 +258,6 @@
     {
       "SingularName": "MillimeterMercuryMinutePerCubicCentimeter",
       "PluralName": "MillimeterMercuryMinutesPerCubicCentimeter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 7.99934208e9",
       "FromBaseToUnitFunc": "{x} / 7.99934208e9",
       "Localization": [
@@ -329,11 +274,6 @@
     {
       "SingularName": "MillimeterMercurySecondPerCubicMeter",
       "PluralName": "MillimeterMercurySecondsPerCubicMeter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 133.322368",
       "FromBaseToUnitFunc": "{x} / 133.322368",
       "Localization": [
@@ -350,11 +290,6 @@
     {
       "SingularName": "MillimeterMercuryMinutePerCubicMeter",
       "PluralName": "MillimeterMercuryMinutesPerCubicMeter",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 7.99934208e3",
       "FromBaseToUnitFunc": "{x} / 7.99934208e3",
       "Localization": [
@@ -371,11 +306,6 @@
     {
       "SingularName": "WoodUnit",
       "PluralName": "WoodUnits",
-      "BaseUnits": {
-        "M": "Kilogram",
-        "L": "Meter",
-        "T": "Second"
-      },
       "FromUnitToBaseFunc": "{x} * 7.99934208e6",
       "FromBaseToUnitFunc": "{x} / 7.99934208e6",
       "XmlDocRemarks": "https://en.wikipedia.org/wiki/Vascular_resistance",
diff --git a/UnitsNet/GeneratedCode/Quantities/FluidResistance.g.cs b/UnitsNet/GeneratedCode/Quantities/FluidResistance.g.cs
index f81c770d07..a512bc17d5 100644
--- a/UnitsNet/GeneratedCode/Quantities/FluidResistance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/FluidResistance.g.cs
@@ -70,25 +70,25 @@ static FluidResistance()
             Info = new QuantityInfo<FluidResistanceUnit>("FluidResistance",
                 new UnitInfo<FluidResistanceUnit>[]
                 {
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.DyneSecondPerCentimeterToTheFifth, "DyneSecondsPerCentimeterToTheFifth", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.DyneSecondPerCentimeterToTheFifth, "DyneSecondsPerCentimeterToTheFifth", BaseUnits.Undefined, "FluidResistance"),
                     new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MegapascalSecondPerCubicMeter, "MegapascalSecondsPerCubicMeter", BaseUnits.Undefined, "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercuryMinutePerCubicCentimeter, "MillimeterMercuryMinutesPerCubicCentimeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercuryMinutePerCubicMeter, "MillimeterMercuryMinutesPerCubicMeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercuryMinutePerLiter, "MillimeterMercuryMinutesPerLiter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercuryMinutePerMilliliter, "MillimeterMercuryMinutesPerMilliliter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercurySecondPerCubicCentimeter, "MillimeterMercurySecondsPerCubicCentimeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercurySecondPerCubicMeter, "MillimeterMercurySecondsPerCubicMeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercurySecondPerLiter, "MillimeterMercurySecondsPerLiter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercurySecondPerMilliliter, "MillimeterMercurySecondsPerMilliliter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalMinutePerCubicCentimeter, "PascalMinutesPerCubicCentimeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalMinutePerCubicMeter, "PascalMinutesPerCubicMeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalMinutePerLiter, "PascalMinutesPerLiter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalMinutePerMilliliter, "PascalMinutesPerMilliliter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalSecondPerCubicCentimeter, "PascalSecondsPerCubicCentimeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercuryMinutePerCubicCentimeter, "MillimeterMercuryMinutesPerCubicCentimeter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercuryMinutePerCubicMeter, "MillimeterMercuryMinutesPerCubicMeter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercuryMinutePerLiter, "MillimeterMercuryMinutesPerLiter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercuryMinutePerMilliliter, "MillimeterMercuryMinutesPerMilliliter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercurySecondPerCubicCentimeter, "MillimeterMercurySecondsPerCubicCentimeter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercurySecondPerCubicMeter, "MillimeterMercurySecondsPerCubicMeter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercurySecondPerLiter, "MillimeterMercurySecondsPerLiter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.MillimeterMercurySecondPerMilliliter, "MillimeterMercurySecondsPerMilliliter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalMinutePerCubicCentimeter, "PascalMinutesPerCubicCentimeter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalMinutePerCubicMeter, "PascalMinutesPerCubicMeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Minute), "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalMinutePerLiter, "PascalMinutesPerLiter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Minute), "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalMinutePerMilliliter, "PascalMinutesPerMilliliter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalSecondPerCubicCentimeter, "PascalSecondsPerCubicCentimeter", BaseUnits.Undefined, "FluidResistance"),
                     new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalSecondPerCubicMeter, "PascalSecondsPerCubicMeter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalSecondPerLiter, "PascalSecondsPerLiter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalSecondPerMilliliter, "PascalSecondsPerMilliliter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
-                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.WoodUnit, "WoodUnits", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second), "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalSecondPerLiter, "PascalSecondsPerLiter", BaseUnits.Undefined, "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.PascalSecondPerMilliliter, "PascalSecondsPerMilliliter", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Gram, time: DurationUnit.Second), "FluidResistance"),
+                    new UnitInfo<FluidResistanceUnit>(FluidResistanceUnit.WoodUnit, "WoodUnits", BaseUnits.Undefined, "FluidResistance"),
                 },
                 BaseUnit, Zero, BaseDimensions);