diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CatalystSerializers.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CatalystSerializers.java
index 8ed352b..4319bc1 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CatalystSerializers.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CatalystSerializers.java
@@ -20,6 +20,8 @@
 import io.atomix.catalyst.serializer.Serializer;
 import io.atomix.catalyst.serializer.TypeSerializerFactory;
 import io.atomix.copycat.Query;
+import io.atomix.manager.util.ResourceManagerTypeResolver;
+import io.atomix.variables.state.LongCommands;
 
 import org.onlab.util.Match;
 import org.onosproject.cluster.Leader;
@@ -28,6 +30,10 @@
 import org.onosproject.event.Change;
 import org.onosproject.store.primitives.MapUpdate;
 import org.onosproject.store.primitives.TransactionId;
+import org.onosproject.store.primitives.resources.impl.AtomixConsistentMapCommands;
+import org.onosproject.store.primitives.resources.impl.AtomixConsistentMapFactory;
+import org.onosproject.store.primitives.resources.impl.AtomixLeaderElectorCommands;
+import org.onosproject.store.primitives.resources.impl.AtomixLeaderElectorFactory;
 import org.onosproject.store.primitives.resources.impl.CommitResult;
 import org.onosproject.store.primitives.resources.impl.MapEntryUpdateResult;
 import org.onosproject.store.primitives.resources.impl.PrepareResult;
@@ -79,6 +85,14 @@
         serializer.register(MapEvent.class, factory);
         serializer.register(Maps.immutableEntry("a", "b").getClass(), factory);
 
+        serializer.resolve(new LongCommands.TypeResolver());
+        serializer.resolve(new AtomixConsistentMapCommands.TypeResolver());
+        serializer.resolve(new AtomixLeaderElectorCommands.TypeResolver());
+        serializer.resolve(new ResourceManagerTypeResolver());
+
+        serializer.registerClassLoader(AtomixConsistentMapFactory.class)
+                  .registerClassLoader(AtomixLeaderElectorFactory.class);
+
         return serializer;
     }
 }