diff --git a/.editorconfig b/.editorconfig
index f02d2801a..974f98cf2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,5 @@
 [*.{java,html}]
 charset = utf-8
-indent_style = tab
+indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java
index 2460aadc3..373eae815 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java
@@ -42,6 +42,7 @@ public abstract class AbstractParkedCallEvent extends ManagerEvent {
     private String parkeeExten;
     private Integer parkeePriority;
     private String parkeeUniqueid;
+    private String parkeeLinkedid;
     // Previously: From
     private String parkerDialString;
     private String parkingLot;
@@ -231,20 +232,20 @@ public void setParkeeUniqueid(String parkeeUniqueid) {
         this.parkeeUniqueid = parkeeUniqueid;
     }
 
-    public String getParkerDialString() {
-        return parkerDialString;
+    public String getParkeeLinkedid() {
+        return parkeeLinkedid;
     }
 
-    public void setParkerDialString(String parkerDialString) {
-        this.parkerDialString = parkerDialString;
+    public void setParkeeLinkedid(String parkeeLinkedid) {
+        this.parkeeLinkedid = parkeeLinkedid;
     }
 
-    public String getParkinglot() {
-        return parkingLot;
+    public String getParkerDialString() {
+        return parkerDialString;
     }
 
-    public void setParkinglot(String parkinglot) {
-        this.parkingLot = parkinglot;
+    public void setParkerDialString(String parkerDialString) {
+        this.parkerDialString = parkerDialString;
     }
 
     public String getParkingSpace() {
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractUnParkedEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractUnParkedEvent.java
index 61cb00f85..73097dd9d 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractUnParkedEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractUnParkedEvent.java
@@ -37,6 +37,8 @@ public class AbstractUnParkedEvent extends AbstractParkedCallEvent {
     private String parkerExten;
     private String parkerPriority;
     private String parkerUniqueid;
+    private String parkerLinkedid;
+    private String parkerLanguage;
 
     /**
      * @param source
@@ -140,4 +142,20 @@ public String getParkerUniqueid() {
     public void setParkerUniqueid(String parkerUniqueid) {
         this.parkerUniqueid = parkerUniqueid;
     }
+
+    public String getParkerLinkedid() {
+        return parkerLinkedid;
+    }
+
+    public void setParkerLinkedid(String parkerLinkedid) {
+        this.parkerLinkedid = parkerLinkedid;
+    }
+
+    public String getParkerLanguage() {
+        return parkerLanguage;
+    }
+
+    public void setParkerLanguage(String parkerLanguage) {
+        this.parkerLanguage = parkerLanguage;
+    }
 }