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 74d7f0b..e05b478 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
@@ -15,13 +15,12 @@
  */
 package org.onosproject.store.primitives.impl;
 
-import java.util.Arrays;
-
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
 import io.atomix.catalyst.serializer.Serializer;
 import io.atomix.catalyst.serializer.TypeSerializerFactory;
 import io.atomix.manager.util.ResourceManagerTypeResolver;
 import io.atomix.variables.internal.LongCommands;
-
 import org.onlab.util.Match;
 import org.onosproject.cluster.Leader;
 import org.onosproject.cluster.Leadership;
@@ -31,7 +30,10 @@
 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.AtomixConsistentMultimapCommands;
+import org.onosproject.store.primitives.resources.impl.AtomixConsistentSetMultimapFactory;
 import org.onosproject.store.primitives.resources.impl.AtomixConsistentTreeMapCommands;
+import org.onosproject.store.primitives.resources.impl.AtomixConsistentTreeMapFactory;
 import org.onosproject.store.primitives.resources.impl.AtomixLeaderElectorCommands;
 import org.onosproject.store.primitives.resources.impl.AtomixLeaderElectorFactory;
 import org.onosproject.store.primitives.resources.impl.AtomixWorkQueueCommands;
@@ -47,8 +49,7 @@
 import org.onosproject.store.service.Versioned;
 import org.onosproject.store.service.WorkQueueStats;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
+import java.util.Arrays;
 
 /**
  * Serializer utility for Atomix Catalyst.
@@ -63,12 +64,12 @@
         TypeSerializerFactory factory =
                 new DefaultCatalystTypeSerializerFactory(
                         org.onosproject.store.service.Serializer.using(Arrays.asList((KryoNamespaces.API)),
-                                MapEntryUpdateResult.class,
-                                MapEntryUpdateResult.Status.class,
-                                Transaction.State.class,
-                                PrepareResult.class,
-                                CommitResult.class,
-                                RollbackResult.class));
+                                                                       MapEntryUpdateResult.class,
+                                                                       MapEntryUpdateResult.Status.class,
+                                                                       Transaction.State.class,
+                                                                       PrepareResult.class,
+                                                                       CommitResult.class,
+                                                                       RollbackResult.class));
         // ONOS classes
         serializer.register(Change.class, factory);
         serializer.register(Leader.class, factory);
@@ -98,10 +99,13 @@
         serializer.resolve(new AtomixWorkQueueCommands.TypeResolver());
         serializer.resolve(new ResourceManagerTypeResolver());
         serializer.resolve(new AtomixConsistentTreeMapCommands.TypeResolver());
+        serializer.resolve(new AtomixConsistentMultimapCommands.TypeResolver());
 
         serializer.registerClassLoader(AtomixConsistentMapFactory.class)
-                  .registerClassLoader(AtomixLeaderElectorFactory.class)
-                  .registerClassLoader(AtomixWorkQueueFactory.class);
+                .registerClassLoader(AtomixLeaderElectorFactory.class)
+                .registerClassLoader(AtomixWorkQueueFactory.class)
+                .registerClassLoader(AtomixConsistentTreeMapFactory.class)
+                .registerClassLoader(AtomixConsistentSetMultimapFactory.class);
 
         return serializer;
     }
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/TranscodingAsyncConsistentTreeMap.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/TranscodingAsyncConsistentTreeMap.java
index 71ff975..48a3b96 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/TranscodingAsyncConsistentTreeMap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/TranscodingAsyncConsistentTreeMap.java
@@ -38,7 +38,12 @@
 import java.util.stream.Collectors;
 
 /**
- * Created by admin on 8/3/16.
+ * An {@code AsyncConsistentTreeMap} that maps its operations to operations on
+ * a differently typed {@code AsyncConsistentTreeMap} by transcoding operation
+ * inputs and outputs.
+ *
+ * @param <V2> value type of other map
+ * @param <V1> value type of this map
  */
 public class TranscodingAsyncConsistentTreeMap<V1, V2>
         implements AsyncConsistentTreeMap<V1> {
@@ -79,7 +84,8 @@
                         entry ->
                                 Maps.immutableEntry(
                                         entry.getKey(),
-                                        entry.getValue().map(valueDecoder)));
+                                        versionedValueTransform
+                                                .apply(entry.getValue())));
     }
 
     @Override
@@ -90,7 +96,8 @@
                         entry ->
                                 Maps.immutableEntry(
                                         entry.getKey(),
-                                        entry.getValue().map(valueDecoder)));
+                                        versionedValueTransform
+                                                .apply(entry.getValue())));
     }
 
     @Override
