diff --git a/vehicle_profiles.json b/vehicle_profiles.json
index 8b1f456..c6c951b 100644
--- a/vehicle_profiles.json
+++ b/vehicle_profiles.json
@@ -1 +1 @@
-{"cars":[{"car_model":"AAA: Generic","init":"ATSP6;","pids":[{"pid":"010C1","parameters":[{"name":"EngineRPM","expression":"[B3:B4]*0.25","unit":"RPM","class":"frequency"}]},{"pid":"010D1","parameters":[{"name":"VehicleSpeed","expression":"B3","unit":"km/h","class":"speed"}]},{"pid":"01051","parameters":[{"name":"Coolant","expression":"B3-40","unit":"°C","class":"temperature"}]},{"pid":"012F1","parameters":[{"name":"FuelLevel","expression":"B3/2.55","unit":"%","class":"none"}]},{"pid":"010F1","parameters":[{"name":"IntakeAirTemp","expression":"B3-40","unit":"%","class":"none"}]},{"pid":"01111","parameters":[{"name":"Throttle","expression":"B3/2.55","unit":"%","class":"none"}]},{"pid":"01101","parameters":[{"name":"MAF","expression":"[B3:B4]*0.01","unit":"%","class":"none"}]},{"pid":"010A1","parameters":[{"name":"FuelPressure","expression":"B3*3","unit":"kPa","class":"pressure"}]},{"pid":"01061","parameters":[{"name":"ShortTermFuelTrim","expression":"(B3/1.28)-100","unit":"none","class":"%"}]},{"pid":"01A61","parameters":[{"name":"Odometer","expression":"[B3:B6]","unit":"km","class":"none"}]}]},{"car_model":"BMW: i3","init":"ATAT0;ATCEA07;ATTAF1;ATFCSH6F1;ATSH6F1;ATFCSD07300000;ATFCSM1;ATCRA607;","pids":[{"pid":"22DDBC3","parameters":[{"name":"SoC","expression":"[B11:B12]/10","unit":"%","class":"battery"}]}]},{"car_model":"BYD: Atto 3","init":"ATAT1;ATST96;ATSH7E7;ATFCSH7E7;ATFCSD300000;ATFCSM1;","pids":[{"pid":"221FFC1","parameters":[{"name":"SOC","expression":"((B5*256)+B4)/100","unit":"%","class":"battery"}]}]},{"car_model":"Hyundai: Ioniq2017","init":"ATSP6;ATSH7E4;ATST96;","pids":[{"pid":"21057","parameters":[{"name":"SOC_DISPLAY","expression":"B39/2","unit":"%","class":"battery"}]}]},{"car_model":"Hyundai: Ioniq5/Ioniq6/Kona","init":"ATSH7E4;ATST96;","pids":[{"pid":"2201019","parameters":[{"name":"SOC_BMS","expression":"B10/2","unit":"%","class":"battery"},{"name":"Max_REGEN","expression":"[B11:B12]/100","unit":"kW","class":"power"},{"name":"Max_Power","expression":"[B13:B14]/100","unit":"kW","class":"power"},{"name":"Batt_Current","expression":"(65536-([B17:B18]))/10","unit":"A","class":"current"},{"name":"HV_Volts","expression":"[B19:B20]/10","unit":"V","class":"voltage"},{"name":"Batt_MaxT","expression":"B21","unit":"°C","class":"temperature"},{"name":"Batt_MinT","expression":"B22","unit":"°C","class":"temperature"},{"name":"Batt_Temp_1","expression":"B23","unit":"°C","class":"temperature"},{"name":"Batt_Temp_2","expression":"B25","unit":"°C","class":"temperature"},{"name":"Batt_Temp_3","expression":"B26","unit":"°C","class":"temperature"},{"name":"Batt_Temp_4","expression":"B27","unit":"°C","class":"temperature"},{"name":"Batt_Temp_5","expression":"B28","unit":"°C","class":"temperature"},{"name":"Batt_InletT","expression":"B30","unit":"°C","class":"temperature"},{"name":"Max_Cell_V","expression":"B31/50","unit":"V","class":"voltage"},{"name":"Max_Cell_V_No","expression":"B33","unit":"none","class":"none"},{"name":"Min_Cell_V","expression":"B34/50","unit":"V","class":"voltage"},{"name":"Min_Cell_V_No","expression":"B35","unit":"none","class":"none"},{"name":"Aux_Batt_Volts","expression":"B38*0.1","unit":"V","class":"voltage"}]},{"pid":"2201057","parameters":[{"name":"SOH","expression":"[B34:B35]/10","unit":"%","class":"battery"},{"name":"SOC_D","expression":"B41/2","unit":"%","class":"battery"}]}]},{"car_model":"Renault: Kangoo Z.E","init":"ATSP6;","pids":[{"pid":"222002","parameters":[{"name":"SoC","expression":"((B4*256)+B5)/50","unit":"%","class":"battery"}]}]},{"car_model":"Toyota: Rav4","init":"ATSP6;ATST96;","pids":[{"pid":"015B2","parameters":[{"name":"SoC","expression":"(B3*20)/51","unit":"%","class":"battery"}]}]},{"car_model":"VW: e-Golf","init":"ATSP6;ATST96;ATSH7E5;","pids":[{"pid":"22028C1","parameters":[{"name":"SOC","expression":"(B4*10)/22","unit":"%","class":"battery"}]}]},{"car_model":"VW: e-Up","init":"ATSP6;ATST96;","pids":[{"pid":"22028C1","parameters":[{"name":"SOC","expression":"B4/2.5","unit":"%","class":"battery"}]}]},{"car_model":"VW: id-3","init":"ATSP6;ATST96;ATFCSD300000;ATFCSM1;","pids":[{"pid":"22028C1","parameters":[{"name":"SOC","pid_init":"ATSHFC007B;ATCP17;ATCRA17FE007B;ATFCSH17FC007B;","expression":"((B4*51)/115)-6.4","unit":"%","class":"battery"}]},{"pid":"222AB62","parameters":[{"name":"Range","pid_init":"ATSH710;ATCP18;ATCRA77A;ATFCSH710;","expression":"(B5*256)+B6","unit":"km","class":"none"}]},{"pid":"22295A","parameters":[{"name":"Odometer","pid_init":"ATSHFC0076;ATCP17;ATCRA17FE0076;ATFCSH17FC0076;","expression":"[B4:B6]","unit":"km","class":"none"}]}]}]}
\ No newline at end of file
+{"cars":[{"car_model":"AAA: Generic","init":"ATSP6;","pids":[{"pid":"010C1","parameters":[{"name":"EngineRPM","expression":"[B3:B4]*0.25","unit":"RPM","class":"frequency"}]},{"pid":"010D1","parameters":[{"name":"VehicleSpeed","expression":"B3","unit":"km/h","class":"speed"}]},{"pid":"01051","parameters":[{"name":"Coolant","expression":"B3-40","unit":"°C","class":"temperature"}]},{"pid":"012F1","parameters":[{"name":"FuelLevel","expression":"B3/2.55","unit":"%","class":"none"}]},{"pid":"010F1","parameters":[{"name":"IntakeAirTemp","expression":"B3-40","unit":"°C","class":"temperature"}]},{"pid":"01111","parameters":[{"name":"Throttle","expression":"B3/2.55","unit":"%","class":"none"}]},{"pid":"01101","parameters":[{"name":"MAF","expression":"[B3:B4]*0.01","unit":"g/s","class":"none"}]},{"pid":"010A1","parameters":[{"name":"FuelPressure","expression":"B3*3","unit":"kPa","class":"pressure"}]},{"pid":"01061","parameters":[{"name":"ShortTermFuelTrim","expression":"(B3/1.28)-100","unit":"%","class":"none"}]},{"pid":"01A61","parameters":[{"name":"Odometer","expression":"[B3:B6]","unit":"km","class":"distance"}]}]},{"car_model":"BMW: i3","init":"ATAT0;ATCEA07;ATTAF1;ATFCSH6F1;ATSH6F1;ATFCSD07300000;ATFCSM1;ATCRA607;","pids":[{"pid":"22DDBC3","parameters":[{"name":"SoC","expression":"[B11:B12]/10","unit":"%","class":"battery"}]}]},{"car_model":"BYD: Atto 3","init":"ATAT1;ATST96;ATSH7E7;ATFCSH7E7;ATFCSD300000;ATFCSM1;","pids":[{"pid":"221FFC1","parameters":[{"name":"SOC","expression":"((B5*256)+B4)/100","unit":"%","class":"battery"}]}]},{"car_model":"Hyundai: Ioniq2017","init":"ATSP6;ATSH7E4;ATST96;","pids":[{"pid":"21057","parameters":[{"name":"SOC_DISPLAY","expression":"B39/2","unit":"%","class":"battery"}]}]},{"car_model":"Hyundai: Ioniq5/Ioniq6/Kona","init":"ATSH7E4;ATST96;","pids":[{"pid":"2201019","parameters":[{"name":"SOC_BMS","expression":"B10/2","unit":"%","class":"battery"},{"name":"Max_REGEN","expression":"[B11:B12]/100","unit":"kW","class":"power"},{"name":"Max_Power","expression":"[B13:B14]/100","unit":"kW","class":"power"},{"name":"Batt_Current","expression":"(65536-([B17:B18]))/10","unit":"A","class":"current"},{"name":"HV_Volts","expression":"[B19:B20]/10","unit":"V","class":"voltage"},{"name":"Batt_MaxT","expression":"B21","unit":"°C","class":"temperature"},{"name":"Batt_MinT","expression":"B22","unit":"°C","class":"temperature"},{"name":"Batt_Temp_1","expression":"B23","unit":"°C","class":"temperature"},{"name":"Batt_Temp_2","expression":"B25","unit":"°C","class":"temperature"},{"name":"Batt_Temp_3","expression":"B26","unit":"°C","class":"temperature"},{"name":"Batt_Temp_4","expression":"B27","unit":"°C","class":"temperature"},{"name":"Batt_Temp_5","expression":"B28","unit":"°C","class":"temperature"},{"name":"Batt_InletT","expression":"B30","unit":"°C","class":"temperature"},{"name":"Max_Cell_V","expression":"B31/50","unit":"V","class":"voltage"},{"name":"Max_Cell_V_No","expression":"B33","unit":"none","class":"none"},{"name":"Min_Cell_V","expression":"B34/50","unit":"V","class":"voltage"},{"name":"Min_Cell_V_No","expression":"B35","unit":"none","class":"none"},{"name":"Aux_Batt_Volts","expression":"B38*0.1","unit":"V","class":"voltage"}]},{"pid":"2201057","parameters":[{"name":"SOH","expression":"[B34:B35]/10","unit":"%","class":"battery"},{"name":"SOC_D","expression":"B41/2","unit":"%","class":"battery"}]}]},{"car_model":"Renault: Kangoo Z.E","init":"ATSP6;","pids":[{"pid":"222002","parameters":[{"name":"SoC","expression":"((B4*256)+B5)/50","unit":"%","class":"battery"}]}]},{"car_model":"Toyota: Rav4","init":"ATSP6;ATST96;","pids":[{"pid":"015B2","parameters":[{"name":"SoC","expression":"(B3*20)/51","unit":"%","class":"battery"}]}]},{"car_model":"VW: e-Golf","init":"ATSP6;ATST96;ATSH7E5;","pids":[{"pid":"22028C1","parameters":[{"name":"SOC","expression":"(B4*10)/22","unit":"%","class":"battery"}]}]},{"car_model":"VW: e-Up","init":"ATSP6;ATST96;","pids":[{"pid":"22028C1","parameters":[{"name":"SOC","expression":"B4/2.5","unit":"%","class":"battery"}]}]},{"car_model":"VW: id-3","init":"ATSP6;ATST96;ATFCSD300000;ATFCSM1;","pids":[{"pid":"22028C1","parameters":[{"name":"SOC","pid_init":"ATSHFC007B;ATCP17;ATCRA17FE007B;ATFCSH17FC007B;","expression":"((B4*51)/115)-6.4","unit":"%","class":"battery"}]},{"pid":"222AB62","parameters":[{"name":"Range","pid_init":"ATSH710;ATCP18;ATCRA77A;ATFCSH710;","expression":"(B5*256)+B6","unit":"km","class":"none"}]},{"pid":"22295A","parameters":[{"name":"Odometer","pid_init":"ATSHFC0076;ATCP17;ATCRA17FE0076;ATFCSH17FC0076;","expression":"[B4:B6]","unit":"km","class":"none"}]}]}]}
\ No newline at end of file
diff --git a/vehicle_profiles/generic.json b/vehicle_profiles/generic.json
index 3a557ca..d44cc1d 100644
--- a/vehicle_profiles/generic.json
+++ b/vehicle_profiles/generic.json
@@ -52,8 +52,8 @@
                 {
                     "name": "IntakeAirTemp",
                     "expression": "B3-40",
-                    "unit": "%",
-                    "class": "none"
+                    "unit": "°C",
+                    "class": "temperature"
                 }
             ]
         },
@@ -74,7 +74,7 @@
                 {
                     "name": "MAF",
                     "expression": "[B3:B4]*0.01",
-                    "unit": "%",
+                    "unit": "g/s",
                     "class": "none"
                 }
             ]
@@ -96,8 +96,8 @@
                 {
                     "name": "ShortTermFuelTrim",
                     "expression": "(B3/1.28)-100",
-                    "unit": "none",
-                    "class": "%"
+                    "unit": "%",
+                    "class": "none"
                 }
             ]
         },
@@ -108,7 +108,7 @@
                     "name": "Odometer",
                     "expression": "[B3:B6]",
                     "unit": "km",
-                    "class": "none"
+                    "class": "distance"
                 }
             ]
         }