diff --git a/resources/[carscripts]/nordi_tracking/server.lua b/resources/[carscripts]/nordi_tracking/server.lua
index 720cc8d51..dc5ba46d0 100644
--- a/resources/[carscripts]/nordi_tracking/server.lua
+++ b/resources/[carscripts]/nordi_tracking/server.lua
@@ -28,8 +28,8 @@ QBCore.Functions.CreateCallback('tracking:server:trackVehicle', function(source,
         return
     end
     
-    -- Suche Fahrzeug in der Datenbank
-    MySQL.Async.fetchAll('SELECT pv.*, p.charinfo FROM player_vehicles pv LEFT JOIN players p ON pv.citizenid = p.citizenid WHERE pv.plate = ?', {plate}, function(result)
+    -- Suche Fahrzeug in der Datenbank mit Collation-Fix
+    MySQL.Async.fetchAll('SELECT pv.*, p.charinfo FROM player_vehicles pv LEFT JOIN players p ON pv.citizenid COLLATE utf8mb4_general_ci = p.citizenid COLLATE utf8mb4_general_ci WHERE pv.plate = ?', {plate}, function(result)
         if result[1] then
             -- Extrahiere Besitzerinformationen
             local ownerInfo = "Unbekannt"
diff --git a/resources/[defaultmaps]/dip_cardealer/fxmanifest.lua b/resources/[defaultmaps]/dip_cardealer/fxmanifest.lua
new file mode 100644
index 000000000..4124c00e7
--- /dev/null
+++ b/resources/[defaultmaps]/dip_cardealer/fxmanifest.lua
@@ -0,0 +1,8 @@
+fx_version 'bodacious'
+game 'gta5'
+
+author 'Dipzzy'
+description 'cardealer'
+version '1.0.0'
+
+this_is_a_map 'yes'
\ No newline at end of file
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/_manifest.ymf b/resources/[defaultmaps]/dip_cardealer/stream/_manifest.ymf
new file mode 100644
index 000000000..737338281
--- /dev/null
+++ b/resources/[defaultmaps]/dip_cardealer/stream/_manifest.ymf
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<CPackFileMetaData>
+  <MapDataGroups/>
+  <HDTxdBindingArray/>
+  <imapDependencies/>
+  <imapDependencies_2>
+    <Item>
+      <imapName>dip_cardealer</imapName>
+      <manifestFlags>INTERIOR_DATA</manifestFlags>
+      <itypDepArray>
+        <Item>v_traffic_lights</Item>
+        <Item>dip_cardealer</Item>
+      </itypDepArray>
+    </Item>
+  </imapDependencies_2>
+  <itypDependencies_2>
+    <Item>
+      <itypName>dip_cardealer</itypName>
+      <manifestFlags>INTERIOR_DATA</manifestFlags>
+      <itypDepArray>
+        <Item>v_lev_doors</Item>
+        <Item>ch_prop_ch_casino_backarea</Item>
+        <Item>apa_int_mp_doors</Item>
+        <Item>ex_prop_exec_chairs</Item>
+        <Item>v_electrical</Item>
+        <Item>v_office</Item>
+        <Item>v_minigame</Item>
+        <Item>hei_mp_residential_heist</Item>
+        <Item>int_corporate</Item>
+        <Item>bkr_prop_clubhouse_seating</Item>
+        <Item>ch_prop_ch_casino_main</Item>
+        <Item>ex_int_mp_h_tables_ex</Item>
+        <Item>apa_int_mp_h_props</Item>
+        <Item>ex_int_office_03c_dlc</Item>
+        <Item>lev_des</Item>
+        <Item>apa_int_mp_h_04</Item>
+        <Item>v_kitchen</Item>
+        <Item>sm_prop_smug_accs</Item>
+        <Item>v_fastfood</Item>
+        <Item>vw_prop_vw_casino_art_03</Item>
+        <Item>vw_prop_vw_casino_art_05</Item>
+        <Item>vw_prop_vw_accs</Item>
+        <Item>ex_prop_tv_settop_remote</Item>
+        <Item>int_industrial</Item>
+        <Item>reh_dlc_int_03_sum2</Item>
+        <Item>tr_dlc_int_02_tr</Item>
+      </itypDepArray>
+    </Item>
+  </itypDependencies_2>
+  <Interiors itemType="CInteriorBoundsFiles">
+    <Item>
+      <Name>dip_cardealer_col</Name>
+      <Bounds>
+        <Item>dip_cardealer_col</Item>
+      </Bounds>
+    </Item>
+  </Interiors>
+</CPackFileMetaData>
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ybn/dip_cardealer_col.ybn b/resources/[defaultmaps]/dip_cardealer/stream/ybn/dip_cardealer_col.ybn
new file mode 100644
index 000000000..824ec6f22
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ybn/dip_cardealer_col.ybn differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ybn/hi@sc1_00e_0.ybn b/resources/[defaultmaps]/dip_cardealer/stream/ybn/hi@sc1_00e_0.ybn
new file mode 100644
index 000000000..17d42536a
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ybn/hi@sc1_00e_0.ybn differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ybn/sc1_00e_0.ybn b/resources/[defaultmaps]/dip_cardealer/stream/ybn/sc1_00e_0.ybn
new file mode 100644
index 000000000..4c2834188
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ybn/sc1_00e_0.ybn differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/apa_mp_h_05_side_unit.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/apa_mp_h_05_side_unit.ydr
new file mode 100644
index 000000000..dff98c1f3
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/apa_mp_h_05_side_unit.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_artwall_01.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_artwall_01.ydr
new file mode 100644
index 000000000..eb0d86cfa
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_artwall_01.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_artwall_02.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_artwall_02.ydr
new file mode 100644
index 000000000..e07b14830
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_artwall_02.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_door.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_door.ydr
new file mode 100644
index 000000000..5bb04f1af
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_door.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_dt.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_dt.ydr
new file mode 100644
index 000000000..e36f339d1
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_dt.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_insign.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_insign.ydr
new file mode 100644
index 000000000..2a9205f2a
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_insign.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_int.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_int.ydr
new file mode 100644
index 000000000..3eab9f5e0
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_int.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_outsign.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_outsign.ydr
new file mode 100644
index 000000000..ac3c84eb3
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_outsign.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_podium.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_podium.ydr
new file mode 100644
index 000000000..c659d74d3
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_podium.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_rope.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_rope.ydr
new file mode 100644
index 000000000..24a15e308
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_cardealer_rope.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_doorsupp.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_doorsupp.ydr
new file mode 100644
index 000000000..4ed9fedca
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_doorsupp.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_floor_ref.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_floor_ref.ydr
new file mode 100644
index 000000000..e5d86f05a
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/dip_floor_ref.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/ex_office2a_recdesk.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/ex_office2a_recdesk.ydr
new file mode 100644
index 000000000..f171647bc
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/ex_office2a_recdesk.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_bld1.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_bld1.ydr
new file mode 100644
index 000000000..39ad55eda
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_bld1.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_detail02.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_detail02.ydr
new file mode 100644
index 000000000..0ef5ba139
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_detail02.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_ground.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_ground.ydr
new file mode 100644
index 000000000..f74407088
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_ground.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_sc1_emissive_sc1_00e001.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_sc1_emissive_sc1_00e001.ydr
new file mode 100644
index 000000000..57d73aa18
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/sc1_00e_sc1_emissive_sc1_00e001.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_16_high_hal_mesh_plant.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_16_high_hal_mesh_plant.ydr
new file mode 100644
index 000000000..761f1f1c9
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_16_high_hal_mesh_plant.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_16_study_sofa.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_16_study_sofa.ydr
new file mode 100644
index 000000000..a0534e97e
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_16_study_sofa.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_serv_metro_advertstand1.ydr b/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_serv_metro_advertstand1.ydr
new file mode 100644
index 000000000..f4620d669
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ydr/v_serv_metro_advertstand1.ydr differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ymap/apa_distlodlights_small035.ymap b/resources/[defaultmaps]/dip_cardealer/stream/ymap/apa_distlodlights_small035.ymap
new file mode 100644
index 000000000..9ab7dbd5f
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ymap/apa_distlodlights_small035.ymap differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ymap/dip_cardealer.ymap b/resources/[defaultmaps]/dip_cardealer/stream/ymap/dip_cardealer.ymap
new file mode 100644
index 000000000..8811ff5a4
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ymap/dip_cardealer.ymap differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ymap/distlodlights_small034.ymap b/resources/[defaultmaps]/dip_cardealer/stream/ymap/distlodlights_small034.ymap
new file mode 100644
index 000000000..bddece3f9
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ymap/distlodlights_small034.ymap differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ymap/hei_distlodlights_small035.ymap b/resources/[defaultmaps]/dip_cardealer/stream/ymap/hei_distlodlights_small035.ymap
new file mode 100644
index 000000000..d2d7f2aec
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ymap/hei_distlodlights_small035.ymap differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_00e.ymap b/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_00e.ymap
new file mode 100644
index 000000000..770831194
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_00e.ymap differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_00e_strm_0.ymap b/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_00e_strm_0.ymap
new file mode 100644
index 000000000..47d86033e
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_00e_strm_0.ymap differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_occl_02.ymap b/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_occl_02.ymap
new file mode 100644
index 000000000..776e62984
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ymap/lr_sc1_occl_02.ymap differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ymap/vw_distlodlights_small035.ymap b/resources/[defaultmaps]/dip_cardealer/stream/ymap/vw_distlodlights_small035.ymap
new file mode 100644
index 000000000..b72e81066
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ymap/vw_distlodlights_small035.ymap differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ytd/dip_cardealer.ytd b/resources/[defaultmaps]/dip_cardealer/stream/ytd/dip_cardealer.ytd
new file mode 100644
index 000000000..186e9cb41
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ytd/dip_cardealer.ytd differ
diff --git a/resources/[defaultmaps]/dip_cardealer/stream/ytyp/dip_cardealer.ytyp b/resources/[defaultmaps]/dip_cardealer/stream/ytyp/dip_cardealer.ytyp
new file mode 100644
index 000000000..17c31f284
Binary files /dev/null and b/resources/[defaultmaps]/dip_cardealer/stream/ytyp/dip_cardealer.ytyp differ