diff --git a/app/src/cc/arduino/autocomplete/ArduinoCompletionsList.java b/app/src/cc/arduino/autocomplete/ArduinoCompletionsList.java
index 8f8be5056..a29b7a1c8 100644
--- a/app/src/cc/arduino/autocomplete/ArduinoCompletionsList.java
+++ b/app/src/cc/arduino/autocomplete/ArduinoCompletionsList.java
@@ -9,6 +9,7 @@ public class ArduinoCompletionsList extends ArrayList<ArduinoCompletion> {
 class ArduinoCompletion {
   ArduinoCompletionDetail completion;
   String type;
+  String location;
 
   public ArduinoCompletionDetail getCompletion() {
     return completion;
@@ -17,6 +18,10 @@ class ArduinoCompletion {
   public String getType() {
     return type;
   }
+
+  public String getLocation() {
+    return location;
+  }
 }
 
 class ArduinoCompletionDetail {
@@ -30,6 +35,22 @@ class ArduinoCompletionDetail {
   public String getBrief() {
     return brief;
   }
+
+  public String getResultType() {
+    for (CompletionChunk c : chunks) {
+      if (c.res != null)
+        return c.res;
+    }
+    return null;
+  }
+
+  public String getTypedText() {
+    for (CompletionChunk c : chunks) {
+      if (c.typedtext != null)
+        return c.typedtext;
+    }
+    return null;
+  }
 }
 
 class CompletionChunk {
@@ -37,8 +58,9 @@ class CompletionChunk {
   String t;
   String placeholder;
   String res;
+  String info;
   ArduinoCompletionDetail optional;
-  
+
   public String getTypedtext() {
     return typedtext;
   }
@@ -54,8 +76,12 @@ class CompletionChunk {
   public String getRes() {
     return res;
   }
-  
+
   public ArduinoCompletionDetail getOptional() {
     return optional;
   }
+
+  public String getInfo() {
+    return info;
+  }
 }
\ No newline at end of file