diff --git a/self-diagnostics/Makefile b/self-diagnostics/Makefile
index 2fa869253..969cfede7 100644
--- a/self-diagnostics/Makefile
+++ b/self-diagnostics/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.13
+PKG_VERSION:=1.0.14
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0-only
diff --git a/self-diagnostics/files/usr/share/self-diagnostics/spec/multiap.json b/self-diagnostics/files/usr/share/self-diagnostics/spec/multiap.json
index 0f070c689..1a26b2690 100644
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/multiap.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/multiap.json
@@ -65,7 +65,7 @@
 		},
 		{
 			"description": "Data Elements Dump",
-			"cmd": "ubus call wifi.dataelements.collector refresh; sleep 2; ubus call wifi.dataelements.collector dump2"
+			"cmd": "ubus call wifi.dataelements refresh; sleep 2; ubus call wifi.dataelements dump"
 		}
 	]
 }
diff --git a/self-diagnostics/files/usr/share/self-diagnostics/spec/network.json b/self-diagnostics/files/usr/share/self-diagnostics/spec/network.json
index 61953d080..e0bfaf822 100644
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/network.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/network.json
@@ -80,6 +80,20 @@
 		{
 			"description": "IGMP Snooping Table",
 			"cmd": "ubus call mcast stats"
+		},
+		{
+			"description": "DHCP Leases",
+			"cmd": "cat /tmp/dhcp.leases"
+		},
+		{
+			"description": "DHCP Leases Options",
+			"cmd": "cat /tmp/dhcp.client.options",
+			"dependency": [
+				{
+					"type": "file",
+					"file": "/tmp/dhcp.client.options"
+				}
+			]
 		}
 	]
 }
diff --git a/self-diagnostics/files/usr/share/self-diagnostics/spec/system.json b/self-diagnostics/files/usr/share/self-diagnostics/spec/system.json
index cf4933408..6faa36803 100644
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/system.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/system.json
@@ -5,6 +5,16 @@
 			"description": "Firmware banks",
 			"cmd": "ubus call fwbank dump"
 		},
+		{
+			"description": "Firmware banks via script",
+			"cmd": "/etc/sysmngr/fwbank call dump",
+			"dependency": [
+				{
+					"type": "file",
+					"file": "/etc/sysmngr/fwbank"
+				}
+			]
+		},
 		{
 			"description": "System Info",
 			"cmd": "ubus call system info"
@@ -62,6 +72,10 @@
 			"dependency" : {
 				"file": "/usr/sbin/ubinfo"
 			}
+		},
+		{
+			"description": "NTP Status",
+			"cmd": "ntpq -c 'rv 0 stratum'"
 		}
 	]
 }
diff --git a/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json b/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
index 9c787fc7b..5254050d1 100644
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
@@ -7,13 +7,17 @@
 		}
 	],
 	"exec" : [
+		{
+			"description": "Datamodel UCI save list",
+			"cmd": "ls -laR /tmp/bbfdm/"
+		},
 		{
 			"description": "Datamodel microservices",
 			"cmd": "ubus call service list '{\"name\":\"bbfdm.services\"}'"
 		},
 		{
 			"description": "Datamodel microservices registration",
-			"cmd": "ubus call bbfdm service"
+			"cmd": "ubus call bbfdm services"
 		},
 		{
 			"description": "Datamodel plugins and services list",
@@ -31,10 +35,64 @@
 			"description": "TR-181 Parameters via CWMP",
 			"cmd": "icwmpd -c get Device."
 		},
+		{
+			"description": "TR-069 Internal Configs list",
+			"cmd": "ls -R /etc/icwmpd/"
+		},
 		{
 			"description": "TR-069 status",
 			"cmd": "ubus call tr069 status"
 		},
+		{
+			"description": "TR-069 Backup Session",
+			"cmd": "cat /etc/icwmpd/icwmpd_backup_session.xml",
+			"dependency": [
+				{
+					"type": "file",
+					"file": "/etc/icwmpd/icwmpd_backup_session.xml"
+				}
+			]
+		},
+		{
+			"description": "TR-069 Temporary Config",
+			"cmd": "cat /var/state/icwmp",
+			"dependency": [
+				{
+					"type": "file",
+					"file": "/var/state/icwmp"
+				}
+			]
+		},
+		{
+			"description": "TR-069 Internal Config",
+			"cmd": "cat /etc/icwmpd/cwmp",
+			"dependency": [
+				{
+					"type": "file",
+					"file": "/etc/icwmpd/cwmp"
+				}
+			]
+		},
+		{
+			"description": "TR-069 Force Inform Parameters",
+			"cmd": "cat /etc/icwmpd/force_inform.json",
+			"dependency": [
+				{
+					"type": "file",
+					"file": "/etc/icwmpd/force_inform.json"
+				}
+			]
+		},
+		{
+			"description": "TR-069 Obj/Param with Notification",
+			"cmd": "cat /etc/icwmpd/cwmp_notifications",
+			"dependency": [
+				{
+					"type": "file",
+					"file": "/etc/icwmpd/cwmp_notifications"
+				}
+			]
+		},
 		{
 			"description": "TR-069 Logs",
 			"cmd": "cat /var/log/icwmpd.log",