diff --git a/pom.xml b/pom.xml
index 2e705bc..d5af6b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,16 +75,16 @@
         <dependency>
             <groupId>nl.sbdeveloper</groupId>
             <artifactId>VehiclesPlus-v2</artifactId>
-            <version>2.3.5</version>
+            <version>2.4.4.1</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/libs/VehiclesPlus-2.3.5.jar</systemPath>
+            <systemPath>${project.basedir}/src/libs/VehiclesPlus-2.4.4.1.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>nl.sbdeveloper</groupId>
             <artifactId>VehiclesPlus-v3</artifactId>
-            <version>3.0.0-PRE3</version>
+            <version>3.0.0-SNAPSHOT</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/libs/VehiclesPlus-3.0.0-PRE3.jar</systemPath>
+            <systemPath>${project.basedir}/src/libs/VehiclesPlus-3.0.0-SNAPSHOT.jar</systemPath>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java b/src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java
index 69bad9d..d070067 100644
--- a/src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java
+++ b/src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java
@@ -21,6 +21,7 @@ import nl.sbdeveloper.vehiclesplus.api.vehicles.VehicleModel;
 import nl.sbdeveloper.vehiclesplus.api.vehicles.settings.UpgradableSetting;
 import nl.sbdeveloper.vehiclesplus.api.vehicles.settings.impl.*;
 import nl.sbdeveloper.vehiclesplus.storage.db.exceptions.DataStorageException;
+import nl.sbdeveloper.vehiclesplus.utils.jackson.ColorList;
 import org.bukkit.Bukkit;
 import org.bukkit.Particle;
 import org.bukkit.command.CommandSender;
