diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj
index deed1c4..60395bf 100644
--- a/AutoCat.xcodeproj/project.pbxproj
+++ b/AutoCat.xcodeproj/project.pbxproj
@@ -1761,7 +1761,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 168;
+				CURRENT_PROJECT_VERSION = 169;
 				DEVELOPMENT_TEAM = 46DTTB8X4S;
 				INFOPLIST_FILE = AutoCat/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = AutoCat;
@@ -1790,7 +1790,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 168;
+				CURRENT_PROJECT_VERSION = 169;
 				DEVELOPMENT_TEAM = 46DTTB8X4S;
 				INFOPLIST_FILE = AutoCat/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = AutoCat;
diff --git a/AutoCatCoreTests/VehicleServiceTests.swift b/AutoCatCoreTests/VehicleServiceTests.swift
index d92c574..bb8f815 100644
--- a/AutoCatCoreTests/VehicleServiceTests.swift
+++ b/AutoCatCoreTests/VehicleServiceTests.swift
@@ -41,7 +41,7 @@ struct VehicleServiceTests {
             .willThrow(TestError.generic)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willThrow(TestError.generic)
         
         given(locationServiceMock)
@@ -53,7 +53,7 @@ struct VehicleServiceTests {
             .willThrow(TestError.generic)
         
         await #expect(throws: TestError.generic) {
-            _ = try await vehicleService.check(number: existingVehicleNumber, trackLocation: true)
+            _ = try await vehicleService.check(number: existingVehicleNumber, numberType: .plateNumber, trackLocation: true)
         }
     }
 
