diff --git a/common/schema.h b/common/schema.h
index 57530e65c..95581bfd8 100644
--- a/common/schema.h
+++ b/common/schema.h
@@ -66,19 +66,22 @@ namespace swss {
 
 /***** COUNTER DATABASE *****/
 
-#define COUNTERS_PORT_NAME_MAP          "COUNTERS_PORT_NAME_MAP"
-#define COUNTERS_TABLE                  "COUNTERS"
-#define COUNTERS_QUEUE_NAME_MAP         "COUNTERS_QUEUE_NAME_MAP"
-#define COUNTERS_QUEUE_PORT_MAP         "COUNTERS_QUEUE_PORT_MAP"
-#define COUNTERS_QUEUE_INDEX_MAP        "COUNTERS_QUEUE_INDEX_MAP"
-#define COUNTERS_QUEUE_TYPE_MAP         "COUNTERS_QUEUE_TYPE_MAP"
-#define COUNTERS_PG_NAME_MAP            "COUNTERS_PG_NAME_MAP"
-#define COUNTERS_PG_PORT_MAP            "COUNTERS_PG_PORT_MAP"
-#define COUNTERS_PG_INDEX_MAP           "COUNTERS_PG_INDEX_MAP"
-#define COUNTERS_RIF_TYPE_MAP           "COUNTERS_RIF_TYPE_MAP"
-#define COUNTERS_RIF_NAME_MAP           "COUNTERS_RIF_NAME_MAP"
-#define COUNTERS_CRM_TABLE              "CRM"
-#define COUNTERS_BUFFER_POOL_NAME_MAP   "COUNTERS_BUFFER_POOL_NAME_MAP"
+#define COUNTERS_PORT_NAME_MAP              "COUNTERS_PORT_NAME_MAP"
+#define COUNTERS_TABLE                      "COUNTERS"
+#define COUNTERS_QUEUE_NAME_MAP             "COUNTERS_QUEUE_NAME_MAP"
+#define COUNTERS_QUEUE_PORT_MAP             "COUNTERS_QUEUE_PORT_MAP"
+#define COUNTERS_QUEUE_INDEX_MAP            "COUNTERS_QUEUE_INDEX_MAP"
+#define COUNTERS_QUEUE_TYPE_MAP             "COUNTERS_QUEUE_TYPE_MAP"
+#define COUNTERS_PG_NAME_MAP                "COUNTERS_PG_NAME_MAP"
+#define COUNTERS_PG_PORT_MAP                "COUNTERS_PG_PORT_MAP"
+#define COUNTERS_PG_INDEX_MAP               "COUNTERS_PG_INDEX_MAP"
+#define COUNTERS_RIF_TYPE_MAP               "COUNTERS_RIF_TYPE_MAP"
+#define COUNTERS_RIF_NAME_MAP               "COUNTERS_RIF_NAME_MAP"
+#define COUNTERS_CRM_TABLE                  "CRM"
+#define COUNTERS_BUFFER_POOL_NAME_MAP       "COUNTERS_BUFFER_POOL_NAME_MAP"
+#define COUNTERS_SWITCH_NAME_MAP            "COUNTERS_SWITCH_NAME_MAP"
+#define COUNTERS_DEBUG_NAME_PORT_STAT_MAP   "COUNTERS_DEBUG_NAME_PORT_STAT_MAP"
+#define COUNTERS_DEBUG_NAME_SWITCH_STAT_MAP "COUNTERS_DEBUG_NAME_SWITCH_STAT_MAP"
 
 #define PERIODIC_WATERMARKS_TABLE      "PERIODIC_WATERMARKS"
 #define PERSISTENT_WATERMARKS_TABLE    "PERSISTENT_WATERMARKS"
@@ -95,6 +98,7 @@ namespace swss {
 #define PFC_WD_POLL_MSECS               100
 #define FLEX_COUNTER_TABLE              "FLEX_COUNTER_TABLE"
 #define PORT_COUNTER_ID_LIST            "PORT_COUNTER_ID_LIST"
+#define PORT_DEBUG_COUNTER_ID_LIST      "PORT_DEBUG_COUNTER_ID_LIST"
 #define QUEUE_COUNTER_ID_LIST           "QUEUE_COUNTER_ID_LIST"
 #define QUEUE_ATTR_ID_LIST              "QUEUE_ATTR_ID_LIST"
 #define BUFFER_POOL_COUNTER_ID_LIST     "BUFFER_POOL_COUNTER_ID_LIST"
@@ -105,6 +109,7 @@ namespace swss {
 #define PG_COUNTER_ID_LIST              "PG_COUNTER_ID_LIST"
 #define PG_ATTR_ID_LIST                 "PG_ATTR_ID_LIST"
 #define RIF_COUNTER_ID_LIST             "RIF_COUNTER_ID_LIST"
+#define SWITCH_DEBUG_COUNTER_ID_LIST    "SWITCH_DEBUG_COUNTER_ID_LIST"
 #define PLUGIN_TABLE                    "PLUGIN_TABLE"
 #define LUA_PLUGIN_TYPE                 "LUA_PLUGIN_TYPE"
 #define SAI_OBJECT_TYPE                 "SAI_OBJECT_TYPE"
@@ -192,6 +197,9 @@ namespace swss {
 #define CFG_SFLOW_TABLE_NAME                        "SFLOW"
 #define CFG_SFLOW_SESSION_TABLE_NAME                "SFLOW_SESSION"
 
+#define CFG_DEBUG_COUNTER_TABLE_NAME                "DEBUG_COUNTER"
+#define CFG_DEBUG_COUNTER_DROP_REASON_TABLE_NAME    "DEBUG_COUNTER_DROP_REASON"
+
 /***** STATE DATABASE *****/
 
 #define STATE_SWITCH_CAPABILITY_TABLE_NAME          "SWITCH_CAPABILITY_TABLE"
@@ -209,6 +217,7 @@ namespace swss {
 #define STATE_MIRROR_SESSION_TABLE_NAME             "MIRROR_SESSION_TABLE"
 #define STATE_VXLAN_TABLE_NAME                      "VXLAN_TABLE"
 #define STATE_BGP_TABLE_NAME                        "BGP_STATE_TABLE"
+#define STATE_DEBUG_COUNTER_CAPABILITIES_NAME       "DEBUG_COUNTER_CAPABILITIES"
 
 /***** MISC *****/