diff --git a/tools/package/runtime/bin/onos-diagnostics b/tools/package/runtime/bin/onos-diagnostics
index 442b1fd..42cf505 100755
--- a/tools/package/runtime/bin/onos-diagnostics
+++ b/tools/package/runtime/bin/onos-diagnostics
@@ -50,6 +50,7 @@
     exit 1
 }
 
+# TODO We should make SR commands optional
 CLI_COMMANDS=(
     "feature:repo-list"
     "feature:list"
@@ -76,11 +77,19 @@
     "roles"
     "masters"
 
+    "fpm-connections"
     "routes"
     "obj-next-ids"
     "obj-pending-nexts"
 
-    "log:display -l WARN"
+    "sr-device-subnets"
+    "sr-ecmp-spg"
+    "sr-link-state"
+    "sr-mcast-next"
+    "sr-mcast-tree"
+    "sr-next-hops"
+    "pseudowires"
+    "dhcp-relay"
 )
 
 # Scan arguments for user/password or other options...