@@ -69,7 +69,7 @@ struct VehicleServiceTests {
             .willThrow(TestError.generic)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willThrow(TestError.generic)
         
         given(locationServiceMock)
@@ -80,7 +80,7 @@ struct VehicleServiceTests {
             .updateVehicle(dto: .any, policy: .any)
             .willReturn(true)
         
-        let result = try await vehicleService.check(number: existingVehicleNumber, trackLocation: true)
+        let result = try await vehicleService.check(number: existingVehicleNumber, numberType: .plateNumber, trackLocation: true)
         
         #expect(result.vehicle.unrecognized)
         #expect(result.vehicle.events.isEmpty)
@@ -102,7 +102,7 @@ struct VehicleServiceTests {
             .willThrow(TestError.generic)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willThrow(TestError.generic)
         
         given(locationServiceMock)
@@ -113,7 +113,7 @@ struct VehicleServiceTests {
             .updateVehicle(dto: .any, policy: .any)
             .willReturn(true)
         
-        let result = try await vehicleService.check(number: existingVehicleNumber, trackLocation: true)
+        let result = try await vehicleService.check(number: existingVehicleNumber, numberType: .plateNumber, trackLocation: true)
         
         #expect(result.vehicle.vin1 == testVin)
         #expect(result.errors.count == 2)
@@ -134,7 +134,7 @@ struct VehicleServiceTests {
             .willReturn(.valid)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willThrow(TestError.generic)
         
         given(locationServiceMock)
@@ -145,7 +145,7 @@ struct VehicleServiceTests {
             .updateVehicle(dto: .any, policy: .any)
             .willReturn(true)
         
-        let result = try await vehicleService.check(number: VehicleDto.validNumber, trackLocation: true)
+        let result = try await vehicleService.check(number: VehicleDto.validNumber, numberType: .plateNumber, trackLocation: true)
         
         #expect(result.vehicle.vin1 == testVin)
         #expect(result.errors.count == 1)
@@ -166,7 +166,7 @@ struct VehicleServiceTests {
             .willReturn(.valid)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willThrow(TestError.generic)
         
         given(locationServiceMock)
@@ -181,7 +181,7 @@ struct VehicleServiceTests {
             .add(event: .any, to: .any)
             .willThrow(TestError.generic)
         
-        let result = try await vehicleService.check(number: VehicleDto.validNumber, trackLocation: true)
+        let result = try await vehicleService.check(number: VehicleDto.validNumber, numberType: .plateNumber, trackLocation: true)
         
         #expect(result.vehicle.number == VehicleDto.validNumber)
         #expect(result.errors.count == 2)
@@ -202,7 +202,7 @@ struct VehicleServiceTests {
             .willReturn(.valid)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willThrow(TestError.generic)
         
         given(locationServiceMock)
@@ -217,7 +217,7 @@ struct VehicleServiceTests {
             .add(event: .any, to: .any)
             .willReturn(.normal.addEvent(.valid))
         
-        let result = try await vehicleService.check(number: VehicleDto.validNumber, trackLocation: true)
+        let result = try await vehicleService.check(number: VehicleDto.validNumber, numberType: .plateNumber, trackLocation: true)
         
         #expect(result.vehicle.number == VehicleDto.validNumber)
         #expect(result.errors.count == 1)
@@ -238,7 +238,7 @@ struct VehicleServiceTests {
             .willReturn(.valid)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willReturn(.normal)
         
         given(locationServiceMock)
@@ -253,7 +253,7 @@ struct VehicleServiceTests {
             .add(event: .any, to: .any)
             .willReturn(.normal.addEvent(.valid))
         
-        let result = try await vehicleService.check(number: VehicleDto.validNumber, trackLocation: true)
+        let result = try await vehicleService.check(number: VehicleDto.validNumber, numberType: .plateNumber, trackLocation: true)
         
         #expect(result.vehicle.number == VehicleDto.validNumber)
         #expect(result.errors.count == 0)
@@ -276,7 +276,7 @@ struct VehicleServiceTests {
             .willReturn(.valid)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willReturn(vehicle)
         
         given(locationServiceMock)
@@ -291,10 +291,10 @@ struct VehicleServiceTests {
             .add(event: .any, to: .any)
             .willReturn(vehicle.addEvent(.valid))
         
-        let result = try await vehicleService.check(number: vehicle.number, trackLocation: true)
+        let result = try await vehicleService.check(number: vehicle.number, numberType: .plateNumber, trackLocation: true)
         
         verify(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .value(false))
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .value(false))
             .called(.once)
         
         verify(locationServiceMock)
@@ -330,7 +330,7 @@ struct VehicleServiceTests {
             .willReturn(.valid)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willReturn(vehicle)
         
         given(locationServiceMock)
@@ -348,7 +348,7 @@ struct VehicleServiceTests {
         let result = try await vehicleService.updateHistory(number: vehicle.number)
         
         verify(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .value(true))
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .value(true))
             .called(.once)
         
         verify(locationServiceMock)
@@ -382,7 +382,7 @@ struct VehicleServiceTests {
             .willReturn(.valid)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .any)
             .willReturn(vehicle)
         
         given(locationServiceMock)
@@ -400,7 +400,7 @@ struct VehicleServiceTests {
         let result = try await vehicleService.updateSearch(number: vehicle.number)
         
         verify(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .any, force: .value(true))
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .any, force: .value(true))
             .called(.once)
         
         verify(locationServiceMock)
@@ -431,7 +431,7 @@ struct VehicleServiceTests {
             .willReturn(.normal)
         
         given(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .value([.valid]), force: .any)
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .value([.valid]), force: .any)
             .willReturn(vehicleWithEvent)
         
         given(locationServiceMock)
@@ -445,7 +445,7 @@ struct VehicleServiceTests {
         let result = try await vehicleService.checkRecord(number: vehicle.number, event: .valid)
         
         verify(apiServiceMock)
-            .checkVehicle(by: .any, notes: .any, events: .value([.valid]), force: .value(false))
+            .checkVehicle(by: .any, numberType: .any, notes: .any, events: .value([.valid]), force: .value(false))
             .called(.once)
         
         verify(storageServiceMock)