diff --git a/proto/src/main/proto/map.proto b/proto/src/main/proto/map.proto
index 674d8aab..1f73c21a 100644
--- a/proto/src/main/proto/map.proto
+++ b/proto/src/main/proto/map.proto
@@ -7,9 +7,10 @@ message GameMap {
   required string uid = 1;
   required uint32 rows = 2;
   required uint32 columns = 3;
-  required string tileSetUID = 4;
-  repeated Layer layers = 5;
-  required string handler = 6;
+  required uint32 tileWidth = 4;
+  required uint32 tileHeight = 5;
+  repeated Layer layers = 6;
+  required string handler = 7;
 }
 
 message Layer {
@@ -24,7 +25,8 @@ message Layer {
 }
 
 message TileLayer {
-  repeated uint32 tiles = 1;
+  required string tilesetUID = 1;
+  repeated uint32 tiles = 2;
 }
 
 message ObjectLayer {