diff --git a/OBD.NET/OBD.NET/DataTypes/Count.cs b/OBD.NET/OBD.NET/DataTypes/Count.cs
new file mode 100644
index 0000000..75b70c6
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Count.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class Count : GenericData
+    {
+        #region Constructors
+
+        public Count(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Count(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Degree.cs b/OBD.NET/OBD.NET/DataTypes/Degree.cs
new file mode 100644
index 0000000..a5de766
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Degree.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class Degree : GenericData
+    {
+        #region Constructors
+
+        public Degree(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Degree(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/DegreeCelsius.cs b/OBD.NET/OBD.NET/DataTypes/DegreeCelsius.cs
new file mode 100644
index 0000000..bed3565
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/DegreeCelsius.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class DegreeCelsius : GenericData
+    {
+        #region Constructors
+
+        public DegreeCelsius(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public DegreeCelsius(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/GenericData.cs b/OBD.NET/OBD.NET/DataTypes/GenericData.cs
new file mode 100644
index 0000000..3a7f764
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/GenericData.cs
@@ -0,0 +1,50 @@
+using System;
+
+namespace OBD.NET.DataTypes
+{
+    public class GenericData
+    {
+        #region Properties & Fields
+
+        public double Value { get; }
+        public double MinValue { get; }
+        public double MaxValue { get; }
+        public bool IsFloatingPointValue { get; }
+
+        #endregion
+
+        #region Constructors
+
+        public GenericData(double value, double minValue, double maxValue)
+        {
+            this.Value = value;
+            this.MinValue = minValue;
+            this.MaxValue = maxValue;
+            this.IsFloatingPointValue = true;
+        }
+
+        public GenericData(int value, int minValue, int maxValue)
+        {
+            this.Value = value;
+            this.MinValue = minValue;
+            this.MaxValue = maxValue;
+            this.IsFloatingPointValue = false;
+        }
+
+        #endregion
+
+        #region Operators
+
+        public static implicit operator double(GenericData p)
+        {
+            return p.Value;
+        }
+
+        public static implicit operator int(GenericData p)
+        {
+            return (int)Math.Round(p.Value);
+        }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/GramPerSec.cs b/OBD.NET/OBD.NET/DataTypes/GramPerSec.cs
new file mode 100644
index 0000000..37e3661
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/GramPerSec.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class GramPerSec : GenericData
+    {
+        #region Constructors
+
+        public GramPerSec(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public GramPerSec(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Kilometre.cs b/OBD.NET/OBD.NET/DataTypes/Kilometre.cs
new file mode 100644
index 0000000..1683853
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Kilometre.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class Kilometre : GenericData
+    {
+        #region Constructors
+
+        public Kilometre(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Kilometre(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/KilometrePerHour.cs b/OBD.NET/OBD.NET/DataTypes/KilometrePerHour.cs
new file mode 100644
index 0000000..5941a2f
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/KilometrePerHour.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class KilometrePerHour : GenericData
+    {
+        #region Constructors
+
+        public KilometrePerHour(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public KilometrePerHour(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Kilopascal.cs b/OBD.NET/OBD.NET/DataTypes/Kilopascal.cs
new file mode 100644
index 0000000..dccf052
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Kilopascal.cs
@@ -0,0 +1,26 @@
+namespace OBD.NET.DataTypes
+{
+    public class Kilopascal : GenericData
+    {
+        #region Constructors
+
+        public Kilopascal(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Kilopascal(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+
+        #region Operators
+
+        public static explicit operator Pascal(Kilopascal pa)
+        {
+            return new Pascal(pa.Value / 1000.0, pa.MinValue / 1000.0, pa.MaxValue / 1000.0);
+        }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/LitresPerHour.cs b/OBD.NET/OBD.NET/DataTypes/LitresPerHour.cs
new file mode 100644
index 0000000..3af5b13
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/LitresPerHour.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class LitresPerHour : GenericData
+    {
+        #region Constructors
+
+        public LitresPerHour(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public LitresPerHour(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Milliampere.cs b/OBD.NET/OBD.NET/DataTypes/Milliampere.cs
new file mode 100644
index 0000000..0c93be2
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Milliampere.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class Milliampere : GenericData
+    {
+        #region Constructors
+
+        public Milliampere(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Milliampere(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Minute.cs b/OBD.NET/OBD.NET/DataTypes/Minute.cs
new file mode 100644
index 0000000..cebbc8c
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Minute.cs
@@ -0,0 +1,28 @@
+namespace OBD.NET.DataTypes
+{
+    public class Minute : GenericData
+    {
+        #region Constructors
+
+        public Minute(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Minute(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+
+        #region Operators
+
+        public static explicit operator Second(Minute m)
+        {
+            return m.IsFloatingPointValue
+                ? new Second(m.Value * 60, m.MinValue * 60, m.MaxValue * 60)
+                : new Second((int)(m.Value * 60), (int)(m.MinValue * 60), (int)(m.MaxValue * 60));
+        }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/NewtonMetre.cs b/OBD.NET/OBD.NET/DataTypes/NewtonMetre.cs
new file mode 100644
index 0000000..680bc53
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/NewtonMetre.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class NewtonMetre : GenericData
+    {
+        #region Constructors
+
+        public NewtonMetre(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public NewtonMetre(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Pascal.cs b/OBD.NET/OBD.NET/DataTypes/Pascal.cs
new file mode 100644
index 0000000..c37095f
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Pascal.cs
@@ -0,0 +1,28 @@
+namespace OBD.NET.DataTypes
+{
+    public class Pascal : GenericData
+    {
+        #region Constructors
+
+        public Pascal(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Pascal(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+
+        #region Operators
+
+        public static explicit operator Kilopascal(Pascal pa)
+        {
+            return pa.IsFloatingPointValue
+                ? new Kilopascal(pa.Value * 1000, pa.MinValue * 1000, pa.MaxValue * 1000)
+                : new Kilopascal((int)(pa.Value * 1000), (int)(pa.MinValue * 1000), (int)(pa.MaxValue * 1000));
+        }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Percent.cs b/OBD.NET/OBD.NET/DataTypes/Percent.cs
new file mode 100644
index 0000000..6c07298
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Percent.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class Percent : GenericData
+    {
+        #region Constructors
+
+        public Percent(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Percent(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Ratio.cs b/OBD.NET/OBD.NET/DataTypes/Ratio.cs
new file mode 100644
index 0000000..9e85317
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Ratio.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class Ratio : GenericData
+    {
+        #region Constructors
+
+        public Ratio(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Ratio(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/RevolutionsPerMinute.cs b/OBD.NET/OBD.NET/DataTypes/RevolutionsPerMinute.cs
new file mode 100644
index 0000000..561d6a1
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/RevolutionsPerMinute.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class RevolutionsPerMinute : GenericData
+    {
+        #region Constructors
+
+        public RevolutionsPerMinute(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public RevolutionsPerMinute(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Second.cs b/OBD.NET/OBD.NET/DataTypes/Second.cs
new file mode 100644
index 0000000..ec15a44
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Second.cs
@@ -0,0 +1,26 @@
+namespace OBD.NET.DataTypes
+{
+    public class Second : GenericData
+    {
+        #region Constructors
+
+        public Second(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Second(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+
+        #region Operators
+
+        public static explicit operator Minute(Second s)
+        {
+            return new Minute(s.Value / 60.0, s.MinValue / 60.0, s.MaxValue / 60.0);
+        }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/DataTypes/Volt.cs b/OBD.NET/OBD.NET/DataTypes/Volt.cs
new file mode 100644
index 0000000..7669cf8
--- /dev/null
+++ b/OBD.NET/OBD.NET/DataTypes/Volt.cs
@@ -0,0 +1,17 @@
+namespace OBD.NET.DataTypes
+{
+    public class Volt : GenericData
+    {
+        #region Constructors
+
+        public Volt(double value, double minValue, double maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        public Volt(int value, int minValue, int maxValue)
+            : base(value, minValue, maxValue)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBD.NET.csproj b/OBD.NET/OBD.NET/OBD.NET.csproj
index b4a8c47..0a9f742 100644
--- a/OBD.NET/OBD.NET/OBD.NET.csproj
+++ b/OBD.NET/OBD.NET/OBD.NET.csproj
@@ -45,113 +45,131 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DataTypes\Degree.cs" />
+    <Compile Include="DataTypes\Minute.cs" />
+    <Compile Include="DataTypes\LitresPerHour.cs" />
+    <Compile Include="DataTypes\NewtonMetre.cs" />
+    <Compile Include="DataTypes\GramPerSec.cs" />
+    <Compile Include="DataTypes\Kilometre.cs" />
+    <Compile Include="DataTypes\Ratio.cs" />
+    <Compile Include="DataTypes\Count.cs" />
+    <Compile Include="DataTypes\Milliampere.cs" />
+    <Compile Include="DataTypes\Second.cs" />
+    <Compile Include="DataTypes\Volt.cs" />
+    <Compile Include="DataTypes\Kilopascal.cs" />
+    <Compile Include="DataTypes\Pascal.cs" />
+    <Compile Include="DataTypes\RevolutionsPerMinute.cs" />
+    <Compile Include="DataTypes\KilometrePerHour.cs" />
+    <Compile Include="DataTypes\Percent.cs" />
+    <Compile Include="DataTypes\DegreeCelsius.cs" />
+    <Compile Include="DataTypes\GenericData.cs" />
     <Compile Include="Enums\Mode.cs" />
-    <Compile Include="OBDData\AbsoluteBarometricPressure.cs" />
-    <Compile Include="OBDData\AbsoluteEvapSystemVaporPressure.cs" />
-    <Compile Include="OBDData\AbsoluteLoadValue.cs" />
-    <Compile Include="OBDData\AbsoluteThrottlePositionC.cs" />
-    <Compile Include="OBDData\AbsoluteThrottlePositionB.cs" />
+    <Compile Include="OBDData\20-3F\AbsoluteBarometricPressure.cs" />
+    <Compile Include="OBDData\40-5F\AbsoluteEvapSystemVaporPressure.cs" />
+    <Compile Include="OBDData\40-5F\AbsoluteLoadValue.cs" />
+    <Compile Include="OBDData\40-5F\AbsoluteThrottlePositionC.cs" />
+    <Compile Include="OBDData\40-5F\AbsoluteThrottlePositionB.cs" />
     <Compile Include="OBDData\AbstractOBDData.cs" />
-    <Compile Include="OBDData\AcceleratorPedalPositionF.cs" />
-    <Compile Include="OBDData\AcceleratorPedalPositionE.cs" />
-    <Compile Include="OBDData\AcceleratorPedalPositionD.cs" />
-    <Compile Include="OBDData\ActualEnginePercentTorque.cs" />
-    <Compile Include="OBDData\AmbientAirTemperature.cs" />
-    <Compile Include="OBDData\AuxiliaryInputStatus.cs" />
-    <Compile Include="OBDData\CatalystTemperatureBank2Sensor2.cs" />
-    <Compile Include="OBDData\CatalystTemperatureBank2Sensor1.cs" />
-    <Compile Include="OBDData\CatalystTemperatureBank1Sensor2.cs" />
-    <Compile Include="OBDData\CatalystTemperatureBank1Sensor1.cs" />
-    <Compile Include="OBDData\CommandedEGR.cs" />
-    <Compile Include="OBDData\CommandedEvaporativePurge.cs" />
-    <Compile Include="OBDData\CommandedSecondaryAirStatus.cs" />
-    <Compile Include="OBDData\CommandedThrottleActuator.cs" />
-    <Compile Include="OBDData\ControlModuleVoltage.cs" />
-    <Compile Include="OBDData\DistanceTraveledSinceCodesCleared.cs" />
-    <Compile Include="OBDData\DistanceTraveledWithMILOn.cs" />
-    <Compile Include="OBDData\DriversDemandEnginePercentTorque.cs" />
-    <Compile Include="OBDData\EGRError.cs" />
-    <Compile Include="OBDData\EmissionRequirementsToWhichVehicleIsDesigned.cs" />
-    <Compile Include="OBDData\EngineCoolantTemperature.cs" />
-    <Compile Include="OBDData\CalculatedEngineLoad.cs" />
-    <Compile Include="OBDData\EngineFuelRate.cs" />
-    <Compile Include="OBDData\EngineOilTemperature.cs" />
-    <Compile Include="OBDData\EnginePercentTorqueData.cs" />
-    <Compile Include="OBDData\EngineReferenceTorque.cs" />
-    <Compile Include="OBDData\EngineRPM.cs" />
-    <Compile Include="OBDData\EthanolFuel.cs" />
-    <Compile Include="OBDData\EvapSystemVaporPressure.cs" />
-    <Compile Include="OBDData\EvapSystemVaporPressure2.cs" />
-    <Compile Include="OBDData\FuelInjectionTiming.cs" />
-    <Compile Include="OBDData\FuelRailAbsolutePressure.cs" />
-    <Compile Include="OBDData\FuelType.cs" />
-    <Compile Include="OBDData\FuelAirCommandedEquivalenceRatio.cs" />
-    <Compile Include="OBDData\FuelPressure.cs" />
-    <Compile Include="OBDData\FuelRailGaugePressure.cs" />
-    <Compile Include="OBDData\FuelRailPressure.cs" />
-    <Compile Include="OBDData\FuelSystemStatus.cs" />
-    <Compile Include="OBDData\FuelTankLevelInput.cs" />
-    <Compile Include="OBDData\HybridBatteryPackRemainingLife.cs" />
-    <Compile Include="OBDData\IntakeAirTemperature.cs" />
-    <Compile Include="OBDData\IntakeManifoldAbsolutePressure.cs" />
+    <Compile Include="OBDData\40-5F\AcceleratorPedalPositionF.cs" />
+    <Compile Include="OBDData\40-5F\AcceleratorPedalPositionE.cs" />
+    <Compile Include="OBDData\40-5F\AcceleratorPedalPositionD.cs" />
+    <Compile Include="OBDData\60-7F\ActualEnginePercentTorque.cs" />
+    <Compile Include="OBDData\40-5F\AmbientAirTemperature.cs" />
+    <Compile Include="OBDData\00-1F\AuxiliaryInputStatus.cs" />
+    <Compile Include="OBDData\20-3F\CatalystTemperatureBank2Sensor2.cs" />
+    <Compile Include="OBDData\20-3F\CatalystTemperatureBank2Sensor1.cs" />
+    <Compile Include="OBDData\20-3F\CatalystTemperatureBank1Sensor2.cs" />
+    <Compile Include="OBDData\20-3F\CatalystTemperatureBank1Sensor1.cs" />
+    <Compile Include="OBDData\20-3F\CommandedEGR.cs" />
+    <Compile Include="OBDData\20-3F\CommandedEvaporativePurge.cs" />
+    <Compile Include="OBDData\00-1F\CommandedSecondaryAirStatus.cs" />
+    <Compile Include="OBDData\40-5F\CommandedThrottleActuator.cs" />
+    <Compile Include="OBDData\40-5F\ControlModuleVoltage.cs" />
+    <Compile Include="OBDData\20-3F\DistanceTraveledSinceCodesCleared.cs" />
+    <Compile Include="OBDData\20-3F\DistanceTraveledWithMILOn.cs" />
+    <Compile Include="OBDData\60-7F\DriversDemandEnginePercentTorque.cs" />
+    <Compile Include="OBDData\20-3F\EGRError.cs" />
+    <Compile Include="OBDData\00-1F\EngineCoolantTemperature.cs" />
+    <Compile Include="OBDData\00-1F\CalculatedEngineLoad.cs" />
+    <Compile Include="OBDData\40-5F\EngineFuelRate.cs" />
+    <Compile Include="OBDData\40-5F\EngineOilTemperature.cs" />
+    <Compile Include="OBDData\60-7F\EnginePercentTorqueData.cs" />
+    <Compile Include="OBDData\60-7F\EngineReferenceTorque.cs" />
+    <Compile Include="OBDData\00-1F\EngineRPM.cs" />
+    <Compile Include="OBDData\40-5F\EthanolFuel.cs" />
+    <Compile Include="OBDData\20-3F\EvapSystemVaporPressure.cs" />
+    <Compile Include="OBDData\40-5F\EvapSystemVaporPressure2.cs" />
+    <Compile Include="OBDData\40-5F\FuelInjectionTiming.cs" />
+    <Compile Include="OBDData\40-5F\FuelRailAbsolutePressure.cs" />
+    <Compile Include="OBDData\40-5F\FuelType.cs" />
+    <Compile Include="OBDData\40-5F\FuelAirCommandedEquivalenceRatio.cs" />
+    <Compile Include="OBDData\00-1F\FuelPressure.cs" />
+    <Compile Include="OBDData\20-3F\FuelRailGaugePressure.cs" />
+    <Compile Include="OBDData\20-3F\FuelRailPressure.cs" />
+    <Compile Include="OBDData\00-1F\FuelSystemStatus.cs" />
+    <Compile Include="OBDData\20-3F\FuelTankLevelInput.cs" />
+    <Compile Include="OBDData\40-5F\HybridBatteryPackRemainingLife.cs" />
+    <Compile Include="OBDData\00-1F\IntakeAirTemperature.cs" />
+    <Compile Include="OBDData\00-1F\IntakeManifoldAbsolutePressure.cs" />
     <Compile Include="OBDData\IOBDData.cs" />
-    <Compile Include="OBDData\LongTermFuelTrimBank1.cs" />
-    <Compile Include="OBDData\LongTermFuelTrimBank2.cs" />
-    <Compile Include="OBDData\MAFAirFlowRate.cs" />
-    <Compile Include="OBDData\MaximumValueForAirFlowRate.cs" />
-    <Compile Include="OBDData\MaximumValues.cs" />
-    <Compile Include="OBDData\MonitorStatusThisDriveCycle.cs" />
-    <Compile Include="OBDData\OBDStandards.cs" />
-    <Compile Include="OBDData\OxygenSensor1FuelAir2.cs" />
-    <Compile Include="OBDData\OxygenSensor2FuelAir2.cs" />
-    <Compile Include="OBDData\OxygenSensor3FuelAir2.cs" />
-    <Compile Include="OBDData\OxygenSensor4FuelAir2.cs" />
-    <Compile Include="OBDData\OxygenSensor5FuelAir2.cs" />
-    <Compile Include="OBDData\OxygenSensor6FuelAir2.cs" />
-    <Compile Include="OBDData\OxygenSensor7FuelAir2.cs" />
-    <Compile Include="OBDData\OxygenSensor8FuelAir2.cs" />
-    <Compile Include="OBDData\OxygenSensor8FuelAir.cs" />
-    <Compile Include="OBDData\OxygenSensor7FuelAir.cs" />
-    <Compile Include="OBDData\OxygenSensor6FuelAir.cs" />
-    <Compile Include="OBDData\OxygenSensor5FuelAir.cs" />
-    <Compile Include="OBDData\OxygenSensor4FuelAir.cs" />
-    <Compile Include="OBDData\OxygenSensor3FuelAir.cs" />
-    <Compile Include="OBDData\OxygenSensor2FuelAir.cs" />
-    <Compile Include="OBDData\OxygenSensor1FuelAir.cs" />
-    <Compile Include="OBDData\OxygenSensor8FuelTrim.cs" />
-    <Compile Include="OBDData\OxygenSensor7FuelTrim.cs" />
-    <Compile Include="OBDData\OxygenSensor6FuelTrim.cs" />
-    <Compile Include="OBDData\OxygenSensor5FuelTrim.cs" />
-    <Compile Include="OBDData\OxygenSensor4FuelTrim.cs" />
-    <Compile Include="OBDData\OxygenSensor3FuelTrim.cs" />
-    <Compile Include="OBDData\OxygenSensor2FuelTrim.cs" />
-    <Compile Include="OBDData\OxygenSensor1FuelTrim.cs" />
-    <Compile Include="OBDData\OxygenSensorPresent.cs" />
-    <Compile Include="OBDData\OxygenSensorsPresent2.cs" />
-    <Compile Include="OBDData\PidsSupportedC1_E0.cs" />
-    <Compile Include="OBDData\PidsSupportedA1_C0.cs" />
-    <Compile Include="OBDData\PidsSupported81_A0.cs" />
-    <Compile Include="OBDData\PidsSupported61_80.cs" />
-    <Compile Include="OBDData\PidsSupported41_60.cs" />
-    <Compile Include="OBDData\PidsSupported21_40.cs" />
-    <Compile Include="OBDData\PidsSupported01_20.cs" />
-    <Compile Include="OBDData\RelativeAcceleratorPedalPosition.cs" />
-    <Compile Include="OBDData\RelativeThrottlePosition.cs" />
-    <Compile Include="OBDData\RunTimeSinceEngineStart.cs" />
-    <Compile Include="OBDData\ShortTermFuelTrimBank1.cs" />
-    <Compile Include="OBDData\ShortTermFuelTrimBank2.cs" />
-    <Compile Include="OBDData\LongTermSecondaryOxygenSensorTrimBank13.cs" />
-    <Compile Include="OBDData\LongTermSecondaryOxygenSensorTrimBank24.cs" />
-    <Compile Include="OBDData\ShortTermSecondaryOxygenSensorTrimBank24.cs" />
-    <Compile Include="OBDData\ShortTermSecondaryOxygenSensorTrimBank13.cs" />
-    <Compile Include="OBDData\ThrottlePosition.cs" />
-    <Compile Include="OBDData\TimeRunWithMILOn.cs" />
-    <Compile Include="OBDData\TimeSinceTroubleCodesCleared.cs" />
-    <Compile Include="OBDData\TimingAdvance.cs" />
-    <Compile Include="OBDData\VehicleSpeed.cs" />
-    <Compile Include="OBDData\WarmUpsSinceCodesCleared.cs" />
+    <Compile Include="OBDData\00-1F\LongTermFuelTrimBank1.cs" />
+    <Compile Include="OBDData\00-1F\LongTermFuelTrimBank2.cs" />
+    <Compile Include="OBDData\00-1F\MAFAirFlowRate.cs" />
+    <Compile Include="OBDData\40-5F\MaximumValueForAirFlowRate.cs" />
+    <Compile Include="OBDData\40-5F\MaximumValues.cs" />
+    <Compile Include="OBDData\40-5F\MonitorStatusThisDriveCycle.cs" />
+    <Compile Include="OBDData\00-1F\OBDStandards.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor1FuelAir2.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor2FuelAir2.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor3FuelAir2.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor4FuelAir2.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor5FuelAir2.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor6FuelAir2.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor7FuelAir2.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor8FuelAir2.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor8FuelAir.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor7FuelAir.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor6FuelAir.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor5FuelAir.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor4FuelAir.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor3FuelAir.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor2FuelAir.cs" />
+    <Compile Include="OBDData\20-3F\OxygenSensor1FuelAir.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensor8FuelTrim.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensor7FuelTrim.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensor6FuelTrim.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensor5FuelTrim.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensor4FuelTrim.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensor3FuelTrim.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensor2FuelTrim.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensor1FuelTrim.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensorPresent.cs" />
+    <Compile Include="OBDData\00-1F\OxygenSensorsPresent2.cs" />
+    <Compile Include="OBDData\C0-DF\PidsSupportedC1_E0.cs" />
+    <Compile Include="OBDData\A0-BF\PidsSupportedA1_C0.cs" />
+    <Compile Include="OBDData\80-9F\PidsSupported81_A0.cs" />
+    <Compile Include="OBDData\60-7F\PidsSupported61_80.cs" />
+    <Compile Include="OBDData\40-5F\PidsSupported41_60.cs" />
+    <Compile Include="OBDData\20-3F\PidsSupported21_40.cs" />
+    <Compile Include="OBDData\00-1F\PidsSupported01_20.cs" />
+    <Compile Include="OBDData\40-5F\RelativeAcceleratorPedalPosition.cs" />
+    <Compile Include="OBDData\40-5F\RelativeThrottlePosition.cs" />
+    <Compile Include="OBDData\00-1F\RunTimeSinceEngineStart.cs" />
+    <Compile Include="OBDData\00-1F\ShortTermFuelTrimBank1.cs" />
+    <Compile Include="OBDData\00-1F\ShortTermFuelTrimBank2.cs" />
+    <Compile Include="OBDData\40-5F\LongTermSecondaryOxygenSensorTrimBank13.cs" />
+    <Compile Include="OBDData\40-5F\LongTermSecondaryOxygenSensorTrimBank24.cs" />
+    <Compile Include="OBDData\40-5F\ShortTermSecondaryOxygenSensorTrimBank24.cs" />
+    <Compile Include="OBDData\40-5F\ShortTermSecondaryOxygenSensorTrimBank13.cs" />
+    <Compile Include="OBDData\00-1F\ThrottlePosition.cs" />
+    <Compile Include="OBDData\40-5F\TimeRunWithMILOn.cs" />
+    <Compile Include="OBDData\40-5F\TimeSinceTroubleCodesCleared.cs" />
+    <Compile Include="OBDData\00-1F\TimingAdvance.cs" />
+    <Compile Include="OBDData\00-1F\VehicleSpeed.cs" />
+    <Compile Include="OBDData\20-3F\WarmUpsSinceCodesCleared.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings b/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings
new file mode 100644
index 0000000..ca3a58b
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings
@@ -0,0 +1,8 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005Cc0_002Ddf/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C20_002D3f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C40_002D5f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C60_002D7f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C80_002D9f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005Ca0_002Dbf/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C00_002D1f/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/OBD.NET/OBD.NET/OBDData/AuxiliaryInputStatus.cs b/OBD.NET/OBD.NET/OBDData/00-1F/AuxiliaryInputStatus.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/AuxiliaryInputStatus.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/AuxiliaryInputStatus.cs
diff --git a/OBD.NET/OBD.NET/OBDData/CalculatedEngineLoad.cs b/OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/CalculatedEngineLoad.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs
index 76217cc..6cbdca8 100644
--- a/OBD.NET/OBD.NET/OBDData/CalculatedEngineLoad.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class CalculatedEngineLoad : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Load => A / 2.55;
+        public Percent Load => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/CommandedSecondaryAirStatus.cs b/OBD.NET/OBD.NET/OBDData/00-1F/CommandedSecondaryAirStatus.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/CommandedSecondaryAirStatus.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/CommandedSecondaryAirStatus.cs
diff --git a/OBD.NET/OBD.NET/OBDData/EngineCoolantTemperature.cs b/OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs
similarity index 66%
rename from OBD.NET/OBD.NET/OBDData/EngineCoolantTemperature.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs
index 43cb5c4..342d196 100644
--- a/OBD.NET/OBD.NET/OBDData/EngineCoolantTemperature.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EngineCoolantTemperature : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Temperature => A - 40;
+        public DegreeCelsius Temperature => new DegreeCelsius(A - 40, -40, 215);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/EngineRPM.cs b/OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs
similarity index 59%
rename from OBD.NET/OBD.NET/OBDData/EngineRPM.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs
index 5da0a5d..0ac51b1 100644
--- a/OBD.NET/OBD.NET/OBDData/EngineRPM.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EngineRPM : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double RPM => ((256 * A) + B) / 4.0;
+        public RevolutionsPerMinute Rpm => new RevolutionsPerMinute(((256 * A) + B) / 4.0, 0, 16383.75);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelPressure.cs b/OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs
similarity index 66%
rename from OBD.NET/OBD.NET/OBDData/FuelPressure.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs
index 57075a1..027488a 100644
--- a/OBD.NET/OBD.NET/OBDData/FuelPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class FuelPressure : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Pressure => 3 * A;
+        public Kilopascal Pressure => new Kilopascal(3 * A, 0, 765);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelSystemStatus.cs b/OBD.NET/OBD.NET/OBDData/00-1F/FuelSystemStatus.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/FuelSystemStatus.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/FuelSystemStatus.cs
diff --git a/OBD.NET/OBD.NET/OBDData/IntakeAirTemperature.cs b/OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/IntakeAirTemperature.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs
index 9aa1eca..be1230e 100644
--- a/OBD.NET/OBD.NET/OBDData/IntakeAirTemperature.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class IntakeAirTemperature : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Temperature => A - 40;
+        public DegreeCelsius Temperature => new DegreeCelsius(A - 40, -40, 215);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/IntakeManifoldAbsolutePressure.cs b/OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs
similarity index 69%
rename from OBD.NET/OBD.NET/OBDData/IntakeManifoldAbsolutePressure.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs
index 71359e3..519f2d2 100644
--- a/OBD.NET/OBD.NET/OBDData/IntakeManifoldAbsolutePressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class IntakeManifoldAbsolutePressure : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Pressure => A;
+        public Kilopascal Pressure => new Kilopascal(A, 0, 255);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/LongTermFuelTrimBank1.cs b/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs
similarity index 66%
rename from OBD.NET/OBD.NET/OBDData/LongTermFuelTrimBank1.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs
index 265b15d..9bcf790 100644
--- a/OBD.NET/OBD.NET/OBDData/LongTermFuelTrimBank1.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class LongTermFuelTrimBank1 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Trim => (A / 1.28) - 100;
+        public Percent Trim => new Percent((A / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/LongTermFuelTrimBank2.cs b/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs
similarity index 66%
rename from OBD.NET/OBD.NET/OBDData/LongTermFuelTrimBank2.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs
index 6026542..fd1f4b4 100644
--- a/OBD.NET/OBD.NET/OBDData/LongTermFuelTrimBank2.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class LongTermFuelTrimBank2 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Trim => (A / 1.28) - 100;
+        public Percent Trim => new Percent((A / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/MAFAirFlowRate.cs b/OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs
similarity index 63%
rename from OBD.NET/OBD.NET/OBDData/MAFAirFlowRate.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs
index b56236f..712d9c8 100644
--- a/OBD.NET/OBD.NET/OBDData/MAFAirFlowRate.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class MAFAirFlowRate : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Rate => ((256 * A) + B) / 100.0;
+        public GramPerSec Rate => new GramPerSec(((256 * A) + B) / 100.0, 0, 655.35);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/OBDStandards.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OBDStandards.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/OBDStandards.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OBDStandards.cs
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs
similarity index 60%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelTrim.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs
index feeddf6..c87629c 100644
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class OxygenSensor1FuelTrim : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => A / 200.0;
-        public double ShortTermFuelTrim => (B / 1.28) - 100;
+        public Volt Voltage => new Volt(A / 200.0, 0, 1.275);
+        public Percent ShortTermFuelTrim => new Percent((B / 1.28) - 100, -100, 99.2);
         public bool IsSensorUsed => B != 0xFF;
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs
similarity index 60%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelTrim.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs
index 7db8ec2..022d09c 100644
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class OxygenSensor2FuelTrim : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => A / 200.0;
-        public double ShortTermFuelTrim => (B / 1.28) - 100;
+        public Volt Voltage => new Volt(A / 200.0, 0, 1.275);
+        public Percent ShortTermFuelTrim => new Percent((B / 1.28) - 100, -100, 99.2);
         public bool IsSensorUsed => B != 0xFF;
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs
similarity index 60%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelTrim.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs
index 5990442..fa13773 100644
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class OxygenSensor3FuelTrim : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => A / 200.0;
-        public double ShortTermFuelTrim => (B / 1.28) - 100;
+        public Volt Voltage => new Volt(A / 200.0, 0, 1.275);
+        public Percent ShortTermFuelTrim => new Percent((B / 1.28) - 100, -100, 99.2);
         public bool IsSensorUsed => B != 0xFF;
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs
similarity index 60%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelTrim.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs
index 09ce254..028089e 100644
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class OxygenSensor4FuelTrim : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => A / 200.0;
-        public double ShortTermFuelTrim => (B / 1.28) - 100;
+        public Volt Voltage => new Volt(A / 200.0, 0, 1.275);
+        public Percent ShortTermFuelTrim => new Percent((B / 1.28) - 100, -100, 99.2);
         public bool IsSensorUsed => B != 0xFF;
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs
similarity index 60%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelTrim.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs
index 1245abf..0267975 100644
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class OxygenSensor5FuelTrim : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => A / 200.0;
-        public double ShortTermFuelTrim => (B / 1.28) - 100;
+        public Volt Voltage => new Volt(A / 200.0, 0, 1.275);
+        public Percent ShortTermFuelTrim => new Percent((B / 1.28) - 100, -100, 99.2);
         public bool IsSensorUsed => B != 0xFF;
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs
similarity index 60%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelTrim.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs
index e7e715e..27d1482 100644
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class OxygenSensor6FuelTrim : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => A / 200.0;
-        public double ShortTermFuelTrim => (B / 1.28) - 100;
+        public Volt Voltage => new Volt(A / 200.0, 0, 1.275);
+        public Percent ShortTermFuelTrim => new Percent((B / 1.28) - 100, -100, 99.2);
         public bool IsSensorUsed => B != 0xFF;
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs
similarity index 60%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelTrim.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs
index 4000cc6..43a586a 100644
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class OxygenSensor7FuelTrim : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => A / 200.0;
-        public double ShortTermFuelTrim => (B / 1.28) - 100;
+        public Volt Voltage => new Volt(A / 200.0, 0, 1.275);
+        public Percent ShortTermFuelTrim => new Percent((B / 1.28) - 100, -100, 99.2);
         public bool IsSensorUsed => B != 0xFF;
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs
similarity index 60%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelTrim.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs
index f7dfea3..2608d76 100644
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class OxygenSensor8FuelTrim : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => A / 200.0;
-        public double ShortTermFuelTrim => (B / 1.28) - 100;
+        public Volt Voltage => new Volt(A / 200.0, 0, 1.275);
+        public Percent ShortTermFuelTrim => new Percent((B / 1.28) - 100, -100, 99.2);
         public bool IsSensorUsed => B != 0xFF;
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensorPresent.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorPresent.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensorPresent.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorPresent.cs
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensorsPresent2.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorsPresent2.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/OxygenSensorsPresent2.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorsPresent2.cs
diff --git a/OBD.NET/OBD.NET/OBDData/PidsSupported01_20.cs b/OBD.NET/OBD.NET/OBDData/00-1F/PidsSupported01_20.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/PidsSupported01_20.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/PidsSupported01_20.cs
diff --git a/OBD.NET/OBD.NET/OBDData/RunTimeSinceEngineStart.cs b/OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs
similarity index 67%
rename from OBD.NET/OBD.NET/OBDData/RunTimeSinceEngineStart.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs
index 14accc5..da09f56 100644
--- a/OBD.NET/OBD.NET/OBDData/RunTimeSinceEngineStart.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class RunTimeSinceEngineStart : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Runtime => (256 * A) + B;
+        public Second Runtime => new Second((256 * A) + B, 0, 65535);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/ShortTermFuelTrimBank1.cs b/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs
similarity index 67%
rename from OBD.NET/OBD.NET/OBDData/ShortTermFuelTrimBank1.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs
index d0f8aca..9255d88 100644
--- a/OBD.NET/OBD.NET/OBDData/ShortTermFuelTrimBank1.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class ShortTermFuelTrimBank1 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Trim => (A / 1.28) - 100;
+        public Percent Trim => new Percent((A / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/ShortTermFuelTrimBank2.cs b/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs
similarity index 67%
rename from OBD.NET/OBD.NET/OBDData/ShortTermFuelTrimBank2.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs
index 2efc75b..d1da873 100644
--- a/OBD.NET/OBD.NET/OBDData/ShortTermFuelTrimBank2.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class ShortTermFuelTrimBank2 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Trim => (A / 1.28) - 100;
+        public Percent Trim => new Percent((A / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/ThrottlePosition.cs b/OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs
similarity index 67%
rename from OBD.NET/OBD.NET/OBDData/ThrottlePosition.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs
index fb330ad..0f20e40 100644
--- a/OBD.NET/OBD.NET/OBDData/ThrottlePosition.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class ThrottlePosition : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Position => A / 2.55;
+        public Percent Position => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/TimingAdvance.cs b/OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/TimingAdvance.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs
index e9f5e66..cf14a75 100644
--- a/OBD.NET/OBD.NET/OBDData/TimingAdvance.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class TimingAdvance : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Timing => (A / 2.0) - 64;
+        public Degree Timing => new Degree((A / 2.0) - 64, -64, 63.5);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/VehicleSpeed.cs b/OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/VehicleSpeed.cs
rename to OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs
index 72129dc..308c5fd 100644
--- a/OBD.NET/OBD.NET/OBDData/VehicleSpeed.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class VehicleSpeed : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Speed => A;
+        public KilometrePerHour Speed => new KilometrePerHour(A, 0, 255);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AbsoluteBarometricPressure.cs b/OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs
similarity index 69%
rename from OBD.NET/OBD.NET/OBDData/AbsoluteBarometricPressure.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs
index d716bd2..4c12979 100644
--- a/OBD.NET/OBD.NET/OBDData/AbsoluteBarometricPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AbsoluteBarometricPressure : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Pressure => A;
+        public Kilopascal Pressure => new Kilopascal(A, 0, 255);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank1Sensor1.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs
similarity index 63%
rename from OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank1Sensor1.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs
index e01e5e0..23b2581 100644
--- a/OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank1Sensor1.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class CatalystTemperatureBank1Sensor1 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Temperature => (((256 * A) + B) / 10.0) - 40;
+        public DegreeCelsius Temperature => new DegreeCelsius((((256 * A) + B) / 10.0) - 40, -40, 6513.5);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank1Sensor2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs
similarity index 63%
rename from OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank1Sensor2.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs
index 50fefe1..dfdb6ab 100644
--- a/OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank1Sensor2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class CatalystTemperatureBank1Sensor2 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Temperature => (((256 * A) + B) / 10.0) - 40;
+        public DegreeCelsius Temperature => new DegreeCelsius((((256 * A) + B) / 10.0) - 40, -40, 6513.5);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank2Sensor1.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs
similarity index 63%
rename from OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank2Sensor1.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs
index 191d930..8917a77 100644
--- a/OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank2Sensor1.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class CatalystTemperatureBank2Sensor1 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Temperature => (((256 * A) + B) / 10.0) - 40;
+        public DegreeCelsius Temperature => new DegreeCelsius((((256 * A) + B) / 10.0) - 40, -40, 6513.5);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank2Sensor2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs
similarity index 63%
rename from OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank2Sensor2.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs
index 98cf32d..c3d691e 100644
--- a/OBD.NET/OBD.NET/OBDData/CatalystTemperatureBank2Sensor2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class CatalystTemperatureBank2Sensor2 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Temperature => (((256 * A) + B) / 10.0) - 40;
+        public DegreeCelsius Temperature => new DegreeCelsius((((256 * A) + B) / 10.0) - 40, -40, 6513.5);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/CommandedEGR.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs
similarity index 67%
rename from OBD.NET/OBD.NET/OBDData/CommandedEGR.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs
index 6d82aa5..6570dc0 100644
--- a/OBD.NET/OBD.NET/OBDData/CommandedEGR.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class CommandedEGR : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double EGR => A / 2.55;
+        public Percent EGR => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/CommandedEvaporativePurge.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs
similarity index 69%
rename from OBD.NET/OBD.NET/OBDData/CommandedEvaporativePurge.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs
index 6188da8..8161658 100644
--- a/OBD.NET/OBD.NET/OBDData/CommandedEvaporativePurge.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class CommandedEvaporativePurge : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Purge => A / 2.55;
+        public Percent Purge => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/DistanceTraveledSinceCodesCleared.cs b/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/DistanceTraveledSinceCodesCleared.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs
index a6cb67a..8eeecf4 100644
--- a/OBD.NET/OBD.NET/OBDData/DistanceTraveledSinceCodesCleared.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class DistanceTraveledSinceCodesCleared : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Distance => (256 * A) + B;
+        public Kilometre Distance => new Kilometre((256 * A) + B, 0, 65535);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/DistanceTraveledWithMILOn.cs b/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs
similarity index 67%
rename from OBD.NET/OBD.NET/OBDData/DistanceTraveledWithMILOn.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs
index 2b2ae19..543bbb6 100644
--- a/OBD.NET/OBD.NET/OBDData/DistanceTraveledWithMILOn.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class DistanceTraveledWithMILOn : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Distance => (256 * A) + B;
+        public Kilometre Distance => new Kilometre((256 * A) + B, 0, 65535);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/EGRError.cs b/OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs
similarity index 64%
rename from OBD.NET/OBD.NET/OBDData/EGRError.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs
index 0f9321e..424cb12 100644
--- a/OBD.NET/OBD.NET/OBDData/EGRError.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EGRError : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Error => (A / 1.28) - 100;
+        public Percent Error => new Percent((A / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/EvapSystemVaporPressure.cs b/OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/EvapSystemVaporPressure.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs
index 5a1d9d3..48c19a0 100644
--- a/OBD.NET/OBD.NET/OBDData/EvapSystemVaporPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EvapSystemVaporPressure : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Pressure => ((256 * A) + B) / 4.0;
+        public Pascal Pressure => new Pascal(((256 * A) + B) / 4.0, -8192, 8191.75);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelRailGaugePressure.cs b/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs
similarity index 64%
rename from OBD.NET/OBD.NET/OBDData/FuelRailGaugePressure.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs
index c9d8902..3979fe6 100644
--- a/OBD.NET/OBD.NET/OBDData/FuelRailGaugePressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class FuelRailGaugePressure : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Pressure => 10 * ((256 * A) + B);
+        public Kilopascal Pressure => new Kilopascal(10 * ((256 * A) + B), 0, 655350);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelRailPressure.cs b/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs
similarity index 62%
rename from OBD.NET/OBD.NET/OBDData/FuelRailPressure.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs
index b6a9ccb..741d1af 100644
--- a/OBD.NET/OBD.NET/OBDData/FuelRailPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class FuelRailPressure : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Pressure => 0.079 * ((256 * A) + B);
+        public Kilopascal Pressure => new Kilopascal(0.079 * ((256 * A) + B), 0, 5177.265);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelTankLevelInput.cs b/OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/FuelTankLevelInput.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs
index ccc0235..1b82960 100644
--- a/OBD.NET/OBD.NET/OBDData/FuelTankLevelInput.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class FuelTankLevelInput : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Level => A / 2.55;
+        public Percent Level => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs
new file mode 100644
index 0000000..f936ced
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor1FuelAir : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Volt Voltage => new Volt((80 / 25536.0) * ((256 * C) + D), 0, 8 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor1FuelAir()
+            : base(0x24, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs
new file mode 100644
index 0000000..8f2dd3b
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor1FuelAir2 : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Milliampere Current => new Milliampere(C + (D / 256.0) - 128, -128, 128 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor1FuelAir2()
+            : base(0x34, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs
new file mode 100644
index 0000000..9f4cb35
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor2FuelAir : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Volt Voltage => new Volt((80 / 25536.0) * ((256 * C) + D), 0, 8 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor2FuelAir()
+            : base(0x25, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs
new file mode 100644
index 0000000..be0a7f9
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor2FuelAir2 : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Milliampere Current => new Milliampere(C + (D / 256.0) - 128, -128, 128 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor2FuelAir2()
+            : base(0x35, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs
new file mode 100644
index 0000000..a994879
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor3FuelAir : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Volt Voltage => new Volt((80 / 25536.0) * ((256 * C) + D), 0, 8 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor3FuelAir()
+            : base(0x26, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs
new file mode 100644
index 0000000..a3ba63b
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor3FuelAir2 : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Milliampere Current => new Milliampere(C + (D / 256.0) - 128, -128, 128 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor3FuelAir2()
+            : base(0x36, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs
new file mode 100644
index 0000000..9121e38
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor4FuelAir : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Volt Voltage => new Volt((80 / 25536.0) * ((256 * C) + D), 0, 8 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor4FuelAir()
+            : base(0x27, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs
new file mode 100644
index 0000000..506a044
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor4FuelAir2 : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Milliampere Current => new Milliampere(C + (D / 256.0) - 128, -128, 128 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor4FuelAir2()
+            : base(0x37, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs
new file mode 100644
index 0000000..ea1e834
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor5FuelAir : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Volt Voltage => new Volt((80 / 25536.0) * ((256 * C) + D), 0, 8 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor5FuelAir()
+            : base(0x28, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs
new file mode 100644
index 0000000..a2ee939
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor5FuelAir2 : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Milliampere Current => new Milliampere(C + (D / 256.0) - 128, -128, 128 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor5FuelAir2()
+            : base(0x38, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs
new file mode 100644
index 0000000..fd54d20
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor6FuelAir : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Volt Voltage => new Volt((80 / 25536.0) * ((256 * C) + D), 0, 8 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor6FuelAir()
+            : base(0x29, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs
new file mode 100644
index 0000000..0896f78
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor6FuelAir2 : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Milliampere Current => new Milliampere(C + (D / 256.0) - 128, -128, 128 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor6FuelAir2()
+            : base(0x39, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs
new file mode 100644
index 0000000..b6fd22b
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor7FuelAir : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Volt Voltage => new Volt((80 / 25536.0) * ((256 * C) + D), 0, 8 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor7FuelAir()
+            : base(0x2A, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs
new file mode 100644
index 0000000..07763c1
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor7FuelAir2 : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Milliampere Current => new Milliampere(C + (D / 256.0) - 128, -128, 128 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor7FuelAir2()
+            : base(0x3A, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs
new file mode 100644
index 0000000..439d8ac
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor8FuelAir : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Volt Voltage => new Volt((80 / 25536.0) * ((256 * C) + D), 0, 8 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor8FuelAir()
+            : base(0x2B, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs
new file mode 100644
index 0000000..2f4c9a9
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs
@@ -0,0 +1,22 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class OxygenSensor8FuelAir2 : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio((2.0 / 25536.0) * ((256 * A) + B), 0, 2 - double.Epsilon);
+        public Milliampere Current => new Milliampere(C + (D / 256.0) - 128, -128, 128 - double.Epsilon);
+
+        #endregion
+
+        #region Constructors
+
+        public OxygenSensor8FuelAir2()
+            : base(0x3B, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/PidsSupported21_40.cs b/OBD.NET/OBD.NET/OBDData/20-3F/PidsSupported21_40.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/PidsSupported21_40.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/PidsSupported21_40.cs
diff --git a/OBD.NET/OBD.NET/OBDData/WarmUpsSinceCodesCleared.cs b/OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs
similarity index 70%
rename from OBD.NET/OBD.NET/OBDData/WarmUpsSinceCodesCleared.cs
rename to OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs
index 1afd458..db659f1 100644
--- a/OBD.NET/OBD.NET/OBDData/WarmUpsSinceCodesCleared.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class WarmUpsSinceCodesCleared : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int WarmUps => A;
+        public Count WarmUps => new Count(A, 0, 255);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AbsoluteEvapSystemVaporPressure.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/AbsoluteEvapSystemVaporPressure.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs
index 05a228a..447def9 100644
--- a/OBD.NET/OBD.NET/OBDData/AbsoluteEvapSystemVaporPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AbsoluteEvapSystemVaporPressure : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Pressure => ((256 * A) + B) / 200.0;
+        public Kilopascal Pressure => new Kilopascal(((256 * A) + B) / 200.0, 0, 327.675);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AbsoluteLoadValue.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/AbsoluteLoadValue.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs
index 06a4ee9..a00b9ae 100644
--- a/OBD.NET/OBD.NET/OBDData/AbsoluteLoadValue.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AbsoluteLoadValue : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Load => ((256 * A) + B) / 2.55;
+        public Percent Load => new Percent(((256 * A) + B) / 2.55, 0, 25700);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AbsoluteThrottlePositionB.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/AbsoluteThrottlePositionB.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs
index e1b532b..0341c0c 100644
--- a/OBD.NET/OBD.NET/OBDData/AbsoluteThrottlePositionB.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AbsoluteThrottlePositionB : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Position => A / 2.55;
+        public Percent Position => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AbsoluteThrottlePositionC.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/AbsoluteThrottlePositionC.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs
index 4d460b3..0da5f6c 100644
--- a/OBD.NET/OBD.NET/OBDData/AbsoluteThrottlePositionC.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AbsoluteThrottlePositionC : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Position => A / 2.55;
+        public Percent Position => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionD.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionD.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs
index 8260263..b3ccba9 100644
--- a/OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionD.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AcceleratorPedalPositionD : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Position => A / 2.55;
+        public Percent Position => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionE.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionE.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs
index 6f62c34..edcf213 100644
--- a/OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionE.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AcceleratorPedalPositionE : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Position => A / 2.55;
+        public Percent Position => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionF.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionF.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs
index 20558fd..1d4fbc3 100644
--- a/OBD.NET/OBD.NET/OBDData/AcceleratorPedalPositionF.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AcceleratorPedalPositionF : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Position => A / 2.55;
+        public Percent Position => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/AmbientAirTemperature.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/AmbientAirTemperature.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs
index 68ff920..5bab4b3 100644
--- a/OBD.NET/OBD.NET/OBDData/AmbientAirTemperature.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class AmbientAirTemperature : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Temperature => A - 40;
+        public DegreeCelsius Temperature => new DegreeCelsius(A - 40, -40, 215);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/CommandedThrottleActuator.cs b/OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs
similarity index 69%
rename from OBD.NET/OBD.NET/OBDData/CommandedThrottleActuator.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs
index adfdede..fabe7c0 100644
--- a/OBD.NET/OBD.NET/OBDData/CommandedThrottleActuator.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class CommandedThrottleActuator : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Value => A / 2.55;
+        public Percent Value => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/ControlModuleVoltage.cs b/OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/ControlModuleVoltage.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs
index c14a392..5e2f4f4 100644
--- a/OBD.NET/OBD.NET/OBDData/ControlModuleVoltage.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class ControlModuleVoltage : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Voltage => ((256 * A) + B) / 1000.0;
+        public Volt Voltage => new Volt(((256 * A) + B) / 1000.0, 0, 65.535);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/EngineFuelRate.cs b/OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs
similarity index 61%
rename from OBD.NET/OBD.NET/OBDData/EngineFuelRate.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs
index 71ebb52..0318bcf 100644
--- a/OBD.NET/OBD.NET/OBDData/EngineFuelRate.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EngineFuelRate : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double FuelRate => ((256 * A) + B) / 20.0;
+        public LitresPerHour FuelRate => new LitresPerHour(((256 * A) + B) / 20.0, 0, 3212.75);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/EngineOilTemperature.cs b/OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/EngineOilTemperature.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs
index 3097643..8f3a504 100644
--- a/OBD.NET/OBD.NET/OBDData/EngineOilTemperature.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EngineOilTemperature : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Temperature => A - 40;
+        public DegreeCelsius Temperature => new DegreeCelsius(A - 40, -40, 210);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/EthanolFuel.cs b/OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs
similarity index 67%
rename from OBD.NET/OBD.NET/OBDData/EthanolFuel.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs
index 36f64de..30f1150 100644
--- a/OBD.NET/OBD.NET/OBDData/EthanolFuel.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EthanolFuel : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Value => A / 2.55;
+        public Percent Value => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/EvapSystemVaporPressure2.cs b/OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/EvapSystemVaporPressure2.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs
index 1718531..c677962 100644
--- a/OBD.NET/OBD.NET/OBDData/EvapSystemVaporPressure2.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EvapSystemVaporPressure2 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Pressure => ((A * 256) + B) - 32767;
+        public Pascal Pressure => new Pascal(((A * 256) + B) - 32767, -32767, 32768);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelAirCommandedEquivalenceRatio.cs b/OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs
similarity index 64%
rename from OBD.NET/OBD.NET/OBDData/FuelAirCommandedEquivalenceRatio.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs
index 7c11983..8a6a75d 100644
--- a/OBD.NET/OBD.NET/OBDData/FuelAirCommandedEquivalenceRatio.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class FuelAirCommandedEquivalenceRatio : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Ratio => (2.0 / 65536.0) * ((256 * A) + B);
+        public Ratio Ratio => new Ratio((2.0 / 65536.0) * ((256 * A) + B), 0, 2.0 - double.Epsilon);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelInjectionTiming.cs b/OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs
similarity index 63%
rename from OBD.NET/OBD.NET/OBDData/FuelInjectionTiming.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs
index 4806641..3d583b5 100644
--- a/OBD.NET/OBD.NET/OBDData/FuelInjectionTiming.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class FuelInjectionTiming : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Timing => (((256 * A) + B) / 128.0) - 210;
+        public Degree Timing => new Degree((((256 * A) + B) / 128.0) - 210, -210, 301.992);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelRailAbsolutePressure.cs b/OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/FuelRailAbsolutePressure.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs
index 7b4d3cd..813ee11 100644
--- a/OBD.NET/OBD.NET/OBDData/FuelRailAbsolutePressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class FuelRailAbsolutePressure : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Pressure => 10 * ((256 * A) + B);
+        public Kilopascal Pressure => new Kilopascal(10 * ((256 * A) + B), 0, 655350);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/FuelType.cs b/OBD.NET/OBD.NET/OBDData/40-5F/FuelType.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/FuelType.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/FuelType.cs
diff --git a/OBD.NET/OBD.NET/OBDData/HybridBatteryPackRemainingLife.cs b/OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/HybridBatteryPackRemainingLife.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs
index eba142f..39c2253 100644
--- a/OBD.NET/OBD.NET/OBDData/HybridBatteryPackRemainingLife.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class HybridBatteryPackRemainingLife : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double RemainingLife => A / 2.55;
+        public Percent RemainingLife => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/LongTermSecondaryOxygenSensorTrimBank13.cs b/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs
similarity index 59%
rename from OBD.NET/OBD.NET/OBDData/LongTermSecondaryOxygenSensorTrimBank13.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs
index 2bbbd23..9b5ee7f 100644
--- a/OBD.NET/OBD.NET/OBDData/LongTermSecondaryOxygenSensorTrimBank13.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class LongtTermSecondaryOxygenSensorTrimBank13 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Bank1 => (A / 1.28) - 100;
-        public double Bank3 => (B / 1.28) - 100;
+        public Percent Bank1 => new Percent((A / 1.28) - 100, -100, 99.2);
+        public Percent Bank3 => new Percent((B / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/LongTermSecondaryOxygenSensorTrimBank24.cs b/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs
similarity index 59%
rename from OBD.NET/OBD.NET/OBDData/LongTermSecondaryOxygenSensorTrimBank24.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs
index 4003156..741a051 100644
--- a/OBD.NET/OBD.NET/OBDData/LongTermSecondaryOxygenSensorTrimBank24.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class LongTermSecondaryOxygenSensorTrimBank24 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Bank2 => (A / 1.28) - 100;
-        public double Bank4 => (B / 1.28) - 100;
+        public Percent Bank2 => new Percent((A / 1.28) - 100, -100, 99.2);
+        public Percent Bank4 => new Percent((B / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/MaximumValueForAirFlowRate.cs b/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/MaximumValueForAirFlowRate.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs
index 0c40e6a..4457e4e 100644
--- a/OBD.NET/OBD.NET/OBDData/MaximumValueForAirFlowRate.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class MaximumValueForAirFlowRate : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Value => A * 10;
+        public GramPerSec Value => new GramPerSec(A * 10, 0, 2550);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs b/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs
new file mode 100644
index 0000000..c549c30
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs
@@ -0,0 +1,24 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class MaximumValues : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Ratio FuelAirEquivalenceRatio => new Ratio(A, 0, 255);
+        public Volt OxygenSensorVoltage => new Volt(B, 0, 255);
+        public Milliampere OxygenSensorCurrent => new Milliampere(C, 0, 255);
+        public Kilopascal IntakeManifoldAbsolutePressure => new Kilopascal(D * 10, 0, 2550);
+
+        #endregion
+
+        #region Constructors
+
+        public MaximumValues()
+            : base(0x4F, 4)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/MonitorStatusThisDriveCycle.cs b/OBD.NET/OBD.NET/OBDData/40-5F/MonitorStatusThisDriveCycle.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/MonitorStatusThisDriveCycle.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/MonitorStatusThisDriveCycle.cs
diff --git a/OBD.NET/OBD.NET/OBDData/PidsSupported41_60.cs b/OBD.NET/OBD.NET/OBDData/40-5F/PidsSupported41_60.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/PidsSupported41_60.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/PidsSupported41_60.cs
diff --git a/OBD.NET/OBD.NET/OBDData/RelativeAcceleratorPedalPosition.cs b/OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs
similarity index 69%
rename from OBD.NET/OBD.NET/OBDData/RelativeAcceleratorPedalPosition.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs
index e86832f..692c5f6 100644
--- a/OBD.NET/OBD.NET/OBDData/RelativeAcceleratorPedalPosition.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class RelativeAcceleratorPedalPosition : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double PedalPosition => A / 2.55;
+        public Percent PedalPosition => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/RelativeThrottlePosition.cs b/OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/RelativeThrottlePosition.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs
index ae488d3..0aedcb7 100644
--- a/OBD.NET/OBD.NET/OBDData/RelativeThrottlePosition.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class RelativeThrottlePosition : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Position => A / 2.55;
+        public Percent Position => new Percent(A / 2.55, 0, 100);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/ShortTermSecondaryOxygenSensorTrimBank13.cs b/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs
similarity index 59%
rename from OBD.NET/OBD.NET/OBDData/ShortTermSecondaryOxygenSensorTrimBank13.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs
index bf995e2..1b641cc 100644
--- a/OBD.NET/OBD.NET/OBDData/ShortTermSecondaryOxygenSensorTrimBank13.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class ShortTermSecondaryOxygenSensorTrimBank13 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Bank1 => (A / 1.28) - 100;
-        public double Bank3 => (B / 1.28) - 100;
+        public Percent Bank1 => new Percent((A / 1.28) - 100, -100, 99.2);
+        public Percent Bank3 => new Percent((B / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/ShortTermSecondaryOxygenSensorTrimBank24.cs b/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs
similarity index 59%
rename from OBD.NET/OBD.NET/OBDData/ShortTermSecondaryOxygenSensorTrimBank24.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs
index 887342c..7920a34 100644
--- a/OBD.NET/OBD.NET/OBDData/ShortTermSecondaryOxygenSensorTrimBank24.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs
@@ -1,11 +1,13 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class ShortTermSecondaryOxygenSensorTrimBank24 : AbstractOBDData
     {
         #region Properties & Fields
 
-        public double Bank2 => (A / 1.28) - 100;
-        public double Bank4 => (B / 1.28) - 100;
+        public Percent Bank2 => new Percent((A / 1.28) - 100, -100, 99.2);
+        public Percent Bank4 => new Percent((B / 1.28) - 100, -100, 99.2);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/TimeRunWithMILOn.cs b/OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs
similarity index 67%
rename from OBD.NET/OBD.NET/OBDData/TimeRunWithMILOn.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs
index b42a7da..b5f95c6 100644
--- a/OBD.NET/OBD.NET/OBDData/TimeRunWithMILOn.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class TimeRunWithMILOn : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Time => (256 * A) + B;
+        public Minute Time => new Minute((256 * A) + B, 0, 65535);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/TimeSinceTroubleCodesCleared.cs b/OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs
similarity index 69%
rename from OBD.NET/OBD.NET/OBDData/TimeSinceTroubleCodesCleared.cs
rename to OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs
index 67a1240..e7dbcb1 100644
--- a/OBD.NET/OBD.NET/OBDData/TimeSinceTroubleCodesCleared.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class TimeSinceTroubleCodesCleared : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Time => (256 * A) + B;
+        public Minute Time => new Minute((256 * A) + B, 0, 65535);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/ActualEnginePercentTorque.cs b/OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs
similarity index 68%
rename from OBD.NET/OBD.NET/OBDData/ActualEnginePercentTorque.cs
rename to OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs
index 9cb6c34..0891a2f 100644
--- a/OBD.NET/OBD.NET/OBDData/ActualEnginePercentTorque.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class ActualEnginePercentTorque : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Torque => A - 125;
+        public Percent Torque => new Percent(A - 125, -125, 125);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/DriversDemandEnginePercentTorque.cs b/OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs
similarity index 69%
rename from OBD.NET/OBD.NET/OBDData/DriversDemandEnginePercentTorque.cs
rename to OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs
index bec0bea..2139f79 100644
--- a/OBD.NET/OBD.NET/OBDData/DriversDemandEnginePercentTorque.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class DriversDemandEnginePercentTorque : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Torque => A - 125;
+        public Percent Torque => new Percent(A - 125, -125, 125);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs b/OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs
new file mode 100644
index 0000000..a6935f7
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs
@@ -0,0 +1,25 @@
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
+{
+    public class EnginePercentTorqueData : AbstractOBDData
+    {
+        #region Properties & Fields
+
+        public Percent Idle => new Percent(A - 125, -125, 125);
+        public Percent EnginePoint1 => new Percent(B - 125, -125, 125);
+        public Percent EnginePoint2 => new Percent(C - 125, -125, 125);
+        public Percent EnginePoint3 => new Percent(D - 125, -125, 125);
+        public Percent EnginePoint4 => new Percent(E - 125, -125, 125);
+
+        #endregion
+
+        #region Constructors
+
+        public EnginePercentTorqueData()
+            : base(0x64, 5)
+        { }
+
+        #endregion
+    }
+}
diff --git a/OBD.NET/OBD.NET/OBDData/EngineReferenceTorque.cs b/OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs
similarity index 65%
rename from OBD.NET/OBD.NET/OBDData/EngineReferenceTorque.cs
rename to OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs
index b76bb5f..a71fa62 100644
--- a/OBD.NET/OBD.NET/OBDData/EngineReferenceTorque.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs
@@ -1,10 +1,12 @@
-namespace OBD.NET.OBDData
+using OBD.NET.DataTypes;
+
+namespace OBD.NET.OBDData
 {
     public class EngineReferenceTorque : AbstractOBDData
     {
         #region Properties & Fields
 
-        public int Torque => (256 * A) + B;
+        public NewtonMetre Torque => new NewtonMetre((256 * A) + B, 0, 65535);
 
         #endregion
 
diff --git a/OBD.NET/OBD.NET/OBDData/PidsSupported61_80.cs b/OBD.NET/OBD.NET/OBDData/60-7F/PidsSupported61_80.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/PidsSupported61_80.cs
rename to OBD.NET/OBD.NET/OBDData/60-7F/PidsSupported61_80.cs
diff --git a/OBD.NET/OBD.NET/OBDData/PidsSupported81_A0.cs b/OBD.NET/OBD.NET/OBDData/80-9F/PidsSupported81_A0.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/PidsSupported81_A0.cs
rename to OBD.NET/OBD.NET/OBDData/80-9F/PidsSupported81_A0.cs
diff --git a/OBD.NET/OBD.NET/OBDData/PidsSupportedA1_C0.cs b/OBD.NET/OBD.NET/OBDData/A0-BF/PidsSupportedA1_C0.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/PidsSupportedA1_C0.cs
rename to OBD.NET/OBD.NET/OBDData/A0-BF/PidsSupportedA1_C0.cs
diff --git a/OBD.NET/OBD.NET/OBDData/AbstractOBDData.cs b/OBD.NET/OBD.NET/OBDData/AbstractOBDData.cs
index 4d1d26d..9880693 100644
--- a/OBD.NET/OBD.NET/OBDData/AbstractOBDData.cs
+++ b/OBD.NET/OBD.NET/OBDData/AbstractOBDData.cs
@@ -29,7 +29,7 @@ namespace OBD.NET.OBDData
         protected byte C => RawData.Length > 2 ? RawData[2] : default(byte);
         protected byte D => RawData.Length > 3 ? RawData[3] : default(byte);
         protected byte E => RawData.Length > 4 ? RawData[4] : default(byte);
-        
+
         #endregion
 
         #region Constructors
@@ -44,9 +44,6 @@ namespace OBD.NET.OBDData
             : this(pid, length)
         {
             this.RawData = rawData;
-
-            if (rawData.Length != _length)
-                throw new ArgumentException("The provided raw-data is not valid", nameof(rawData));
         }
 
         #endregion
diff --git a/OBD.NET/OBD.NET/OBDData/PidsSupportedC1_E0.cs b/OBD.NET/OBD.NET/OBDData/C0-DF/PidsSupportedC1_E0.cs
similarity index 100%
rename from OBD.NET/OBD.NET/OBDData/PidsSupportedC1_E0.cs
rename to OBD.NET/OBD.NET/OBDData/C0-DF/PidsSupportedC1_E0.cs
diff --git a/OBD.NET/OBD.NET/OBDData/EmissionRequirementsToWhichVehicleIsDesigned.cs b/OBD.NET/OBD.NET/OBDData/EmissionRequirementsToWhichVehicleIsDesigned.cs
deleted file mode 100644
index 34b5d4d..0000000
--- a/OBD.NET/OBD.NET/OBDData/EmissionRequirementsToWhichVehicleIsDesigned.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class EmissionRequirementsToWhichVehicleIsDesigned : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public byte EmissionRequirement => A;
-
-        #endregion
-
-        #region Constructors
-
-        public EmissionRequirementsToWhichVehicleIsDesigned()
-            : base(0x5F, 1)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/EnginePercentTorqueData.cs b/OBD.NET/OBD.NET/OBDData/EnginePercentTorqueData.cs
deleted file mode 100644
index b401aa5..0000000
--- a/OBD.NET/OBD.NET/OBDData/EnginePercentTorqueData.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class EnginePercentTorqueData : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public int Idle => A - 125;
-        public int EnginePoint1 => B - 125;
-        public int EnginePoint2 => C - 125;
-        public int EnginePoint3 => D - 125;
-        public int EnginePoint4 => E - 125;
-
-        #endregion
-
-        #region Constructors
-
-        public EnginePercentTorqueData()
-            : base(0x64, 5)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/MaximumValues.cs b/OBD.NET/OBD.NET/OBDData/MaximumValues.cs
deleted file mode 100644
index 69d757f..0000000
--- a/OBD.NET/OBD.NET/OBDData/MaximumValues.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class MaximumValues : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public int FuelAirEquivalenceRatio => A;
-        public int OxygenSensorVoltage => B;
-        public int OxygenSensorCurrent => C;
-        public int IntakeManifoldAbsolutePressure => D * 10;
-
-        #endregion
-
-        #region Constructors
-
-        public MaximumValues()
-            : base(0x4F, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelAir.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelAir.cs
deleted file mode 100644
index 18264f4..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelAir.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor1FuelAir : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Voltage => (80 / 25536.0) * ((256 * C) + D);
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor1FuelAir()
-            : base(0x24, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelAir2.cs
deleted file mode 100644
index 8586b23..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor1FuelAir2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor1FuelAir2 : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Current => C + (D / 256.0) - 128;
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor1FuelAir2()
-            : base(0x34, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelAir.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelAir.cs
deleted file mode 100644
index 8869625..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelAir.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor2FuelAir : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Voltage => (80 / 25536.0) * ((256 * C) + D);
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor2FuelAir()
-            : base(0x25, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelAir2.cs
deleted file mode 100644
index f856dc2..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor2FuelAir2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor2FuelAir2 : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Current => C + (D / 256.0) - 128;
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor2FuelAir2()
-            : base(0x35, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelAir.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelAir.cs
deleted file mode 100644
index 9afd20f..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelAir.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor3FuelAir : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Voltage => (80 / 25536.0) * ((256 * C) + D);
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor3FuelAir()
-            : base(0x26, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelAir2.cs
deleted file mode 100644
index 48d6a92..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor3FuelAir2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor3FuelAir2 : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Current => C + (D / 256.0) - 128;
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor3FuelAir2()
-            : base(0x36, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelAir.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelAir.cs
deleted file mode 100644
index 8a6582e..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelAir.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor4FuelAir : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Voltage => (80 / 25536.0) * ((256 * C) + D);
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor4FuelAir()
-            : base(0x27, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelAir2.cs
deleted file mode 100644
index 6b038ec..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor4FuelAir2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor4FuelAir2 : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Current => C + (D / 256.0) - 128;
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor4FuelAir2()
-            : base(0x37, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelAir.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelAir.cs
deleted file mode 100644
index e1f6dcc..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelAir.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor5FuelAir : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Voltage => (80 / 25536.0) * ((256 * C) + D);
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor5FuelAir()
-            : base(0x28, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelAir2.cs
deleted file mode 100644
index 2f3477d..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor5FuelAir2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor5FuelAir2 : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Current => C + (D / 256.0) - 128;
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor5FuelAir2()
-            : base(0x38, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelAir.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelAir.cs
deleted file mode 100644
index 687f9b0..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelAir.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor6FuelAir : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Voltage => (80 / 25536.0) * ((256 * C) + D);
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor6FuelAir()
-            : base(0x29, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelAir2.cs
deleted file mode 100644
index 0286fee..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor6FuelAir2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor6FuelAir2 : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Current => C + (D / 256.0) - 128;
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor6FuelAir2()
-            : base(0x39, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelAir.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelAir.cs
deleted file mode 100644
index 61629d6..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelAir.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor7FuelAir : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Voltage => (80 / 25536.0) * ((256 * C) + D);
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor7FuelAir()
-            : base(0x2A, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelAir2.cs
deleted file mode 100644
index eccc6e1..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor7FuelAir2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor7FuelAir2 : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Current => C + (D / 256.0) - 128;
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor7FuelAir2()
-            : base(0x3A, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelAir.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelAir.cs
deleted file mode 100644
index 42ba8ac..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelAir.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor8FuelAir : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Voltage => (80 / 25536.0) * ((256 * C) + D);
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor8FuelAir()
-            : base(0x2B, 4)
-        { }
-
-        #endregion
-    }
-}
diff --git a/OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelAir2.cs
deleted file mode 100644
index fb99720..0000000
--- a/OBD.NET/OBD.NET/OBDData/OxygenSensor8FuelAir2.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace OBD.NET.OBDData
-{
-    public class OxygenSensor8FuelAir2 : AbstractOBDData
-    {
-        #region Properties & Fields
-
-        public double FuelAirEquivalenceRatio => (2.0 / 25536.0) * ((256 * A) + B);
-        public double Current => C + (D / 256.0) - 128;
-
-        #endregion
-
-        #region Constructors
-
-        public OxygenSensor8FuelAir2()
-            : base(0x3B, 4)
-        { }
-
-        #endregion
-    }
-}