diff --git a/clients/java1.8_client/client/src/main/java/core/API/Elevator.java b/clients/java1.8_client/client/src/main/java/core/API/Elevator.java
index 70f64be..8eef6df 100644
--- a/clients/java1.8_client/client/src/main/java/core/API/Elevator.java
+++ b/clients/java1.8_client/client/src/main/java/core/API/Elevator.java
@@ -10,6 +10,7 @@
  */
 public class Elevator implements MessagesInterface {
     private Integer id;
+    private Double x;
     private Double y;
     private List<Passenger> passengers;
     private Integer state;
@@ -42,6 +43,10 @@ public String getType() {
         return this.type;
     }
 
+    public Double getX() {
+        return this.x;
+    }
+
     public Double getY() {
         return this.y;
     }
@@ -60,6 +65,11 @@ public List<JSONObject> getMessages(){
 
     public Elevator(JSONObject elevator) {
         id = (int) (long) elevator.get("id");
+        if (elevator.get("x") instanceof Long) {
+            x = ((Long) elevator.get("x")).doubleValue();
+        } else {
+            x = (double) elevator.get("x");
+        }
         if (elevator.get("y") instanceof Long) {
             y = ((Long) elevator.get("y")).doubleValue();
         } else {
diff --git a/clients/java1.8_client/client/src/main/java/core/API/Passenger.java b/clients/java1.8_client/client/src/main/java/core/API/Passenger.java
index 28f1fb9..d7cb474 100644
--- a/clients/java1.8_client/client/src/main/java/core/API/Passenger.java
+++ b/clients/java1.8_client/client/src/main/java/core/API/Passenger.java
@@ -26,6 +26,10 @@ public Boolean hasElevator() {
         return this.elevator != null;
     }
 
+    public Integer getElevator() {
+        return this.elevator;
+    }
+
     public List<JSONObject> getMessages() {
         return this.messages;
     }
@@ -95,6 +99,7 @@ public Passenger(JSONObject passenger) {
             weight = (double) passenger.get("weight");
         }
     }
+
     public void setElevator(Elevator elevator) {
         this.elevator = elevator.getId();
         JSONObject jo = new JSONObject();
@@ -105,5 +110,4 @@ public void setElevator(Elevator elevator) {
         jo.put("args", args);
         this.messages.add(jo);
     }
-
 }