diff --git a/op-mode-definitions/include/show-nht.xml.i b/op-mode-definitions/include/show-nht.xml.i
new file mode 100644
index 000000000..55dacf3a4
--- /dev/null
+++ b/op-mode-definitions/include/show-nht.xml.i
@@ -0,0 +1,20 @@
+<!-- included start from show-nht.xml.i -->
+<node name="nht">
+  <properties>
+    <help>Show Nexthop tracking table</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <tagNode name="vrf">
+      <properties>
+        <help>Specify the VRF</help>
+        <completionHelp>
+          <path>vrf name</path>
+          <list>all default</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </tagNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/show-ip.xml.in b/op-mode-definitions/show-ip.xml.in
index 3caf1f1ea..bac4df05c 100644
--- a/op-mode-definitions/show-ip.xml.in
+++ b/op-mode-definitions/show-ip.xml.in
@@ -1,46 +1,41 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="ip">
         <properties>
           <help>Show IPv4 networking information</help>
         </properties>
         <children>
           <node name="neighbors">
             <properties>
               <help>Show IPv4 neighbor (ARP) table</help>
             </properties>
             <command>${vyos_op_scripts_dir}/neighbor.py show --family inet</command>
             <children>
               <tagNode name="interface">
                 <properties>
                   <help>Show IPv4 neighbor table for specified interface</help>
                   <completionHelp>
                     <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
                   </completionHelp>
                 </properties>
                 <command>${vyos_op_scripts_dir}/neighbor.py show --family inet --interface "$5"</command>
               </tagNode>
               <tagNode name="state">
                 <properties>
                   <help>Show IPv4 neighbors with specified state</help>
                   <completionHelp>
                     <list>reachable stale failed permanent</list>
                   </completionHelp>
                 </properties>
                 <command>${vyos_op_scripts_dir}/neighbor.py show --family inet --state "$5"</command>
               </tagNode>
             </children>
           </node>
-          <leafNode name="nht">
-            <properties>
-              <help>Show IPv4 nexthop tracking table</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-          </leafNode>
+          #include <include/show-nht.xml.i>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-ipv6.xml.in b/op-mode-definitions/show-ipv6.xml.in
index 66bc2485a..e10379ac2 100644
--- a/op-mode-definitions/show-ipv6.xml.in
+++ b/op-mode-definitions/show-ipv6.xml.in
@@ -1,49 +1,50 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="ipv6">
         <properties>
           <help>Show IPv6 networking information</help>
         </properties>
         <children>
           <node name="access-list">
             <properties>
               <help>Show all IPv6 access-lists</help>
             </properties>
             <command>vtysh -c "show ipv6 access-list"</command>
           </node>
           <tagNode name="access-list">
             <properties>
               <help>Show specified IPv6 access-list</help>
               <completionHelp>
                 <list>WORD</list>
               </completionHelp>
             </properties>
             <command>vtysh -c "show ipv6 access-list $4"</command>
           </tagNode>
           <node name="forwarding">
             <properties>
               <help>Show IPv6 forwarding status</help>
             </properties>
             <command>vtysh -c "show ipv6 forwarding"</command>
           </node>
+          #include <include/show-nht.xml.i>
           <node name="ripng">
             <properties>
               <help>Show RIPNG protocol information</help>
             </properties>
             <command>vtysh -c "show ipv6 ripng"</command>
             <children>
               <node name="status">
                 <properties>
                   <help>Show RIPNG protocol status</help>
                 </properties>
                 <command>vtysh -c "show ipv6 ripng status"</command>
               </node>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>