diff --git a/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java b/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
index 9eb4e10..42a3a4d 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
@@ -1,8 +1,9 @@
 package net.onrc.onos.ofcontroller.util.serializers;
 
+import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.util.ArrayList;
-
+import java.util.HashSet;
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.intent.ConstrainedShortestPathIntent;
 import net.onrc.onos.intent.ErrorIntent;
@@ -44,6 +45,8 @@
 // import net.onrc.onos.ofcontroller.util.SwitchPort;
 
 
+
+
 import com.esotericsoftware.kryo.Kryo;
 
 /**
@@ -202,6 +205,10 @@
 	kryo.register(IntentOperationList.class);
 	kryo.register(IntentStateList.class);
 
+	// Device-related classes
+	kryo.register(HashSet.class);
+	kryo.register(Inet4Address.class);
+
 	return kryo;
     }
 }