@@ -99,19 +106,21 @@
         return backingMap
                 .higherEntry(key)
                 .thenApply(entry ->
-                               Maps.immutableEntry(
-                                       entry.getKey(),
-                                       entry.getValue().map(valueDecoder)));
-}
+                                   Maps.immutableEntry(
+                                           entry.getKey(),
+                                           versionedValueTransform
+                                                   .apply(entry.getValue())));
+    }
 
     @Override
     public CompletableFuture<Map.Entry<String, Versioned<V1>>>
     lowerEntry(String key) {
         return backingMap.lowerEntry(key).thenApply(
                 entry ->
-                    Maps.immutableEntry(
-                            entry.getKey(),
-                            entry.getValue().map(valueDecoder)));
+                        Maps.immutableEntry(
+                                entry.getKey(),
+                                versionedValueTransform
+                                        .apply(entry.getValue())));
     }
 
     @Override
@@ -120,8 +129,9 @@
         return backingMap.firstEntry()
                 .thenApply(entry ->
                                    Maps.immutableEntry(
-                                       entry.getKey(),
-                                       entry.getValue().map(valueDecoder)));
+                                           entry.getKey(),
+                                           versionedValueTransform
+                                                   .apply(entry.getValue())));
     }
 
     @Override
@@ -131,7 +141,8 @@
                 .thenApply(
                         entry -> Maps.immutableEntry(
                                 entry.getKey(),
-                                entry.getValue().map(valueDecoder)));
+                                versionedValueTransform
+                                        .apply(entry.getValue())));
     }
 
     @Override
@@ -141,7 +152,8 @@
                 .thenApply(
                         entry -> Maps.immutableEntry(
                                 entry.getKey(),
-                                entry.getValue().map(valueDecoder)));
+                                versionedValueTransform
+                                        .apply(entry.getValue())));
     }
 
     @Override
@@ -150,7 +162,7 @@
         return backingMap.pollLastEntry()
                 .thenApply(entry -> Maps.immutableEntry(
                         entry.getKey(),
-                        entry.getValue().map(valueDecoder)));
+                        versionedValueTransform.apply(entry.getValue())));
     }
 
     @Override
@@ -210,7 +222,7 @@
 
     @Override
     public CompletableFuture<Versioned<V1>> get(String key) {
-        return backingMap.get(key).thenApply(value -> value.map(valueDecoder));
+        return backingMap.get(key).thenApply(versionedValueTransform);
     }
 
     @Override
@@ -237,18 +249,18 @@
     @Override
     public CompletableFuture<Versioned<V1>> put(String key, V1 value) {
         return backingMap.put(key, valueEncoder.apply(value))
-                .thenApply(v -> v.map(valueDecoder));
+                .thenApply(versionedValueTransform);
     }
 
     @Override
     public CompletableFuture<Versioned<V1>> putAndGet(String key, V1 value) {
         return backingMap.putAndGet(key, valueEncoder.apply(value))
-                .thenApply(v -> v.map(valueDecoder));
+                .thenApply(versionedValueTransform);
     }
 
     @Override
     public CompletableFuture<Versioned<V1>> remove(String key) {
-        return backingMap.remove(key).thenApply(v -> v.map(valueDecoder));
+        return backingMap.remove(key).thenApply(versionedValueTransform);
     }
 
     @Override
@@ -264,7 +276,7 @@
     @Override
     public CompletableFuture<Collection<Versioned<V1>>> values() {
         return backingMap.values().thenApply(valueSet -> valueSet.stream()
-                .map(v -> v.map(valueDecoder)).collect(Collectors.toSet()));
+                .map(versionedValueTransform).collect(Collectors.toSet()));
     }
 
     @Override
@@ -272,19 +284,21 @@
     entrySet() {
         return backingMap.entrySet()
                 .thenApply(
-                    entries -> entries
-                        .stream()
-                        .map(entry ->
-                             Maps.immutableEntry(entry.getKey(),
-                                                 entry.getValue()
-                                                     .map(valueDecoder)))
-                            .collect(Collectors.toSet()));
-        }
+                        entries -> entries
+                                .stream()
+                                .map(entry ->
+                                             Maps.immutableEntry(
+                                                 entry.getKey(),
+                                                 versionedValueTransform
+                                                     .apply(entry.getValue())
+                                             ))
+                                .collect(Collectors.toSet()));
+    }
 
     @Override
     public CompletableFuture<Versioned<V1>> putIfAbsent(String key, V1 value) {
         return backingMap.putIfAbsent(key, valueEncoder.apply(value))
-                .thenApply(v -> v.map(valueDecoder));
+                .thenApply(versionedValueTransform);
     }
 
     @Override
@@ -300,7 +314,7 @@
     @Override
     public CompletableFuture<Versioned<V1>> replace(String key, V1 value) {
         return backingMap.replace(key, valueEncoder.apply(value))
-                .thenApply(v -> v.map(valueDecoder));
+                .thenApply(versionedValueTransform);
     }
 
     @Override