diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/Config.java b/exp/api/src/main/java/org/onosproject/exp/net/config/Config.java
index 2423de5..e0896be 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/Config.java
+++ b/exp/api/src/main/java/org/onosproject/exp/net/config/Config.java
@@ -45,9 +45,10 @@
     /**
      * Initializes the configuration behaviour with necessary context.
      *
-     * @param subject configuration subject
-     * @param node    JSON object node where configuration data is stored
-     * @param mapper  JSON object mapper
+     * @param subject  configuration subject
+     * @param node     JSON object node where configuration data is stored
+     * @param mapper   JSON object mapper
+     * @param delegate delegate context
      */
     public void init(S subject, ObjectNode node, ObjectMapper mapper,
                      ConfigApplyDelegate<S> delegate) {
diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigRegistry.java b/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigRegistry.java
index 711279b..b660a9b 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigRegistry.java
+++ b/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigRegistry.java
@@ -41,6 +41,8 @@
      * class of subject.
      *
      * @param subjectClass subject class
+     * @param <T> type of subject
+     * @return set of config factories
      */
     <T> Set<ConfigFactory<T>> getConfigFactories(Class<T> subjectClass);
 
@@ -49,6 +51,9 @@
      * subject type and key.
      *
      * @param subjectClass subject class
+     * @param configKey    configuration key
+     * @param <T> type of subject
+     * @return config factory
      */
     <T> ConfigFactory<T> getConfigFactory(Class<T> subjectClass, String configKey);
 
@@ -57,6 +62,8 @@
      * configuration class.
      *
      * @param configClass configuration class
+     * @param <T> type of subject
+     * @return config factory
      */
     <T> ConfigFactory<T> getConfigFactory(Class<Config<T>> configClass);
 
diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigService.java b/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigService.java
index 3dae379..65731da 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigService.java
+++ b/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigService.java
@@ -28,6 +28,7 @@
      * Returns the set of subjects for which some configuration is available.
      *
      * @param subjectClass subject class
+     * @param <T> type of subject
      * @return set of configured subjects
      */
     <T> Set<T> getSubjects(Class<T> subjectClass);
@@ -38,6 +39,7 @@
      *
      * @param subjectClass subject class
      * @param configClass  configuration class
+     * @param <T> type of subject
      * @return set of configured subjects
      */
     <T> Set<T> getSubjects(Class<T> subjectClass, Class<Config<T>> configClass);
@@ -47,6 +49,7 @@
      * Returns all configurations for the specified subject.
      *
      * @param subject configuration subject
+     * @param <T> type of subject
      * @return set of configurations
      */
     <T> Set<Config<T>> getConfigs(T subject);
@@ -57,6 +60,7 @@
      *
      * @param subject     configuration subject
      * @param configClass configuration class
+     * @param <T> type of subject
      * @return configuration or null if one is not available
      */
     <T> Config<T> getConfig(T subject, Class<Config<T>> configClass);
