diff --git a/src/main/java/model/EmptySquare.java b/src/main/java/model/EmptySquare.java
new file mode 100644
index 0000000000000000000000000000000000000000..18550854de6f53af08379a42b4d19e4bac84a3c6
--- /dev/null
+++ b/src/main/java/model/EmptySquare.java
@@ -0,0 +1,26 @@
+package model;
+
+import util.Position;
+
+public class EmptySquare implements Entity{
+
+    private Position position;
+    public EmptySquare(Position p){
+        this.position = p;
+    }
+    @Override
+    public void nextTurn(Board<Entity> board) {
+        return;
+    }
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public void setPosition(Position p) {
+        this.position = p;
+    }
+    
+}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index e8d88b31c53f0be25f91fd33c69be0d883f8e6c6..c5f54eb50ba6a0240cc809746b8cc25acadb7e65 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -20,7 +20,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   private final TargetStrategy targetStrategy = new TargetStrategy();
   private List<Position> firefighterPositions;
   private Set<Position> firePositions;
-  private Map<Position, List<Position>> neighbors = new HashMap();
+  private Map<Position, List<Position>> neighbors = new HashMap<Position, List<Position>>();
   private final Position[][] positions;
   private int step = 0;
   private final Random randomGenerator = new Random();