diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
index 2ad9fd0..aea728f 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
@@ -3,7 +3,7 @@
 }
 tables {
   preamble {
-    id: 33603300
+    id: 34520804
     name: "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
     alias: "t_pppoe_cp"
   }
@@ -20,19 +20,19 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16830893
+    id: 19321261
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
+  const_default_action_id: 28485346
   size: 16
 }
 tables {
   preamble {
-    id: 33595047
+    id: 48668327
     name: "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4"
     alias: "t_pppoe_term_v4"
   }
@@ -55,19 +55,19 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16780562
+    id: 32574738
   }
   action_refs {
-    id: 16785853
+    id: 27468221
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16785853
+  const_default_action_id: 27468221
   size: 32768
 }
 tables {
   preamble {
-    id: 33594775
+    id: 43294103
     name: "FabricIngress.bng_ingress.downstream.t_line_session_map"
     alias: "t_line_session_map"
   }
@@ -78,22 +78,22 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
   action_refs {
-    id: 16795395
+    id: 29640451
   }
   action_refs {
-    id: 16822844
+    id: 32944700
   }
-  const_default_action_id: 16819938
+  const_default_action_id: 28485346
   size: 8192
 }
 tables {
   preamble {
-    id: 33602462
+    id: 37862302
     name: "FabricIngress.bng_ingress.downstream.t_qos_v4"
     alias: "t_qos_v4"
   }
@@ -122,17 +122,17 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16830304
+    id: 21221216
   }
   action_refs {
-    id: 16804676
+    id: 27355972
   }
-  const_default_action_id: 16804676
+  const_default_action_id: 27355972
   size: 256
 }
 tables {
   preamble {
-    id: 33592041
+    id: 39686889
     name: "FabricIngress.bng_ingress.t_line_map"
     alias: "t_line_map"
   }
@@ -149,14 +149,14 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16829385
+    id: 29084617
   }
-  const_default_action_id: 16829385
+  const_default_action_id: 29084617
   size: 8192
 }
 tables {
   preamble {
-    id: 33611649
+    id: 43310977
     name: "FabricIngress.filtering.ingress_port_vlan"
     alias: "ingress_port_vlan"
   }
@@ -185,21 +185,21 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16836487
+    id: 17164167
   }
   action_refs {
-    id: 16818236
+    id: 24158268
   }
   action_refs {
-    id: 16794911
+    id: 24266015
   }
-  const_default_action_id: 16836487
-  direct_resource_ids: 318815501
+  const_default_action_id: 17164167
+  direct_resource_ids: 326221069
   size: 8192
 }
 tables {
   preamble {
-    id: 33596298
+    id: 49718154
     name: "FabricIngress.filtering.fwd_classifier"
     alias: "fwd_classifier"
   }
@@ -228,15 +228,15 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16840921
+    id: 25032921
   }
-  const_default_action_id: 16840921
-  direct_resource_ids: 318827326
+  const_default_action_id: 25032921
+  direct_resource_ids: 335473470
   size: 1024
 }
 tables {
   preamble {
-    id: 33596749
+    id: 43623757
     name: "FabricIngress.forwarding.bridging"
     alias: "bridging"
   }
@@ -253,20 +253,20 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16811012
+    id: 21791748
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318770289
+  const_default_action_id: 28485346
+  direct_resource_ids: 330959985
   size: 1024
 }
 tables {
   preamble {
-    id: 33574274
+    id: 37768578
     name: "FabricIngress.forwarding.mpls"
     alias: "mpls"
   }
@@ -277,20 +277,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16827758
+    id: 30066030
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318830507
+  const_default_action_id: 28485346
+  direct_resource_ids: 318961579
   size: 1024
 }
 tables {
   preamble {
-    id: 33562650
+    id: 41754650
     name: "FabricIngress.forwarding.routing_v4"
     alias: "routing_v4"
   }
@@ -301,13 +301,13 @@
     match_type: LPM
   }
   action_refs {
-    id: 16777434
+    id: 19792090
   }
   action_refs {
-    id: 16804187
+    id: 29124955
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
@@ -315,7 +315,7 @@
 }
 tables {
   preamble {
-    id: 33618978
+    id: 44104738
     name: "FabricIngress.acl.acl"
     alias: "acl"
   }
@@ -392,27 +392,27 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16807382
+    id: 23623126
   }
   action_refs {
-    id: 16829684
+    id: 23579892
   }
   action_refs {
-    id: 16781601
+    id: 16912673
   }
   action_refs {
-    id: 16820765
+    id: 23570973
   }
   action_refs {
-    id: 16827694
+    id: 29607214
   }
