diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStore.java b/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStore.java
index f25b662..d25c28f 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStore.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStore.java
@@ -19,6 +19,8 @@
 import com.google.common.annotations.Beta;
 import org.onosproject.store.Store;
 
+import java.util.Collection;
+
 /**
  * Manages inventory of device keys; not intended for direct use.
  */
@@ -28,15 +30,28 @@
      * Creates or updates a device key.
      *
      * @param deviceKey device key
-     * @return device key event
      */
-    DeviceKeyEvent createOrUpdateDeviceKey(DeviceKey deviceKey);
+    void createOrUpdateDeviceKey(DeviceKey deviceKey);
 
     /**
      * Deletes a device key by a specific device key identifier.
      *
      * @param deviceKeyId device key unique identifier
-     * @return device key event
      */
-    DeviceKeyEvent deleteDeviceKey(DeviceKeyId deviceKeyId);
+    void deleteDeviceKey(DeviceKeyId deviceKeyId);
+
+    /**
+     * Returns all device keys.
+     *
+     * @return set of device keys
+     */
+    Collection<DeviceKey> getDeviceKeys();
+
+    /**
+     * Returns the device key matching a device key identifier.
+     *
+     * @param deviceKeyId device key unique identifier
+     * @return device key
+     */
+    DeviceKey getDeviceKey(DeviceKeyId deviceKeyId);
 }