diff --git a/common/schema.h b/common/schema.h
index 0f3ed4dae..d6f7bd7ed 100644
--- a/common/schema.h
+++ b/common/schema.h
@@ -110,6 +110,12 @@ namespace swss {
 #define APP_MUX_CABLE_COMMAND_TABLE_NAME    "MUX_CABLE_COMMAND_TABLE"
 #define APP_MUX_CABLE_RESPONSE_TABLE_NAME   "MUX_CABLE_RESPONSE_TABLE"
 
+#define APP_FORWARDING_STATE_COMMAND_TABLE_NAME  "FORWARDING_STATE_COMMAND"
+#define APP_FORWARDING_STATE_RESPONSE_TABLE_NAME "FORWARDING_STATE_RESPONSE"
+
+#define APP_PEER_PORT_TABLE_NAME             "PORT_TABLE_PEER"
+#define APP_PEER_HW_FORWARDING_STATE_TABLE_NAME    "HW_FORWARDING_STATE_PEER"
+
 #define APP_SYSTEM_PORT_TABLE_NAME          "SYSTEM_PORT_TABLE"
 
 #define APP_MACSEC_PORT_TABLE_NAME          "MACSEC_PORT_TABLE"
@@ -445,6 +451,11 @@ namespace swss {
 #define STATE_HW_MUX_CABLE_TABLE_NAME               "HW_MUX_CABLE_TABLE"
 #define STATE_MUX_LINKMGR_TABLE_NAME                "MUX_LINKMGR_TABLE"
 #define STATE_MUX_METRICS_TABLE_NAME                "MUX_METRICS_TABLE"
+#define STATE_MUX_CABLE_INFO_TABLE_NAME             "MUX_CABLE_INFO"
+#define STATE_LINK_PROBE_STATS_TABLE_NAME           "LINK_PROBE_STATS"
+
+#define STATE_PEER_MUX_METRICS_TABLE_NAME           "MUX_METRICS_TABLE_PEER"
+#define STATE_PEER_HW_FORWARDING_STATE_TABLE_NAME   "HW_MUX_CABLE_TABLE_PEER"
 
 #define STATE_SYSTEM_NEIGH_TABLE_NAME               "SYSTEM_NEIGH_TABLE"