-  const_default_action_id: 16827694
-  direct_resource_ids: 318801025
+  const_default_action_id: 29607214
+  direct_resource_ids: 319194241
   size: 1024
 }
 tables {
   preamble {
-    id: 33599709
+    id: 35696861
     name: "FabricIngress.next.next_vlan"
     alias: "next_vlan"
   }
@@ -423,23 +423,23 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16790685
+    id: 22099101
   }
   action_refs {
-    id: 16803337
+    id: 17655305
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318768144
+  const_default_action_id: 28485346
+  direct_resource_ids: 326370320
   size: 1024
 }
 tables {
   preamble {
-    id: 33608588
+    id: 47960972
     name: "FabricIngress.next.hashed"
     alias: "hashed"
   }
@@ -450,27 +450,27 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16815357
+    id: 27301117
   }
   action_refs {
-    id: 16791402
+    id: 20985706
   }
   action_refs {
-    id: 16779255
+    id: 27920375
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  implementation_id: 285217164
-  direct_resource_ids: 318800532
+  const_default_action_id: 28485346
+  implementation_id: 291115404
+  direct_resource_ids: 322798228
   size: 1024
 }
 tables {
   preamble {
-    id: 33606828
+    id: 40619180
     name: "FabricIngress.next.multicast"
     alias: "multicast"
   }
@@ -481,20 +481,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16779917
+    id: 21629581
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318801752
+  const_default_action_id: 28485346
+  direct_resource_ids: 319194968
   size: 1024
 }
 tables {
   preamble {
-    id: 33599342
+    id: 49262446
     name: "FabricEgress.egress_next.egress_vlan"
     alias: "egress_vlan"
   }
@@ -511,51 +511,51 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16807339
+    id: 30307755
   }
   action_refs {
-    id: 16790030
+    id: 17183246
   }
   action_refs {
-    id: 16787838
+    id: 30812542
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16787838
-  direct_resource_ids: 318827144
+  const_default_action_id: 30812542
+  direct_resource_ids: 318892680
   size: 1024
 }
 actions {
   preamble {
-    id: 16819938
+    id: 28485346
     name: "nop"
     alias: "nop"
   }
 }
 actions {
   preamble {
-    id: 16830893
+    id: 19321261
     name: "FabricIngress.bng_ingress.upstream.punt_to_cpu"
     alias: "upstream.punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16785853
+    id: 27468221
     name: "FabricIngress.bng_ingress.upstream.term_disabled"
     alias: "term_disabled"
   }
 }
 actions {
   preamble {
-    id: 16780562
+    id: 32574738
     name: "FabricIngress.bng_ingress.upstream.term_enabled_v4"
     alias: "term_enabled_v4"
   }
 }
 actions {
   preamble {
-    id: 16795395
+    id: 29640451
     name: "FabricIngress.bng_ingress.downstream.set_session"
     alias: "set_session"
   }
@@ -567,28 +567,28 @@
 }
 actions {
   preamble {
-    id: 16822844
+    id: 32944700
     name: "FabricIngress.bng_ingress.downstream.drop"
     alias: "downstream.drop"
   }
 }
 actions {
   preamble {
-    id: 16830304
+    id: 21221216
     name: "FabricIngress.bng_ingress.downstream.qos_prio"
     alias: "qos_prio"
   }
 }
 actions {
   preamble {
-    id: 16804676
+    id: 27355972
     name: "FabricIngress.bng_ingress.downstream.qos_besteff"
     alias: "qos_besteff"
   }
 }
 actions {
   preamble {
-    id: 16829385
+    id: 29084617
     name: "FabricIngress.bng_ingress.set_line"
     alias: "set_line"
   }
@@ -600,21 +600,21 @@
 }
 actions {
   preamble {
-    id: 16836487
+    id: 17164167
     name: "FabricIngress.filtering.deny"
     alias: "deny"
   }
 }
 actions {
   preamble {
-    id: 16818236
+    id: 24158268
     name: "FabricIngress.filtering.permit"
     alias: "permit"
   }
 }
 actions {
   preamble {
-    id: 16794911
+    id: 24266015
     name: "FabricIngress.filtering.permit_with_internal_vlan"
     alias: "permit_with_internal_vlan"
   }
@@ -626,7 +626,7 @@
 }
 actions {
   preamble {
-    id: 16840921
+    id: 25032921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
   }
@@ -638,7 +638,7 @@
 }
 actions {
   preamble {
-    id: 16811012
+    id: 21791748
     name: "FabricIngress.forwarding.set_next_id_bridging"
     alias: "set_next_id_bridging"
   }
@@ -650,7 +650,7 @@
 }
 actions {
   preamble {
-    id: 16827758
+    id: 30066030
     name: "FabricIngress.forwarding.pop_mpls_and_next"
     alias: "pop_mpls_and_next"
   }
@@ -662,7 +662,7 @@
 }
 actions {
   preamble {
-    id: 16777434
+    id: 19792090
     name: "FabricIngress.forwarding.set_next_id_routing_v4"
     alias: "set_next_id_routing_v4"
   }
@@ -674,14 +674,14 @@
 }
 actions {
   preamble {
-    id: 16804187
+    id: 29124955
     name: "FabricIngress.forwarding.nop_routing_v4"
     alias: "nop_routing_v4"
   }
 }
 actions {
   preamble {
-    id: 16807382
+    id: 23623126
     name: "FabricIngress.acl.set_next_id_acl"
     alias: "set_next_id_acl"
   }
@@ -693,14 +693,14 @@
 }
 actions {
   preamble {
-    id: 16829684
+    id: 23579892
     name: "FabricIngress.acl.punt_to_cpu"
     alias: "acl.punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16781601
+    id: 16912673
     name: "FabricIngress.acl.set_clone_session_id"
     alias: "set_clone_session_id"
   }
@@ -712,21 +712,21 @@
 }
 actions {
   preamble {
-    id: 16820765
+    id: 23570973
     name: "FabricIngress.acl.drop"
     alias: "acl.drop"
   }
 }
 actions {
   preamble {
-    id: 16827694
+    id: 29607214
     name: "FabricIngress.acl.nop_acl"
     alias: "nop_acl"
   }
 }
 actions {
   preamble {
-    id: 16790685
+    id: 22099101
     name: "FabricIngress.next.set_vlan"
     alias: "set_vlan"
   }
@@ -738,7 +738,7 @@
 }
 actions {
   preamble {
-    id: 16803337
+    id: 17655305
     name: "FabricIngress.next.set_double_vlan"
     alias: "set_double_vlan"
   }
@@ -755,7 +755,7 @@
 }
 actions {
   preamble {
-    id: 16815357
+    id: 27301117
     name: "FabricIngress.next.output_hashed"
     alias: "output_hashed"
   }
@@ -767,7 +767,7 @@
 }
 actions {
   preamble {
-    id: 16791402
+    id: 20985706
     name: "FabricIngress.next.routing_hashed"
     alias: "routing_hashed"
   }
@@ -789,7 +789,7 @@
 }
 actions {
   preamble {
-    id: 16779255
+    id: 27920375
     name: "FabricIngress.next.mpls_routing_hashed"
     alias: "mpls_routing_hashed"
   }
@@ -816,7 +816,7 @@
 }
 actions {
   preamble {
-    id: 16779917
+    id: 21629581
     name: "FabricIngress.next.set_mcast_group_id"
     alias: "set_mcast_group_id"
   }
@@ -828,46 +828,46 @@
 }
 actions {
   preamble {
-    id: 16784000
+    id: 20781696
     name: "FabricEgress.bng_egress.downstream.encap_v4"
     alias: "encap_v4"
   }
 }
 actions {
   preamble {
-    id: 16807339
+    id: 30307755
     name: "FabricEgress.egress_next.push_vlan"
     alias: "push_vlan"
   }
 }
 actions {
   preamble {
-    id: 16790030
+    id: 17183246
     name: "FabricEgress.egress_next.pop_vlan"
     alias: "pop_vlan"
   }
 }
 actions {
   preamble {
-    id: 16787838
+    id: 30812542
     name: "FabricEgress.egress_next.drop"
     alias: "egress_next.drop"
   }
 }
 action_profiles {
   preamble {
-    id: 285217164
+    id: 291115404
     name: "FabricIngress.next.hashed_selector"
     alias: "hashed_selector"
   }
-  table_ids: 33608588
+  table_ids: 47960972
   with_selector: true
   size: 1024
   max_group_size: 16
 }
 counters {
   preamble {
-    id: 302022672
+    id: 316309520
     name: "FabricIngress.bng_ingress.upstream.c_terminated"
     alias: "c_terminated"
   }
@@ -878,7 +878,7 @@
 }
 counters {
   preamble {
-    id: 302043418
+    id: 310956314
     name: "FabricIngress.bng_ingress.upstream.c_dropped"
     alias: "c_dropped"
   }
@@ -889,7 +889,7 @@
 }
 counters {
   preamble {
-    id: 302008909
+    id: 302467661
     name: "FabricIngress.bng_ingress.upstream.c_control"
     alias: "c_control"
   }
@@ -900,7 +900,7 @@
 }
 counters {
   preamble {
-    id: 302004781
+    id: 304364077
     name: "FabricIngress.bng_ingress.downstream.c_line_rx"
     alias: "c_line_rx"
   }
@@ -911,7 +911,7 @@
 }
 counters {
   preamble {
-    id: 302011205
+    id: 314528581
     name: "FabricIngress.port_counters_control.egress_port_counter"
     alias: "egress_port_counter"
   }
@@ -922,7 +922,7 @@
 }
 counters {
   preamble {
-    id: 302002771
+    id: 312947283
     name: "FabricIngress.port_counters_control.ingress_port_counter"
     alias: "ingress_port_counter"
   }
@@ -933,7 +933,7 @@
 }
 counters {
   preamble {
-    id: 302046535
+    id: 311942471
     name: "FabricEgress.bng_egress.downstream.c_line_tx"
     alias: "c_line_tx"
   }
@@ -944,106 +944,106 @@
 }
 direct_counters {
   preamble {
-    id: 318815501
+    id: 326221069
     name: "FabricIngress.filtering.ingress_port_vlan_counter"
     alias: "ingress_port_vlan_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33611649
+  direct_table_id: 43310977
 }
 direct_counters {
   preamble {
-    id: 318827326
+    id: 335473470
     name: "FabricIngress.filtering.fwd_classifier_counter"
     alias: "fwd_classifier_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33596298
+  direct_table_id: 49718154
 }
 direct_counters {
   preamble {
-    id: 318770289
+    id: 330959985
     name: "FabricIngress.forwarding.bridging_counter"
     alias: "bridging_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33596749
+  direct_table_id: 43623757
 }
 direct_counters {
   preamble {
-    id: 318830507
+    id: 318961579
     name: "FabricIngress.forwarding.mpls_counter"
     alias: "mpls_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33574274
+  direct_table_id: 37768578
 }
 direct_counters {
   preamble {
-    id: 318801025
+    id: 319194241
     name: "FabricIngress.acl.acl_counter"
     alias: "acl_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33618978
+  direct_table_id: 44104738
 }
 direct_counters {
   preamble {
-    id: 318768144
+    id: 326370320
     name: "FabricIngress.next.next_vlan_counter"
     alias: "next_vlan_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33599709
+  direct_table_id: 35696861
 }
 direct_counters {
   preamble {
-    id: 318800532
+    id: 322798228
     name: "FabricIngress.next.hashed_counter"
     alias: "hashed_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33608588
+  direct_table_id: 47960972
 }
 direct_counters {
   preamble {
-    id: 318801752
+    id: 319194968
     name: "FabricIngress.next.multicast_counter"
     alias: "multicast_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33606828
+  direct_table_id: 40619180
 }
 direct_counters {
   preamble {
-    id: 318827144
+    id: 318892680
     name: "FabricEgress.egress_next.egress_vlan_counter"
     alias: "egress_vlan_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33599342
+  direct_table_id: 49262446
 }
 meters {
   preamble {
-    id: 335569952
+    id: 337077280
     name: "FabricIngress.bng_ingress.downstream.m_besteff"
     alias: "m_besteff"
   }
@@ -1054,7 +1054,7 @@
 }
 meters {
   preamble {
-    id: 335568260
+    id: 349920644
     name: "FabricIngress.bng_ingress.downstream.m_prio"
     alias: "m_prio"
   }
@@ -1065,7 +1065,7 @@
 }
 controller_packet_metadata {
   preamble {
-    id: 67146229
+    id: 81826293
     name: "packet_in"
     alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
@@ -1083,7 +1083,7 @@
 }
 controller_packet_metadata {
   preamble {
-    id: 67121543
+    id: 76689799
     name: "packet_out"
     alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
@@ -1095,8 +1095,13 @@
   }
   metadata {
     id: 2
+    name: "do_forwarding"
+    bitwidth: 1
+  }
+  metadata {
+    id: 3
     name: "_pad"
-    bitwidth: 7
+    bitwidth: 6
   }
 }
 type_info {