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 361c298..4d060de 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java
@@ -11,8 +11,8 @@
  *
  */
 public class LinkEvent {
-    private final SwitchPort src;
-    private final SwitchPort dst;
+    protected final SwitchPort src;
+    protected final SwitchPort dst;
 
     /**
      * Default constructor.
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 0a25c47..5aa7008 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/SwitchEvent.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/SwitchEvent.java
@@ -1,8 +1,6 @@
 package net.onrc.onos.ofcontroller.networkgraph;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Self-contained Switch Object
@@ -11,7 +9,7 @@
  *
  */
 public class SwitchEvent {
-    private final Long dpid;
+    protected final Long dpid;
 
     /**
      * Default constructor.