diff --git a/cli/src/main/java/org/onosproject/cli/net/AnnotateDeviceCommand.java b/cli/src/main/java/org/onosproject/cli/net/AnnotateDeviceCommand.java
index b538db1..0377ff4 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AnnotateDeviceCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AnnotateDeviceCommand.java
@@ -35,7 +35,7 @@
         description = "Annotates network model entities")
 public class AnnotateDeviceCommand extends AbstractShellCommand {
 
-    static final ProviderId PID = new ProviderId("cli", "org.onosproject.cli", true);
+    static final ProviderId PID = new ProviderId("cli", "org.onosproject.cli");
 
     @Argument(index = 0, name = "uri", description = "Device ID",
             required = true, multiValued = false)
diff --git a/cli/src/main/java/org/onosproject/cli/net/AnnotateHostCommand.java b/cli/src/main/java/org/onosproject/cli/net/AnnotateHostCommand.java
index f363583..b811963 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AnnotateHostCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AnnotateHostCommand.java
@@ -35,7 +35,7 @@
         description = "Annotates host")
 public class AnnotateHostCommand extends AbstractShellCommand {
 
-    static final ProviderId PID = new ProviderId("cli", "org.onosproject.cli", true);
+    static final ProviderId PID = new ProviderId("cli", "org.onosproject.cli");
 
     @Argument(index = 0, name = "uri", description = "Host ID",
             required = true, multiValued = false)
diff --git a/cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java b/cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java
index 3355dc3..1d35e37 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java
@@ -45,7 +45,7 @@
          description = "Annotates network model entities")
 public class AnnotateLinkCommand extends AbstractShellCommand {
 
-    static final ProviderId PID = new ProviderId("cli", "org.onosproject.cli", true);
+    static final ProviderId PID = new ProviderId("cli", "org.onosproject.cli");
 
     @Option(name = "--both",
             description = "Add to both direction")