diff --git a/common/schema.h b/common/schema.h
index fde31c72..422ce2ea 100644
--- a/common/schema.h
+++ b/common/schema.h
@@ -38,6 +38,10 @@ namespace swss {
 #define APP_VXLAN_VRF_TABLE_NAME          "VXLAN_VRF_TABLE"
 #define APP_VXLAN_TUNNEL_MAP_TABLE_NAME   "VXLAN_TUNNEL_MAP_TABLE"
 #define APP_VXLAN_TUNNEL_TABLE_NAME       "VXLAN_TUNNEL_TABLE"
+#define APP_VXLAN_FDB_TABLE_NAME          "VXLAN_FDB_TABLE"
+#define APP_VXLAN_REMOTE_VNI_TABLE_NAME   "VXLAN_REMOTE_VNI_TABLE"
+#define APP_VXLAN_EVPN_NVO_TABLE_NAME     "VXLAN_EVPN_NVO_TABLE"
+#define APP_NEIGH_SUPPRESS_VLAN_TABLE_NAME   "SUPPRESS_VLAN_NEIGH_TABLE"
 #define APP_PASS_THROUGH_ROUTE_TABLE_NAME "PASS_THROUGH_ROUTE_TABLE"
 #define APP_ACL_TABLE_TABLE_NAME          "ACL_TABLE_TABLE"
 #define APP_ACL_RULE_TABLE_NAME           "ACL_RULE_TABLE"
@@ -210,8 +214,10 @@ namespace swss {
 
 #define CFG_VXLAN_TUNNEL_TABLE_NAME                 "VXLAN_TUNNEL"
 #define CFG_VXLAN_TUNNEL_MAP_TABLE_NAME             "VXLAN_TUNNEL_MAP"
+#define CFG_VXLAN_EVPN_NVO_TABLE_NAME               "VXLAN_EVPN_NVO"
 #define CFG_VNET_TABLE_NAME                         "VNET"
 #define CFG_NEIGH_TABLE_NAME                        "NEIGH"
+#define CFG_NEIGH_SUPPRESS_VLAN_TABLE_NAME          "SUPPRESS_VLAN_NEIGH"
 
 #define CFG_VNET_RT_TABLE_NAME                      "VNET_ROUTE"
 #define CFG_VNET_RT_TUNNEL_TABLE_NAME               "VNET_ROUTE_TUNNEL"
@@ -251,6 +257,8 @@ namespace swss {
 #define STATE_NEIGH_RESTORE_TABLE_NAME              "NEIGH_RESTORE_TABLE"
 #define STATE_MIRROR_SESSION_TABLE_NAME             "MIRROR_SESSION_TABLE"
 #define STATE_VXLAN_TABLE_NAME                      "VXLAN_TABLE"
+#define STATE_VXLAN_TUNNEL_TABLE_NAME               "VXLAN_TUNNEL_TABLE"
+#define STATE_NEIGH_SUPPRESS_VLAN_TABLE_NAME        "SUPPRESS_VLAN_NEIGH_TABLE"
 #define STATE_BGP_TABLE_NAME                        "BGP_STATE_TABLE"
 #define STATE_DEBUG_COUNTER_CAPABILITIES_NAME       "DEBUG_COUNTER_CAPABILITIES"
 #define STATE_NAT_RESTORE_TABLE_NAME                "NAT_RESTORE_TABLE"