diff --git a/tools/cooja/java/se/sics/cooja/Mote.java b/tools/cooja/java/se/sics/cooja/Mote.java
index 80bad9ab1..081a5a524 100644
--- a/tools/cooja/java/se/sics/cooja/Mote.java
+++ b/tools/cooja/java/se/sics/cooja/Mote.java
@@ -148,4 +148,7 @@ public interface Mote {
    * Called when mote is removed from simulation 
    */
   public void removed();
+
+  public void setProperty(String key, Object obj);
+  public Object getProperty(String key);
 }
diff --git a/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java b/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java
index f5113f524..2b30579fd 100644
--- a/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java
+++ b/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java
@@ -29,6 +29,8 @@
 
 package se.sics.cooja.motes;
 
+import java.util.HashMap;
+
 import org.apache.log4j.Logger;
 
 import se.sics.cooja.Mote;
@@ -130,4 +132,18 @@ public abstract class AbstractWakeupMote implements Mote {
 
   public void removed() {
   }
+  
+  private HashMap<String, Object> properties = null;
+  public void setProperty(String key, Object obj) {
+    if (properties == null) {
+      properties = new HashMap<String, Object>();
+    }
+    properties.put(key, obj);
+  }
+  public Object getProperty(String key) {
+    if (properties == null) {
+      return null;
+    }
+    return properties.get(key);
+  }
 }