diff --git a/dash-pipeline/bmv2/dash_pipeline.p4 b/dash-pipeline/bmv2/dash_pipeline.p4
index 49a737cd9..0e3e13a3a 100644
--- a/dash-pipeline/bmv2/dash_pipeline.p4
+++ b/dash-pipeline/bmv2/dash_pipeline.p4
@@ -234,7 +234,6 @@ control dash_ingress(
     }
 
     apply {
-        meta.flow_enabled = false;
 
 #ifndef TARGET_DPDK_PNA
         meta.rx_encap.setValid();
diff --git a/dash-pipeline/bmv2/stages/pre_pipeline.p4 b/dash-pipeline/bmv2/stages/pre_pipeline.p4
index b65fb2f64..55728abcd 100644
--- a/dash-pipeline/bmv2/stages/pre_pipeline.p4
+++ b/dash-pipeline/bmv2/stages/pre_pipeline.p4
@@ -25,21 +25,23 @@ control pre_pipeline_stage(inout headers_t hdr,
         const default_action = accept;
     }
 
-    action set_underlay_mac(EthernetAddress neighbor_mac,
-                            EthernetAddress mac) {
+    action set_internal_config(EthernetAddress neighbor_mac,
+                            EthernetAddress mac,
+                            bit<1> flow_enabled) {
         meta.u0_encap_data.underlay_dmac = neighbor_mac;
         meta.u0_encap_data.underlay_smac = mac;
+        meta.flow_enabled = (bool)flow_enabled;
     }
 
-    /* This table API should be implemented manually using underlay SAI */
+    /* This table API should be implemented manually using SAI */
     @SaiTable[ignored = "true"]
-    table underlay_mac {
+    table internal_config {
         key = {
             meta.appliance_id : ternary;
         }
 
         actions = {
-            set_underlay_mac;
+            set_internal_config;
         }
     }
 
@@ -120,7 +122,7 @@ control pre_pipeline_stage(inout headers_t hdr,
         }
 
         appliance.apply();
-        underlay_mac.apply();
+        internal_config.apply();
     }
 }
 
diff --git a/documentation/express-route-service/express-route-gateway-bypass.md b/documentation/express-route-service/express-route-gateway-bypass.md
index d82acedd6..c190cf7b2 100644
--- a/documentation/express-route-service/express-route-gateway-bypass.md
+++ b/documentation/express-route-service/express-route-gateway-bypass.md
@@ -77,13 +77,12 @@ The scaling requirement for PL redirect map are listed as below. The metrics are
 
 | Metric | Requirement |
 | ------ | ----------- |
-| # of ENIs per DPU | 32 |
+| # of ENIs per DPU (every 200G) | 32 |
 | # of VNET mapping per ENI | 64K |
 | # of PPS | 64M |
-| VNET mapping change rate (CRUD) | (TBD) |
+| # of VNI per ENI | 1 |
+| # of MSEE source PA per ENI (v4 + v6, mixed) | 64 |
 | # of fast path packets | Same as CPS. 3M per card. |
-| # of tunnels | (TBD) |
-| # of next hop in each tunnel | (TBD)  |
 
 ### 4.2. Reliability requirements