diff --git a/package-lock.json b/package-lock.json
index cc6c9da..8f58ab4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6518,9 +6518,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.83.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",
-      "integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==",
+      "version": "1.83.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
+      "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/src/components/game/map/Map.vue b/src/components/game/map/Map.vue
index 2cc1579..73db042 100644
--- a/src/components/game/map/Map.vue
+++ b/src/components/game/map/Map.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import type { MapCharacter, mapLoadData } from '@/application/types'
+import type { MapCharacter, mapLoadData, UUID } from '@/application/types'
 import Characters from '@/components/game/map/Characters.vue'
 import MapObjects from '@/components/game/map/MapObjects.vue'
 import MapTiles from '@/components/game/map/MapTiles.vue'
@@ -40,11 +40,11 @@ gameStore.connection?.on('map:character:join', async (data: MapCharacter) => {
   mapStore.addCharacter(data)
 })
 
-gameStore.connection?.on('map:character:leave', (characterId: number) => {
+gameStore.connection?.on('map:character:leave', (characterId: UUID) => {
   mapStore.removeCharacter(characterId)
 })
 
-gameStore.connection?.on('map:character:move', (data: { characterId: number; positionX: number; positionY: number; rotation: number; isMoving: boolean }) => {
+gameStore.connection?.on('map:character:move', (data: { characterId: UUID; positionX: number; positionY: number; rotation: number; isMoving: boolean }) => {
   mapStore.updateCharacterPosition(data)
 })
 </script>
diff --git a/src/composables/mapComposable.ts b/src/composables/mapComposable.ts
index 52ea604..cc4533f 100644
--- a/src/composables/mapComposable.ts
+++ b/src/composables/mapComposable.ts
@@ -1,5 +1,5 @@
 import config from '@/application/config'
-import type { AssetDataT, HttpResponse, Map as MapT } from '@/application/types'
+import type { AssetDataT, HttpResponse, UUID } from '@/application/types'
 import { loadTexture } from '@/composables/gameComposable'
 
 import Tilemap = Phaser.Tilemaps.Tilemap
@@ -85,7 +85,7 @@ export function FlattenMapArray(tiles: string[][]) {
   return normalArray
 }
 
-export async function loadMapTilesIntoScene(map_id: number, scene: Phaser.Scene) {
+export async function loadMapTilesIntoScene(map_id: UUID, scene: Phaser.Scene) {
   // Fetch the list of tiles from the server
   const tileArray: HttpResponse<AssetDataT[]> = await fetch(config.server_endpoint + '/assets/list_tiles/' + map_id).then((response) => response.json())