diff --git a/src/sonic-yang-models/tests/yang_model_tests/yangTest.json b/src/sonic-yang-models/tests/yang_model_tests/yangTest.json
index 8ed4dfcb2709..9d33171de49a 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/yangTest.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/yangTest.json
@@ -832,12 +832,6 @@
                 "PORT": {
                     "FLEX_COUNTER_STATUS": "enable"
                 },
-                "QUEUE": {
-                    "FLEX_COUNTER_STATUS": "enable"
-                },
-                "QUEUE_WATERMARK": {
-                    "FLEX_COUNTER_STATUS": "enable"
-                },
                 "PORT_RATES": {
                     "FLEX_COUNTER_STATUS": "enable"
                 },
@@ -852,6 +846,9 @@
                 },
                 "QUEUE_WATERMARK": {
                     "FLEX_COUNTER_STATUS": "enable"
+                },
+                "DEBUG_COUNTER": {
+                    "FLEX_COUNTER_STATUS": "enable"
                 }
             }
         }
@@ -923,7 +920,10 @@
 				},
 				"PORT": {
 					"FLEX_COUNTER_STATUS": "enable"
-				}
+				},
+                "DEBUG_COUNTER": {
+                    "FLEX_COUNTER_STATUS": "enable"
+                }
 			}
 		}
 	},
@@ -1162,7 +1162,7 @@
 		},
 		"DEVICE_METADATA": {
 			"localhost": {
-				"type": "ToR",
+				"type": "ToRRouter",
 				"mac": "00:11:22:33:dd:5a",
 				"hostname": "asw.dc",
 				"bgp_asn": "64850",
@@ -1650,7 +1650,7 @@
                 "brkout_mode": "1x100G[40G]"
             },
             "Ethernet4": {
-                "brkout_mode": "4x25G"
+                "brkout_mode": "4x25G[10G]"
             },
             "Ethernet8": {
                 "brkout_mode": "1x100G[40G]"
@@ -1671,12 +1671,6 @@
             "PORT": {
                 "FLEX_COUNTER_STATUS": "enable"
             },
-            "QUEUE": {
-                "FLEX_COUNTER_STATUS": "enable"
-            },
-            "QUEUE_WATERMARK": {
-                "FLEX_COUNTER_STATUS": "enable"
-            },
             "PORT_RATES": {
                 "FLEX_COUNTER_STATUS": "enable"
             },
@@ -1691,6 +1685,9 @@
             },
             "QUEUE_WATERMARK": {
                 "FLEX_COUNTER_STATUS": "enable"
+            },
+            "DEBUG_COUNTER": {
+                "FLEX_COUNTER_STATUS": "enable"
             }
         },
         "CRM": {
diff --git a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
index ace652d3f5ab..83b0512aeb21 100644
--- a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
+++ b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
@@ -62,6 +62,13 @@ module sonic-flex_counter {
                 }
             }
 
+            container PORT_RATES {
+                /* PORT_BUFFER_DROP_COUNTER_FLEX_COUNTER_GROUP */
+                leaf FLEX_COUNTER_STATUS {
+                    type flex_status;
+                }
+            }
+
             container PORT_BUFFER_DROP {
                 /* PORT_BUFFER_DROP_COUNTER_FLEX_COUNTER_GROUP */
                 leaf FLEX_COUNTER_STATUS {