diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/DefaultCatalystTypeSerializerFactory.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/DefaultCatalystTypeSerializerFactory.java
new file mode 100644
index 0000000..47bd5b9
--- /dev/null
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/DefaultCatalystTypeSerializerFactory.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.store.primitives.impl;
+
+import org.onosproject.store.service.Serializer;
+
+import io.atomix.catalyst.buffer.BufferInput;
+import io.atomix.catalyst.buffer.BufferOutput;
+import io.atomix.catalyst.serializer.TypeSerializer;
+import io.atomix.catalyst.serializer.TypeSerializerFactory;
+
+/**
+ * {@link TypeSerializerFactory} for providing {@link TypeSerializer}s based on
+ * {@code org.onosproject.store.service.Serializer}.
+ */
+public class DefaultCatalystTypeSerializerFactory implements TypeSerializerFactory {
+
+    private final TypeSerializer<?> typeSerializer;
+
+    public DefaultCatalystTypeSerializerFactory(Serializer serializer) {
+        typeSerializer = new InternalSerializer<>(serializer);
+    }
+
+    @Override
+    public TypeSerializer<?> createSerializer(Class<?> clazz) {
+        return typeSerializer;
+    }
+
+    private class InternalSerializer<T> implements TypeSerializer<T> {
+
+        private final Serializer serializer;
+
+        InternalSerializer(Serializer serializer) {
+            this.serializer = serializer;
+        }
+
+        @Override
+        public T read(Class<T> clazz, BufferInput<?> input,
+                      io.atomix.catalyst.serializer.Serializer serializer) {
+            int size = input.readInt();
+            byte[] payload = new byte[size];
+            input.read(payload);
+            return this.serializer.decode(payload);
+        }
+
+        @Override
+        public void write(T object, BufferOutput<?> output,
+                          io.atomix.catalyst.serializer.Serializer serializer) {
+            byte[] payload = this.serializer.encode(object);
+            output.writeInt(payload.length);
+            output.write(payload);
+        }
+    }
+}