diff --git a/assets/maps/dungeon_entry.tmx b/assets/maps/dungeon_entry.tmx
index a300360..6210107 100644
--- a/assets/maps/dungeon_entry.tmx
+++ b/assets/maps/dungeon_entry.tmx
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.1" orientation="orthogonal" renderorder="left-up" width="32" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="12" nextobjectid="12">
+<map version="1.10" tiledversion="1.11.1" orientation="orthogonal" renderorder="left-up" width="32" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="12">
  <editorsettings>
   <export target="dungeon_entry.json" format="json"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/tileset.tsx"/>
+ <tileset firstgid="2647" source="hiitboxes.tsx"/>
  <layer id="3" name="BackgroundLayer1" width="32" height="24">
   <data encoding="base64" compression="zlib">
    eJx9ljlsU0EQhtfv2c+OAkgcCYlEABGnAiooOSRuKKAAXAENDQ0VIeHogkHiMDRQuAcSjgKQDFKAECSgCBU0QUkeBhLsSAlHaij4V2+HNztvneLT857/zOzsrKueUp9BlREadP8keAPGfaUmQAguo30FXAXXQMnM1Wtac0otB22gPZfcW7d/BUr9BnOBvW+V2VLO2O0FaaUWgkVgEO3n4AV4CYbMnG7o7QZ7wF6wLxfZ1MnsewSdx+CJH/XxfU+g/TSI5o1k4jWbMLYZbAFbwQz6ZsEP8FP7Y/bvhd4ZcBacA+fBQfQfAofBF2h+Bd/AJJjyo/1p3zLz9w/0/2bic+BxXIF1HWAlWGX8OI65A9C7B+6DB+AhKGLsIrgEFkNjCVgKloGWdLw3+foerEUM1oH1Qaxf9ZJnecCP+25C/xYYg+Y4mABjaFd0TMEzsA1628EOsBPsSkf7U86RDUegexQcC2z7ZH7mMnHfW/x+B5qbcKZNUV+zsb8OpsEp6HWD06AH9KZjTUKvK2HddXAjsG2jGBSUUnkVfTVdBj2WziRjSmtvQ+8OuAv6wQAoZu0z1r+HoPsKDIPXxoY12H8a1Nm37mh3qni/k4E7dlWmVzH6JT8e5/czNNoXQBFUDDXwAWMfveh30dAn7OB5w22hsRr069l4bNjcidXZ6N6S9nemS3iY6/txv/5Omd99xgbSGgyScdBtqlXUnjP6/N5q7fYU5go2YO5G3+5rSdl2kOYM9GeDZAyoVvF+/eX3Vmu3pew7wu8Nr9etwo7/NQPx7MgmY0C1SuY5v7daW+aRrOnyjLUdfE/Nfuj3+Lb/vFbRelpTd5yXzF9uc6O48Pj0+7atVKv0b/428H2lfujZvode0vZQ9OtcHsW+n8zeZVEnXG8DjRWUHW+Xb7I+8/jwXKa5IxnbD9fbwH1p9AaEos3jQOt4LpNd9L5R2/U28Phwf7RG3tTgLpXUlTWG5zL10/tGbdfbIP3msaa6X1B2DGTMdL7XvCiXXe8b7SnfBleO05d8p3dI5jg/C8p3Poe/b/JcR9NRrZzvPpHfFIP57gPlO4e/b9wvjX7TZa2U51lQ9hvs+g8h48f7+PvmymGqlfLcXbmXZzGQdcB1ZxvdEZnjLl+4nwVhg/SXn6m8Ezym/wB9MCI6
@@ -24,4 +25,9 @@
    eJy9lrtLw1AUh2+TmIeTirZCQXDTxUlBdFLUKgjiIv4NriLootRHq111EFxFsINK66NgJ0EnB51EHbTUais4dVIQ/IUkNE2TmNtbHT5akpzznZyb+/ARQnw14EYg5FZgz9PLEbJdV10sV2WclRmu9P+6Rjlp2DH5vy3+IP+/tXSJ2u8GvDEQsBnjzX/sUVgmZBmsgFWwBiIgKmv3Zb3eevFv/Al4kuAYnIBTcAZScumZPrj7dX+GY3deIFdAIaQVZOF5ATnwCt5AHhRk+94k9P5EZG8ucw41voiLRfhH4R5TquuNUV9MrBw3uxztnJbDrrduuPVGvX8Of1osr82I3eIrcxjxU1WM4aJEyJKk91Qqv2euzbh2Cf+Vw9yOUvoP4DsERxJdnBMpSv8TvM8go/uzHuvowNrSCcKmPuThLlD6G9DXRtAEJj1+O9OWdS3Ja9+peW3xygCeH6SIWXfYN3N85ffPYw4Kv8xDlVnKmu3wC+XzR6Ub7h6w4FCDsX7sUvjfHd4/5HKeiJv8n/j/pddkXoOGPO6VQYf9a97Gfw/HA3i0ef+4ZX2e8+gfd/DvU5yn7GraYzwrpBn30DtG/wejX2Y8j7YxrJ/NGIsW4FdKezdtjgkG/zB8IyCkuO/dP8HZdHQ=
   </data>
  </layer>
+ <layer id="12" name="HitBoxes" width="32" height="24" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJwL52JgCB/Fo3gUj+JRjBNHYMHEyFHLbnroobY51HADuWZQMw5IjVNqxz+x5tIi7eGyg9ZpfhSP4lFMewwANhMjLQ==
+  </data>
+ </layer>
 </map>
