diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/DeviceEvent.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/DeviceEvent.java
index a69b57a..c92fdd2 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/DeviceEvent.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/DeviceEvent.java
@@ -10,7 +10,7 @@
 import net.onrc.onos.ofcontroller.networkgraph.PortEvent.SwitchPort;
 
 /**
- * Self-contained Device object for event
+ * Self-contained Device event Object
  *
  * TODO: We probably want common base class/interface for Self-Contained Event Object
  *
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java
index bcea838..d9342aa 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java
@@ -3,7 +3,7 @@
 import net.onrc.onos.ofcontroller.networkgraph.PortEvent.SwitchPort;
 
 /**
- * Self-contained Link object for event
+ * Self-contained Link event Object
  *
  * TODO: We probably want common base class/interface for Self-Contained Event Object
  *
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/PortEvent.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/PortEvent.java
index f51ee58..addd695 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/PortEvent.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/PortEvent.java
@@ -1,7 +1,7 @@
 package net.onrc.onos.ofcontroller.networkgraph;
 
 /**
- * Self-contained Port object for event
+ * Self-contained Port event Object
  *
  * TODO: We probably want common base class/interface for Self-Contained Event Object
  *
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/SwitchEvent.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/SwitchEvent.java
index 5444dd2..959a7d9 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/SwitchEvent.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/SwitchEvent.java
@@ -1,7 +1,10 @@
 package net.onrc.onos.ofcontroller.networkgraph;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * Self-contained Switch object for event
+ * Self-contained Switch and Port event Object
  *
  * TODO: We probably want common base class/interface for Self-Contained Event Object
  *
@@ -9,14 +12,29 @@
 public class SwitchEvent {
     private final Long dpid;
 
+    private List<PortEvent> ports;
+
     public SwitchEvent(Long dpid) {
+	this(dpid, new ArrayList<PortEvent>());
+    }
+
+    public SwitchEvent(Long dpid, List<PortEvent> ports) {
 	this.dpid = dpid;
+	this.ports = ports;
     }
 
     public Long getDpid() {
 	return dpid;
     }
 
+    public List<PortEvent> getPorts() {
+	return ports;
+    }
+
+    public void setPorts(List<PortEvent> ports) {
+	this.ports = ports;
+    }
+
     @Override
     public String toString() {
 	return "[SwitchEvent 0x" + Long.toHexString(dpid) + "]";