diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 8003c09..ce00771 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -455,6 +455,57 @@
 }
 tables {
   preamble {
+    id: 36626242
+    name: "FabricIngress.pre_next.next_mpls"
+    alias: "next_mpls"
+  }
+  match_fields {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 22765924
+  }
+  action_refs {
+    id: 28485346
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 28485346
+  direct_resource_ids: 330020245
+  size: 1024
+}
+tables {
+  preamble {
+    id: 48011802
+    name: "FabricIngress.pre_next.next_vlan"
+    alias: "next_vlan"
+  }
+  match_fields {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 33475378
+  }
+  action_refs {
+    id: 26738842
+  }
+  action_refs {
+    id: 28485346
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 28485346
+  direct_resource_ids: 333692067
+  size: 1024
+}
+tables {
+  preamble {
     id: 44104738
     name: "FabricIngress.acl.acl"
     alias: "acl"
@@ -531,6 +582,12 @@
     bitwidth: 16
     match_type: TERNARY
   }
+  match_fields {
+    id: 13
+    name: "port_type"
+    bitwidth: 2
+    match_type: TERNARY
+  }
   action_refs {
     id: 23623126
   }
@@ -552,33 +609,6 @@
 }
 tables {
   preamble {
-    id: 35696861
-    name: "FabricIngress.next.next_vlan"
-    alias: "next_vlan"
-  }
-  match_fields {
-    id: 1
-    name: "next_id"
-    bitwidth: 32
-    match_type: EXACT
-  }
-  action_refs {
-    id: 22099101
-  }
-  action_refs {
-    id: 17655305
-  }
-  action_refs {
-    id: 28485346
-    annotations: "@defaultonly"
-    scope: DEFAULT_ONLY
-  }
-  const_default_action_id: 28485346
-  direct_resource_ids: 326370320
-  size: 1024
-}
-tables {
-  preamble {
     id: 48735793
     name: "FabricIngress.next.xconnect"
     alias: "xconnect"
@@ -629,9 +659,6 @@
     id: 31887425
   }
   action_refs {
-    id: 26875580
-  }
-  action_refs {
     id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
@@ -659,9 +686,6 @@
     id: 20985706
   }
   action_refs {
-    id: 27920375
-  }
-  action_refs {
     id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
@@ -1033,6 +1057,11 @@
     name: "FabricIngress.filtering.permit"
     alias: "permit"
   }
+  params {
+    id: 1
+    name: "port_type"
+    bitwidth: 2
+  }
 }
 actions {
   preamble {
@@ -1045,6 +1074,11 @@
     name: "vlan_id"
     bitwidth: 12
   }
+  params {
+    id: 2
+    name: "port_type"
+    bitwidth: 2
+  }
 }
 actions {
   preamble {
@@ -1115,6 +1149,47 @@
 }
 actions {
   preamble {
+    id: 22765924
+    name: "FabricIngress.pre_next.set_mpls_label"
+    alias: "set_mpls_label"
+  }
+  params {
+    id: 1
+    name: "label"
+    bitwidth: 20
+  }
+}
+actions {
+  preamble {
+    id: 33475378
+    name: "FabricIngress.pre_next.set_vlan"
+    alias: "set_vlan"
+  }
+  params {
+    id: 1
+    name: "vlan_id"
+    bitwidth: 12
+  }
+}
+actions {
+  preamble {
+    id: 26738842
+    name: "FabricIngress.pre_next.set_double_vlan"
+    alias: "set_double_vlan"
+  }
+  params {
+    id: 1
+    name: "outer_vlan_id"
+    bitwidth: 12
+  }
+  params {
+    id: 2
+    name: "inner_vlan_id"
+    bitwidth: 12
+  }
+}
+actions {
+  preamble {
     id: 23623126
     name: "FabricIngress.acl.set_next_id_acl"
     alias: "set_next_id_acl"
@@ -1160,35 +1235,6 @@
 }
 actions {
   preamble {
-    id: 22099101
-    name: "FabricIngress.next.set_vlan"
-    alias: "set_vlan"
-  }
-  params {
-    id: 1
-    name: "vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 17655305
-    name: "FabricIngress.next.set_double_vlan"
-    alias: "set_double_vlan"
-  }
-  params {
-    id: 1
-    name: "outer_vlan_id"
-    bitwidth: 12
-  }
-  params {
-    id: 2
-    name: "inner_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
     id: 24640974
     name: "FabricIngress.next.output_xconnect"
     alias: "output_xconnect"
@@ -1247,33 +1293,6 @@
 }
 actions {
   preamble {
-    id: 26875580
-    name: "FabricIngress.next.mpls_routing_simple"
-    alias: "mpls_routing_simple"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
     id: 27301117
     name: "FabricIngress.next.output_hashed"
     alias: "output_hashed"
@@ -1308,33 +1327,6 @@
 }
 actions {
   preamble {
-    id: 27920375
-    name: "FabricIngress.next.mpls_routing_hashed"
-    alias: "mpls_routing_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
     id: 21629581
     name: "FabricIngress.next.set_mcast_group_id"
     alias: "set_mcast_group_id"
@@ -1799,6 +1791,28 @@
 }
 direct_counters {
   preamble {
+    id: 330020245
+    name: "FabricIngress.pre_next.next_mpls_counter"
+    alias: "next_mpls_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 36626242
+}
+direct_counters {
+  preamble {
+    id: 333692067
+    name: "FabricIngress.pre_next.next_vlan_counter"
+    alias: "next_vlan_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 48011802
+}
+direct_counters {
+  preamble {
     id: 319194241
     name: "FabricIngress.acl.acl_counter"
     alias: "acl_counter"
@@ -1810,17 +1824,6 @@
 }
 direct_counters {
   preamble {
-    id: 326370320
-    name: "FabricIngress.next.next_vlan_counter"
-    alias: "next_vlan_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 35696861
-}
-direct_counters {
-  preamble {
     id: 321989420
     name: "FabricIngress.next.xconnect_counter"
     alias: "xconnect_counter"