diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraCt.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraCt.java
index 1828a65..73f37c8 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraCt.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraCt.java
@@ -24,6 +24,7 @@
 import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -39,7 +40,11 @@
     private short recircTable;
     private int alg;
     private List<ExtensionTreatment> nestedActions;
-    private final KryoNamespace appKryo = new KryoNamespace.Builder().build();
+    private final KryoNamespace appKryo = new KryoNamespace.Builder()
+                                                .register(HashMap.class)
+                                                .register(ArrayList.class)
+                                                .register(ExtensionTreatment.class)
+                                                .build();
 
     /**
      * Creates a new nicicra ct instruction.
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraMatchCtMark.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraMatchCtMark.java
index 9203555..67d9733 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraMatchCtMark.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraMatchCtMark.java
@@ -16,6 +16,7 @@
 
 package org.onosproject.driver.extensions;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -35,7 +36,9 @@
     private long ctMark;
     private long ctMarkMask;
 
-    private final KryoNamespace appKryo = new KryoNamespace.Builder().build();
+    private final KryoNamespace appKryo = new KryoNamespace.Builder()
+                                                    .register(HashMap.class)
+                                                    .build();
 
     /**
      * Creates a new conntrack mark selector.
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraMatchCtState.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraMatchCtState.java
index eb4c6da..f2fb423 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraMatchCtState.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraMatchCtState.java
@@ -16,6 +16,7 @@
 
 package org.onosproject.driver.extensions;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -34,7 +35,9 @@
     private long ctState;
     private long ctStateMask;
 
-    private final KryoNamespace appKryo = new KryoNamespace.Builder().build();
+    private final KryoNamespace appKryo = new KryoNamespace.Builder()
+                                                .register(HashMap.class)
+                                                .build();
 
     /**
      * Creates a new conntrack state selector.
