diff --git a/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java b/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
new file mode 100644
index 000000000..a126455ce
--- /dev/null
+++ b/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2009, Swedish Institute of Computer Science. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of the
+ * Institute nor the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: AbstractEmulatedMote.java,v 1.1 2009/10/27 10:07:56 fros4943 Exp $
+ */
+
+package se.sics.cooja.motes;
+
+import se.sics.cooja.Mote;
+
+public abstract class AbstractEmulatedMote extends AbstractWakeupMote implements Mote {
+}
diff --git a/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java b/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java
new file mode 100644
index 000000000..bb1122fd6
--- /dev/null
+++ b/tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2009, Swedish Institute of Computer Science. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of the
+ * Institute nor the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: AbstractWakeupMote.java,v 1.1 2009/10/27 10:07:56 fros4943 Exp $
+ */
+
+package se.sics.cooja.motes;
+
+import org.apache.log4j.Logger;
+
+import se.sics.cooja.Mote;
+import se.sics.cooja.MoteTimeEvent;
+import se.sics.cooja.Simulation;
+import se.sics.cooja.TimeEvent;
+
+public abstract class AbstractWakeupMote implements Mote {
+  private static Logger logger = Logger.getLogger(AbstractWakeupMote.class);
+  private Simulation simulation = null;
+
+  private TimeEvent executeMoteEvent = new MoteTimeEvent(this, 0) {
+    public void execute(long t) {
+      AbstractWakeupMote.this.execute(t);
+    }
+    public String toString() {
+      return "EXECUTE " + this.getClass().getName();
+    }
+  };
+
+  /**
+   * Execute mote software.
+   * This method is only called from the simulation thread.
+   * 
+   * @param time Simulation time.
+   */
+  public abstract void execute(long time);
+
+  /**
+   * Execute mote software as soon as possible.
+   * 
+   * If this method is called from the simulation thread, 
+   * the mote software will execute immediately (at the current simulation time).
+   * 
+   * If this method is called from outside the simulation thread, 
+   * the mote software will execute as soon as possible.
+   */
+  public void requestImmediateWakeup() {
+    if (simulation == null) {
+      simulation = getSimulation();
+    }
+    
+    if (simulation.isSimulationThread()) {
+      /* Schedule wakeup immediately */
+      scheduleNextWakeup(simulation.getSimulationTime());
+      return;
+    }
+
+    /* Schedule wakeup asap */
+    simulation.invokeSimulationThread(new Runnable() {
+      public void run() {
+        scheduleNextWakeup(simulation.getSimulationTime());
+      }
+    });
+  }
+
+  /**
+   * Execute mote software at given time, or earlier.
+   * 
+   * If a wakeup is already scheduled earlier than given argument,
+   * this request will be ignored.
+   * 
+   * This method must be called from the simulation thread.
+   * 
+   * @param time Simulation time
+   * @return True iff wakeup request rescheduled the wakeup time.
+   */
+  public boolean scheduleNextWakeup(long time) {
+    if (simulation == null) {
+      simulation = getSimulation();
+    }
+
+    if (!simulation.isSimulationThread()) {
+      throw new IllegalStateException("Scheduling wakeup from non-simulation thread");
+    }
+
+    if (executeMoteEvent.isScheduled() &&
+        executeMoteEvent.getTime() <= time) {
+      /* Already scheduled wakeup event precedes given time - ignore wakeup request */
+      return false;
+    }
+
+    if (executeMoteEvent.isScheduled()) {
+      /* Reschedule wakeup mote event */
+      /*logger.info("Rescheduled wakeup from " + executeMoteEvent.getTime() + " to " + time);*/
+      executeMoteEvent.remove();
+    }
+    simulation.scheduleEvent(executeMoteEvent, time);
+    return true;
+  }
+
+}