diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index ef6a5b5..b91f305 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -6,38 +6,34 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.vlan_tag.is_valid"
+    name: "vlan_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   action_refs {
-    id: 16835546
+    id: 16836487
   }
   action_refs {
-    id: 16793253
+    id: 16818236
   }
   action_refs {
-    id: 16798734
+    id: 16794911
   }
-  action_refs {
-    id: 16833700
-  }
-  const_default_action_id: 16835546
+  const_default_action_id: 16836487
   direct_resource_ids: 318815501
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -47,19 +43,19 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: EXACT
   }
@@ -69,7 +65,6 @@
   const_default_action_id: 16840921
   direct_resource_ids: 318827326
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -79,13 +74,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
@@ -93,12 +88,12 @@
     id: 16811012
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318770289
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -108,7 +103,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.mpls.label"
+    name: "mpls_label"
     bitwidth: 20
     match_type: EXACT
   }
@@ -116,12 +111,12 @@
     id: 16827758
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318830507
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -131,7 +126,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: LPM
   }
@@ -142,120 +137,119 @@
     id: 16804187
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318811107
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33574876
-    name: "FabricIngress.forwarding.acl"
+    id: 33618978
+    name: "FabricIngress.acl.acl"
     alias: "acl"
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: TERNARY
   }
   match_fields {
     id: 2
-    name: "fabric_metadata.ip_proto"
+    name: "ip_proto"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "fabric_metadata.l4_src_port"
+    name: "l4_sport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 4
-    name: "fabric_metadata.l4_dst_port"
+    name: "l4_dport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 5
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_src"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 6
-    name: "hdr.ethernet.src_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 7
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   match_fields {
     id: 8
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 9
-    name: "hdr.ipv4.src_addr"
+    name: "ipv4_src"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 10
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 11
-    name: "hdr.icmp.icmp_type"
+    name: "icmp_type"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 12
-    name: "hdr.icmp.icmp_code"
+    name: "icmp_code"
     bitwidth: 8
     match_type: TERNARY
   }
   action_refs {
-    id: 16785374
+    id: 16807382
   }
   action_refs {
-    id: 16801806
+    id: 16829684
   }
   action_refs {
-    id: 16784835
+    id: 16790975
   }
   action_refs {
-    id: 16833260
+    id: 16820765
   }
   action_refs {
-    id: 16842570
+    id: 16827694
   }
-  const_default_action_id: 16842570
-  direct_resource_ids: 318772272
+  const_default_action_id: 16827694
+  direct_resource_ids: 318801025
   size: 128
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33562709
-    name: "FabricIngress.next.vlan_meta"
-    alias: "vlan_meta"
+    id: 33599709
+    name: "FabricIngress.next.next_vlan"
+    alias: "next_vlan"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
@@ -266,47 +260,41 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318785328
+  const_default_action_id: 16819938
+  direct_resource_ids: 318768144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33571723
-    name: "FabricIngress.next.simple"
-    alias: "simple"
+    id: 33596977
+    name: "FabricIngress.next.xconnect"
+    alias: "xconnect"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16802668
+    id: 16842190
   }
   action_refs {
-    id: 16808391
+    id: 16837052
   }
   action_refs {
-    id: 16780007
-  }
-  action_refs {
-    id: 16806134
-  }
-  action_refs {
-    id: 16795970
-  }
-  action_refs {
-    id: 16791579
-  }
-  action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318769096
+  const_default_action_id: 16819938
+  direct_resource_ids: 318778156
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -316,27 +304,27 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800211
+    id: 16815357
   }
   action_refs {
-    id: 16779239
+    id: 16791402
   }
   action_refs {
-    id: 16819349
+    id: 16779255
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  implementation_id: 285233747
+  const_default_action_id: 16819938
+  implementation_id: 285217164
   direct_resource_ids: 318800532
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -346,20 +334,20 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16789575
+    id: 16779917
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318801752
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -369,13 +357,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "standard_metadata.egress_port"
+    name: "eg_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -386,16 +374,9 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318827144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
-  }
 }
 actions {
   preamble {
@@ -406,44 +387,32 @@
 }
 actions {
   preamble {
-    id: 16798734
-    name: "FabricIngress.filtering.drop"
-    alias: "filtering.drop"
+    id: 16836487
+    name: "FabricIngress.filtering.deny"
+    alias: "deny"
   }
 }
 actions {
   preamble {
-    id: 16793253
-    name: "FabricIngress.filtering.set_vlan"
-    alias: "filtering.set_vlan"
+    id: 16818236
+    name: "FabricIngress.filtering.permit"
+    alias: "permit"
+  }
+}
+actions {
+  preamble {
+    id: 16794911
+    name: "FabricIngress.filtering.permit_with_internal_vlan"
+    alias: "permit_with_internal_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16835546
-    name: "FabricIngress.filtering.push_internal_vlan"
-    alias: "push_internal_vlan"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16833700
-    name: "FabricIngress.filtering.nop_ingress_port_vlan"
-    alias: "nop_ingress_port_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16840921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
@@ -499,8 +468,8 @@
 }
 actions {
   preamble {
-    id: 16785374
-    name: "FabricIngress.forwarding.set_next_id_acl"
+    id: 16807382
+    name: "FabricIngress.acl.set_next_id_acl"
     alias: "set_next_id_acl"
   }
   params {
@@ -511,29 +480,29 @@
 }
 actions {
   preamble {
-    id: 16801806
-    name: "FabricIngress.forwarding.punt_to_cpu"
+    id: 16829684
+    name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16784835
-    name: "FabricIngress.forwarding.clone_to_cpu"
+    id: 16790975
+    name: "FabricIngress.acl.clone_to_cpu"
     alias: "clone_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16833260
-    name: "FabricIngress.forwarding.drop"
-    alias: "forwarding.drop"
+    id: 16820765
+    name: "FabricIngress.acl.drop"
+    alias: "drop"
   }
 }
 actions {
   preamble {
-    id: 16842570
-    name: "FabricIngress.forwarding.nop_acl"
+    id: 16827694
+    name: "FabricIngress.acl.nop_acl"
     alias: "nop_acl"
   }
 }
@@ -541,19 +510,19 @@
   preamble {
     id: 16790685
     name: "FabricIngress.next.set_vlan"
-    alias: "next.set_vlan"
+    alias: "set_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16802668
-    name: "FabricIngress.next.output_simple"
-    alias: "output_simple"
+    id: 16842190
+    name: "FabricIngress.next.output_xconnect"
+    alias: "output_xconnect"
   }
   params {
     id: 1
@@ -563,26 +532,33 @@
 }
 actions {
   preamble {
-    id: 16808391
-    name: "FabricIngress.next.set_vlan_output"
-    alias: "set_vlan_output"
+    id: 16837052
+    name: "FabricIngress.next.set_next_id_xconnect"
+    alias: "set_next_id_xconnect"
   }
   params {
     id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16815357
+    name: "FabricIngress.next.output_hashed"
+    alias: "output_hashed"
   }
   params {
-    id: 2
+    id: 1
     name: "port_num"
     bitwidth: 9
   }
 }
 actions {
   preamble {
-    id: 16780007
-    name: "FabricIngress.next.l3_routing_simple"
-    alias: "l3_routing_simple"
+    id: 16791402
+    name: "FabricIngress.next.routing_hashed"
+    alias: "routing_hashed"
   }
   params {
     id: 1
@@ -602,9 +578,9 @@
 }
 actions {
   preamble {
-    id: 16806134
-    name: "FabricIngress.next.mpls_routing_v4_simple"
-    alias: "mpls_routing_v4_simple"
+    id: 16779255
+    name: "FabricIngress.next.mpls_routing_hashed"
+    alias: "mpls_routing_hashed"
   }
   params {
     id: 1
@@ -629,172 +605,28 @@
 }
 actions {
   preamble {
-    id: 16795970
-    name: "FabricIngress.next.mpls_routing_v6_simple"
-    alias: "mpls_routing_v6_simple"
+    id: 16779917
+    name: "FabricIngress.next.set_mcast_group_id"
+    alias: "set_mcast_group_id"
   }
   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: 16791579
-    name: "FabricIngress.next.l3_routing_vlan"
-    alias: "l3_routing_vlan"
-  }
-  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: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16800211
-    name: "FabricIngress.next.l3_routing_hashed"
-    alias: "l3_routing_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-}
-actions {
-  preamble {
-    id: 16779239
-    name: "FabricIngress.next.mpls_routing_v4_hashed"
-    alias: "mpls_routing_v4_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: 16819349
-    name: "FabricIngress.next.mpls_routing_v6_hashed"
-    alias: "mpls_routing_v6_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: 16789575
-    name: "FabricIngress.next.set_mcast_group"
-    alias: "set_mcast_group"
-  }
-  params {
-    id: 1
-    name: "gid"
+    name: "group_id"
     bitwidth: 16
   }
 }
 actions {
   preamble {
-    id: 16823970
-    name: "drop_now"
-    alias: "drop_now"
-  }
-}
-actions {
-  preamble {
-    id: 16801047
-    name: "FabricEgress.pkt_io_egress.pop_vlan"
-    alias: "pkt_io_egress.pop_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16790030
     name: "FabricEgress.egress_next.pop_vlan"
-    alias: "egress_next.pop_vlan"
+    alias: "pop_vlan"
   }
 }
 action_profiles {
   preamble {
-    id: 285233747
-    name: "FabricIngress.next.ecmp_selector"
-    alias: "ecmp_selector"
+    id: 285217164
+    name: "FabricIngress.next.hashed_selector"
+    alias: "hashed_selector"
   }
   table_ids: 33608588
   with_selector: true
@@ -879,36 +711,36 @@
 }
 direct_counters {
   preamble {
-    id: 318772272
-    name: "FabricIngress.forwarding.acl_counter"
+    id: 318801025
+    name: "FabricIngress.acl.acl_counter"
     alias: "acl_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33574876
+  direct_table_id: 33618978
 }
 direct_counters {
   preamble {
-    id: 318785328
-    name: "FabricIngress.next.vlan_meta_counter"
-    alias: "vlan_meta_counter"
+    id: 318768144
+    name: "FabricIngress.next.next_vlan_counter"
+    alias: "next_vlan_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33562709
+  direct_table_id: 33599709
 }
 direct_counters {
   preamble {
-    id: 318769096
-    name: "FabricIngress.next.simple_counter"
-    alias: "simple_counter"
+    id: 318778156
+    name: "FabricIngress.next.xconnect_counter"
+    alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33571723
+  direct_table_id: 33596977
 }
 direct_counters {
   preamble {