diff --git a/src/game_data/maps.cpp b/src/game_data/maps.cpp
index 442bb1d..9b49a47 100644
--- a/src/game_data/maps.cpp
+++ b/src/game_data/maps.cpp
@@ -12,54 +12,54 @@ void verify_maps_integrity(void)
         const entity_t *ENTITIES = MAPS[map_index]->entities;
 
         std::cout << "Map " << map_index + 1 << std::endl;
-        std::cout << " - MapName     : " << MAPS[map_index]->map_name << std::endl;
-        std::cout << " - MapWidth    : " << MAPS[map_index]->map_width << std::endl;
-        std::cout << " - MapHeight   : " << MAPS[map_index]->map_height << std::endl;
+        std::cout << " - MapName     : " << MAPS[map_index]->name << std::endl;
+        std::cout << " - MapWidth    : " << MAPS[map_index]->width << std::endl;
+        std::cout << " - MapHeight   : " << MAPS[map_index]->height << std::endl;
         std::cout << "    BackgroundLayer1 :";
 
-        for(uint32_t tile_index_x = 0; tile_index_x < MAPS[map_index]->map_width; tile_index_x++)
+        for(uint32_t tile_index_x = 0; tile_index_x < MAPS[map_index]->width; tile_index_x++)
         {
             std::cout << "\n     ";
 
-            for(uint32_t tile_index_y = 0; tile_index_y < MAPS[map_index]->map_height; tile_index_y++)
+            for(uint32_t tile_index_y = 0; tile_index_y < MAPS[map_index]->height; tile_index_y++)
             {
-                std::cout << MAPS[map_index]->map_background_layer1[tile_index_x * MAPS[map_index]->map_width + tile_index_y] << ",";
+                std::cout << MAPS[map_index]->background_layer1[tile_index_x * MAPS[map_index]->width + tile_index_y] << ",";
             }
         }
 
         std::cout << "\n    BackgroundLayer2 :";
 
-        for(uint32_t tile_index_x = 0; tile_index_x < MAPS[map_index]->map_width; tile_index_x++)
+        for(uint32_t tile_index_x = 0; tile_index_x < MAPS[map_index]->width; tile_index_x++)
         {
             std::cout << "\n     ";
 
-            for(uint32_t tile_index_y = 0; tile_index_y < MAPS[map_index]->map_height; tile_index_y++)
+            for(uint32_t tile_index_y = 0; tile_index_y < MAPS[map_index]->height; tile_index_y++)
             {
-                std::cout << MAPS[map_index]->map_background_layer2[tile_index_x * MAPS[map_index]->map_width + tile_index_y] << ",";
+                std::cout << MAPS[map_index]->background_layer2[tile_index_x * MAPS[map_index]->width + tile_index_y] << ",";
             }
         }
 
         std::cout << "\n    BackgroundLayer3 :";
 
-        for(uint32_t tile_index_x = 0; tile_index_x < MAPS[map_index]->map_width; tile_index_x++)
+        for(uint32_t tile_index_x = 0; tile_index_x < MAPS[map_index]->width; tile_index_x++)
         {
             std::cout << "\n     ";
 
-            for(uint32_t tile_index_y = 0; tile_index_y < MAPS[map_index]->map_height; tile_index_y++)
+            for(uint32_t tile_index_y = 0; tile_index_y < MAPS[map_index]->height; tile_index_y++)
             {
-                std::cout << MAPS[map_index]->map_background_layer3[tile_index_x * MAPS[map_index]->map_width + tile_index_y] << ",";
+                std::cout << MAPS[map_index]->background_layer3[tile_index_x * MAPS[map_index]->width + tile_index_y] << ",";
             }
         }
 
         std::cout << "\n    Foreground :";
 
-        for(uint32_t tile_index_x = 0; tile_index_x < MAPS[map_index]->map_width; tile_index_x++)
+        for(uint32_t tile_index_x = 0; tile_index_x < MAPS[map_index]->width; tile_index_x++)
         {
             std::cout << "\n     ";
 
-            for(uint32_t tile_index_y = 0; tile_index_y < MAPS[map_index]->map_height; tile_index_y++)
+            for(uint32_t tile_index_y = 0; tile_index_y < MAPS[map_index]->height; tile_index_y++)
             {
-                std::cout << MAPS[map_index]->map_foreground[tile_index_x * MAPS[map_index]->map_width + tile_index_y] << ",";
+                std::cout << MAPS[map_index]->foreground[tile_index_x * MAPS[map_index]->width + tile_index_y] << ",";
             }
         }
 
diff --git a/src/game_data/maps.hpp b/src/game_data/maps.hpp
index 7548137..2850482 100644
--- a/src/game_data/maps.hpp
+++ b/src/game_data/maps.hpp
@@ -4,15 +4,17 @@
 #include "ecs/ecs.hpp"
 
 typedef struct map_t {
-    const char *map_name;
+    const char *name;
 
-    const uint32_t map_width;
-    const uint32_t map_height;
+    const uint32_t width;
+    const uint32_t height;
 
-    const uint16_t *map_background_layer1;
-    const uint16_t *map_background_layer2;
-    const uint16_t *map_background_layer3;
-    const uint16_t *map_foreground;
+    const uint16_t *background_layer1;
+    const uint16_t *background_layer2;
+    const uint16_t *background_layer3;
+    const uint16_t *foreground;
+
+    const uint32_t *hitboxes;
 
     const uint32_t nb_entities;
     const entity_t *entities;