diff --git a/src/main/java/net/onrc/onos/core/datastore/utils/KryoSerializer.java b/src/main/java/net/onrc/onos/core/datastore/utils/KryoSerializer.java
index bcc2736..26d4fd1 100644
--- a/src/main/java/net/onrc/onos/core/datastore/utils/KryoSerializer.java
+++ b/src/main/java/net/onrc/onos/core/datastore/utils/KryoSerializer.java
@@ -1,5 +1,7 @@
 package net.onrc.onos.core.datastore.utils;
 
+import javax.annotation.concurrent.ThreadSafe;
+
 import net.onrc.onos.core.datastore.DataStoreClient;
 
 import com.esotericsoftware.kryo.io.Input;
@@ -8,11 +10,17 @@
 /**
  * {@link Serializer} implementation using Kryo.
  */
+@ThreadSafe
 public final class KryoSerializer
             implements Serializer {
 
     private final ThreadLocalKryo kryo;
 
+    /**
+     * Thread safe Serializer implementation using Kryo.
+     *
+     * @param expectedTypes list of classes expected to be serialized
+     */
     public KryoSerializer(Class<?>... expectedTypes) {
         kryo = new ThreadLocalKryo(expectedTypes);
     }