@@ -100,11 +101,11 @@ public class Converter {
     private static void convertVehicleModels() {
         for (BaseVehicle baseVehicle : VehiclesPlusAPI.getVehicleManager().getBaseVehicleMap().values()) {
             try {
-                VehicleModel.VehicleModelBuilder vehicleModelBuilder = VehicleModel.builder()
+                VehicleModel.Builder vehicleModelBuilder = VehicleModel.builder()
                         .id(baseVehicle.getName())
                         .displayName(baseVehicle.getName())
                         .typeId(getTypeIdByClass(baseVehicle.getName(), getClassByFullName(baseVehicle.getVehicleType())))
-                        .availableColors(baseVehicle.getBaseColorList());
+                        .availableColors(new ColorList(baseVehicle.getBaseColorList()));
 
                 for (Part part : baseVehicle.getPartList()) {
                     if (part instanceof BikeSeat) {
@@ -175,8 +176,9 @@ public class Converter {
                                 wheel.getXOffset(),
                                 wheel.getYOffset(),
                                 wheel.getZOffset(),
-                                VehiclesPlus.getVehicleManager().getRimDesignHashMap().values().stream().findFirst().orElseThrow(() -> new ConversionException("No RimDesign found while loading Wheel in file", baseVehicle.getName())).getName(),
+                                nl.sbdeveloper.vehiclesplus.api.VehiclesPlusAPI.getRimDesign(VehiclesPlus.getVehicleManager().getRimDesignHashMap().values().stream().findFirst().orElseThrow(() -> new ConversionException("No RimDesign found while loading Wheel in file", baseVehicle.getName())).getName()).orElseThrow(() -> new ConversionException("No matching RimDesign found while loading Wheel in file", baseVehicle.getName())),
                                 wheel.getColor(),
+                                HolderItemPosition.HEAD,
                                 wheel.getSteering(),
                                 wheel.getRotationOffset()
                         ));
@@ -188,29 +190,32 @@ public class Converter {
                                 baseVehicle.getSpeedSettings().getBase(),
                                 baseVehicle.getSpeedSettings().getMax(),
                                 baseVehicle.getSpeedSettings().getStep(),
-                                baseVehicle.getSpeedSettings().getUpgradeCost()
+                                baseVehicle.getSpeedSettings().getUpgradeCost(), "km/h"
                         ))
                         .fuelTank(new UpgradableSetting(
                                 baseVehicle.getFuelTankSettings().getBase(),
                                 baseVehicle.getFuelTankSettings().getMax(),
                                 baseVehicle.getFuelTankSettings().getStep(),
-                                baseVehicle.getFuelTankSettings().getUpgradeCost()
+                                baseVehicle.getFuelTankSettings().getUpgradeCost(), "L"
                         ))
                         .turningRadius(new UpgradableSetting(
                                 baseVehicle.getTurningRadiusSettings().getBase(),
                                 baseVehicle.getTurningRadiusSettings().getMax(),
                                 baseVehicle.getTurningRadiusSettings().getStep(),
-                                baseVehicle.getTurningRadiusSettings().getUpgradeCost()
+                                baseVehicle.getTurningRadiusSettings().getUpgradeCost(), ""
                         ))
                         .acceleration(new UpgradableSetting(
                                 baseVehicle.getAccelerationSettings().getBase(),
                                 baseVehicle.getAccelerationSettings().getMax(),
                                 baseVehicle.getAccelerationSettings().getStep(),
-                                baseVehicle.getAccelerationSettings().getUpgradeCost()
+                                baseVehicle.getAccelerationSettings().getUpgradeCost(), ""
                         ))
                         .horn(new Horn(
                                 baseVehicle.getHornSettings().getEnabled(),
-                                baseVehicle.getHornSettings().getSound().name()
+                                new Sounds.Sound(
+                                        baseVehicle.getHornSettings().getSound().name(),
+                                        1
+                                )
                         ))
                         .drift(baseVehicle.getDrift())
                         .exhaust(new Exhaust(
@@ -242,6 +247,7 @@ public class Converter {
                                 .spawn("vp.spawn." + baseVehicle.getName())
                                 .build())
                         .sounds(defaultSounds)
+                        .gearbox(new Gearbox(true, 10))
                         .build();
 
                 saveToVehiclesPlus(model, "vehicles/" + model.getTypeId(), model.getId());
@@ -256,7 +262,7 @@ public class Converter {
             UUID ownerUUID = set.getKey();
             String ownerName = Bukkit.getOfflinePlayer(ownerUUID).getName();
             if (ownerName == null) {
-                Bukkit.getLogger().severe("Could not convert vehicle for player with UUID " + ownerUUID + ", the player name is unknown!");
+                Bukkit.getLogger().severe("Could not convert vehicles for player with UUID " + ownerUUID + ", the player name is unknown!");
                 continue;
             }
 
@@ -268,19 +274,19 @@ public class Converter {
                             nl.sbdeveloper.vehiclesplus.api.VehiclesPlusAPI.getVehicleModels().values().stream().filter(v -> v.getId().equalsIgnoreCase(vehicle.getBaseVehicle())).findFirst().orElseThrow(() -> new ConversionException("No VehicleModel found for", vehicle.getUuid()))
                     );
 
-                    newVehicle.save();
+                    newVehicle.forceSave();
                     garage.addVehicle(newVehicle.getUuid());
                 } catch (Exception e) {
                     e.printStackTrace();
-                    Bukkit.getLogger().severe("Could not convert vehicle for player with UUID " + ownerUUID + ", could not save the vehicle!");
+                    Bukkit.getLogger().severe("Could not convert vehicles for player with UUID " + ownerUUID + ", could not save the vehicle!");
                 }
             }
 
             try {
-                garage.save();
+                garage.forceSave();
             } catch (DataStorageException e) {
                 e.printStackTrace();
-                Bukkit.getLogger().severe("Could not convert vehicle for player with UUID " + ownerUUID + ", could not save the garage!");
+                Bukkit.getLogger().severe("Could not convert vehicles for player with UUID " + ownerUUID + ", could not save the garage!");
             }
         }
     }
diff --git a/src/main/java/tech/sbdevelopment/vehiclesplusconverter/utils/MainUtil.java b/src/main/java/tech/sbdevelopment/vehiclesplusconverter/utils/MainUtil.java
index 8b96e0c..08814e3 100644
--- a/src/main/java/tech/sbdevelopment/vehiclesplusconverter/utils/MainUtil.java
+++ b/src/main/java/tech/sbdevelopment/vehiclesplusconverter/utils/MainUtil.java
@@ -27,17 +27,17 @@ public class MainUtil {
     public static String getTypeIdByClass(String baseVehicle, String type) throws ConversionException {
         switch (type) {
             case "BikeType":
-                return "bike";
+                return "bikes";
             case "BoatType":
-                return "boat";
+                return "boats";
             case "CarType":
-                return "car";
+                return "cars";
             case "HelicopterType":
-                return "helicopter";
+                return "helicopters";
             case "HovercraftType":
-                return "hovercraft";
+                return "hovercrafts";
             case "PlaneType":
-                return "plane";
+                return "planes";
             default:
                 throw new InvalidConversionException("vehicleType", baseVehicle);
         }