diff --git a/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
index f78b9e4..520b557 100644
--- a/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
+++ b/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
@@ -379,6 +379,8 @@
     // Packet Metadata IDs
     public static final PiPacketMetadataId INGRESS_PORT =
             PiPacketMetadataId.of("ingress_port");
+    public static final PiPacketMetadataId DO_FORWARDING =
+            PiPacketMetadataId.of("do_forwarding");
     public static final PiPacketMetadataId EGRESS_PORT =
             PiPacketMetadataId.of("egress_port");
     // Meter IDs
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreter.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreter.java
index 9d19e00..358f86d 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreter.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreter.java
@@ -53,6 +53,7 @@
 import static org.onlab.util.ImmutableByteSequence.copyFrom;
 import static org.onosproject.net.PortNumber.CONTROLLER;
 import static org.onosproject.net.PortNumber.FLOOD;
+import static org.onosproject.net.PortNumber.TABLE;
 import static org.onosproject.net.flow.instructions.Instruction.Type.OUTPUT;
 import static org.onosproject.net.pi.model.PiPacketOperationType.PACKET_OUT;
 
@@ -63,6 +64,8 @@
         implements PiPipelineInterpreter {
 
     private static final int PORT_BITWIDTH = 9;
+    public static final byte[] ONE = new byte[]{1};
+    public static final byte[] ZERO = new byte[]{0};
 
     // Group tables by control block.
     private static final Set<PiTableId> FILTERING_CTRL_TBLS = ImmutableSet.of(
@@ -180,23 +183,30 @@
     }
 
     private PiPacketOperation createPiPacketOperation(
-            DeviceId deviceId, ByteBuffer data, long portNumber)
+            ByteBuffer data, long portNumber, boolean doForwarding)
             throws PiInterpreterException {
-        PiPacketMetadata metadata = createPacketMetadata(portNumber);
         return PiPacketOperation.builder()
                 .withType(PACKET_OUT)
                 .withData(copyFrom(data))
-                .withMetadatas(ImmutableList.of(metadata))
+                .withMetadatas(createPacketMetadata(portNumber, doForwarding))
                 .build();
     }
 
-    private PiPacketMetadata createPacketMetadata(long portNumber)
+    private Collection<PiPacketMetadata> createPacketMetadata(
+            long portNumber, boolean doForwarding)
             throws PiInterpreterException {
         try {
-            return PiPacketMetadata.builder()
+            ImmutableList.Builder<PiPacketMetadata> builder = ImmutableList.builder();
+            builder.add(PiPacketMetadata.builder()
                     .withId(FabricConstants.EGRESS_PORT)
-                    .withValue(copyFrom(portNumber).fit(PORT_BITWIDTH))
-                    .build();
+                    .withValue(copyFrom(portNumber)
+                            .fit(PORT_BITWIDTH))
+                    .build());
+            builder.add(PiPacketMetadata.builder()
+                    .withId(FabricConstants.DO_FORWARDING)
+                    .withValue(copyFrom(doForwarding ? ONE : ZERO))
+                    .build());
+            return builder.build();
         } catch (ImmutableByteSequence.ByteSequenceTrimException e) {
             throw new PiInterpreterException(format(
                     "Port number '%d' too big, %s", portNumber, e.getMessage()));
@@ -224,18 +234,21 @@
 
         ImmutableList.Builder<PiPacketOperation> builder = ImmutableList.builder();
         for (Instructions.OutputInstruction outInst : outInstructions) {
-            if (outInst.port().isLogical() && !outInst.port().equals(FLOOD)) {
-                throw new PiInterpreterException(format(
-                        "Output on logical port '%s' not supported", outInst.port()));
+            if (outInst.port().equals(TABLE)) {
+                // Logical port. Forward using the switch tables like a regular packet.
+                builder.add(createPiPacketOperation(packet.data(), 0, true));
             } else if (outInst.port().equals(FLOOD)) {
-                // Since fabric.p4 does not support flooding, we create a packet
-                // operation for each switch port.
+                // Logical port. Create a packet operation for each switch port.
                 final DeviceService deviceService = handler().get(DeviceService.class);
                 for (Port port : deviceService.getPorts(packet.sendThrough())) {
-                    builder.add(createPiPacketOperation(deviceId, packet.data(), port.number().toLong()));
+                    builder.add(createPiPacketOperation(packet.data(), port.number().toLong(), false));
                 }
+            } else if (outInst.port().isLogical()) {
+                throw new PiInterpreterException(format(
+                        "Output on logical port '%s' not supported", outInst.port()));
             } else {
-                builder.add(createPiPacketOperation(deviceId, packet.data(), outInst.port().toLong()));
+                // Send as-is to given port bypassing all switch tables.
+                builder.add(createPiPacketOperation(packet.data(), outInst.port().toLong(), false));
             }
         }
         return builder.build();
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricTreatmentInterpreter.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricTreatmentInterpreter.java
index de3ecbf..9b33d2d 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricTreatmentInterpreter.java
@@ -38,7 +38,13 @@
 
 import static java.lang.String.format;
 import static org.onosproject.net.flow.instructions.Instruction.Type.OUTPUT;
-import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.*;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.ETH_DST;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.ETH_SRC;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.MPLS_LABEL;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.MPLS_PUSH;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.VLAN_ID;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.VLAN_POP;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.VLAN_PUSH;
 import static org.onosproject.pipelines.fabric.impl.behaviour.FabricUtils.instruction;
 import static org.onosproject.pipelines.fabric.impl.behaviour.FabricUtils.l2Instruction;
 import static org.onosproject.pipelines.fabric.impl.behaviour.FabricUtils.l2Instructions;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipeliner.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipeliner.java
index 79045f1..eda5786 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipeliner.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipeliner.java
@@ -17,16 +17,26 @@
 package org.onosproject.pipelines.fabric.impl.behaviour.pipeliner;
 
 import com.google.common.collect.ImmutableList;
+import org.onlab.packet.Ethernet;
 import org.onlab.util.KryoNamespace;
 import org.onlab.util.SharedExecutors;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.behaviour.NextGroup;
 import org.onosproject.net.behaviour.Pipeliner;
 import org.onosproject.net.behaviour.PipelinerContext;
+import org.onosproject.net.flow.DefaultFlowRule;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.FlowRuleOperations;
 import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criteria;
+import org.onosproject.net.flow.criteria.PiCriterion;
 import org.onosproject.net.flowobjective.FilteringObjective;
 import org.onosproject.net.flowobjective.FlowObjectiveStore;
 import org.onosproject.net.flowobjective.ForwardingObjective;
@@ -37,6 +47,10 @@
 import org.onosproject.net.flowobjective.ObjectiveError;
 import org.onosproject.net.group.GroupDescription;
 import org.onosproject.net.group.GroupService;
+import org.onosproject.net.pi.runtime.PiAction;
+import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.pipelines.fabric.FabricConstants;
+import org.onosproject.pipelines.fabric.impl.FabricPipeconfLoader;
 import org.onosproject.pipelines.fabric.impl.behaviour.AbstractFabricHandlerBehavior;
 import org.onosproject.pipelines.fabric.impl.behaviour.FabricCapabilities;
 import org.onosproject.store.serializers.KryoNamespaces;
@@ -51,7 +65,10 @@
 
 import static java.lang.String.format;
 import static org.onosproject.net.flowobjective.NextObjective.Type.SIMPLE;
+import static org.onosproject.pipelines.fabric.impl.behaviour.FabricInterpreter.ONE;
+import static org.onosproject.pipelines.fabric.impl.behaviour.FabricInterpreter.ZERO;
 import static org.onosproject.pipelines.fabric.impl.behaviour.FabricUtils.outputPort;
+import static org.onosproject.pipelines.fabric.impl.behaviour.pipeliner.FilteringObjectiveTranslator.FWD_IPV4_ROUTING;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -63,6 +80,8 @@
         implements Pipeliner {
 
     private static final Logger log = getLogger(FabricPipeliner.class);
+    private static final int DEFAULT_FLOW_PRIORITY = 100;
+    public static final int DEFAULT_VLAN = 4094;
 
     protected static final KryoNamespace KRYO = new KryoNamespace.Builder()
             .register(KryoNamespaces.API)
@@ -70,9 +89,11 @@
             .build("FabricPipeliner");
 
     protected DeviceId deviceId;
+    protected ApplicationId appId;
     protected FlowRuleService flowRuleService;
     protected GroupService groupService;
     protected FlowObjectiveStore flowObjectiveStore;
+    protected CoreService coreService;
 
     private FilteringObjectiveTranslator filteringTranslator;
     private ForwardingObjectiveTranslator forwardingTranslator;
@@ -106,6 +127,17 @@
         this.filteringTranslator = new FilteringObjectiveTranslator(deviceId, capabilities);
         this.forwardingTranslator = new ForwardingObjectiveTranslator(deviceId, capabilities);
         this.nextTranslator = new NextObjectiveTranslator(deviceId, capabilities);
+        this.coreService = context.directory().get(CoreService.class);
+        this.appId = coreService.getAppId(FabricPipeconfLoader.PIPELINE_APP_NAME);
+    }
+
+    protected void initializePipeline() {
+        // Set up rules for packet-out forwarding. We support only IPv4 routing.
+        final int cpuPort = capabilities.cpuPort().get();
+        flowRuleService.applyFlowRules(
+                ingressVlanRule(cpuPort, false, DEFAULT_VLAN),
+                fwdClassifierRule(cpuPort, null, Ethernet.TYPE_IPV4, FWD_IPV4_ROUTING,
+                        DEFAULT_FLOW_PRIORITY));
     }
 
     @Override
@@ -268,7 +300,7 @@
     private void removeNextGroup(NextObjective obj) {
         final NextGroup removed = flowObjectiveStore.removeNextGroup(obj.id());
         if (removed == null) {
-            log.debug("NextGroup {} was not found in FlowObjectiveStore");
+            log.debug("NextGroup {} was not found in FlowObjectiveStore", obj);
         }
     }
 
@@ -296,6 +328,57 @@
         }
     }
 
+    public FlowRule ingressVlanRule(long port, boolean vlanValid, int vlanId) {
+        final TrafficSelector selector = DefaultTrafficSelector.builder()
+                .add(Criteria.matchInPort(PortNumber.portNumber(port)))
+                .add(PiCriterion.builder()
+                        .matchExact(FabricConstants.HDR_VLAN_IS_VALID, vlanValid ? ONE : ZERO)
+                        .build())
+                .build();
+        final TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .piTableAction(PiAction.builder()
+                        .withId(vlanValid ? FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT
+                                : FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT_WITH_INTERNAL_VLAN)
+                        .withParameter(new PiActionParam(FabricConstants.VLAN_ID, vlanId))
+                        .build())
+                .build();
+        return DefaultFlowRule.builder()
+                .withSelector(selector)
+                .withTreatment(treatment)
+                .forTable(FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN)
+                .makePermanent()
+                .withPriority(DEFAULT_FLOW_PRIORITY)
+                .forDevice(deviceId)
+                .fromApp(appId)
+                .build();
+    }
+
+    public FlowRule fwdClassifierRule(int port, Short ethType, short ipEthType, byte fwdType, int priority) {
+        final TrafficSelector.Builder selectorBuilder = DefaultTrafficSelector.builder()
+                .matchInPort(PortNumber.portNumber(port))
+                .matchPi(PiCriterion.builder()
+                        .matchExact(FabricConstants.HDR_IP_ETH_TYPE, ipEthType)
+                        .build());
+        if (ethType != null) {
+            selectorBuilder.matchEthType(ethType);
+        }
+        final TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .piTableAction(PiAction.builder()
+                        .withId(FabricConstants.FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE)
+                        .withParameter(new PiActionParam(FabricConstants.FWD_TYPE, fwdType))
+                        .build())
+                .build();
+        return DefaultFlowRule.builder()
+                .withSelector(selectorBuilder.build())
+                .withTreatment(treatment)
+                .forTable(FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER)
+                .makePermanent()
+                .withPriority(priority)
+                .forDevice(deviceId)
+                .fromApp(appId)
+                .build();
+    }
+
     /**
      * NextGroup implementation.
      */
diff --git a/pipelines/fabric/impl/src/main/resources/bmv2-compile.sh b/pipelines/fabric/impl/src/main/resources/bmv2-compile.sh
index 2cc8a3f..87bfd95 100755
--- a/pipelines/fabric/impl/src/main/resources/bmv2-compile.sh
+++ b/pipelines/fabric/impl/src/main/resources/bmv2-compile.sh
@@ -17,7 +17,7 @@
 echo
 echo "## Compiling profile ${PROFILE} in ${OUT_DIR}..."
 
-dockerImage=opennetworking/p4c:stable
+dockerImage=opennetworking/p4c:stable-20210108
 dockerRun="docker run --rm -w ${SRC_DIR} -v ${SRC_DIR}:${SRC_DIR} -v ${OUT_DIR}:${OUT_DIR} ${dockerImage}"
 
 # Generate preprocessed P4 source (for debugging).
diff --git a/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4 b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
index a27f9a0..2ec4776 100644
--- a/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
@@ -90,7 +90,6 @@
             (false, true,  false) : decap_inner_udp();
             (false, false, true)  : decap_inner_icmp();
         }
-        size = 4;
     }
     apply {
         decap_gtpu.apply();
@@ -105,7 +104,7 @@
     //=============================//
     //===== Misc Things ======//
     //=============================//
-    
+
     counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
 
     DecapGtpu() decap_gtpu_from_dbuf;
@@ -158,7 +157,7 @@
                         bit<1>       needs_gtpu_decap,
                         qid_t        qid) {
         load_pdr(ctr_id, far_id, needs_gtpu_decap);
-        // we cannot set the qid, since bmv2 does not support it   
+        // we cannot set the qid, since bmv2 does not support it
     }
 
     // These two tables scale well and cover the average case PDR
@@ -267,7 +266,7 @@
             }
 
             // GTPU Decapsulate
-            if (fabric_md.spgw.needs_gtpu_decap == _TRUE) { 
+            if (fabric_md.spgw.needs_gtpu_decap == _TRUE) {
                 decap_gtpu.apply(hdr, fabric_md);
             }
 
@@ -315,7 +314,7 @@
         hdr.gtpu_ipv4.hdr_checksum = 0; // Updated later
 
         hdr.gtpu_udp.setValid();
-        hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; 
+        hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port;
         hdr.gtpu_udp.dport = UDP_PORT_GTPU;
         hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len
                 + (UDP_HDR_SIZE + GTP_HDR_SIZE);
diff --git a/pipelines/fabric/impl/src/main/resources/include/define.p4 b/pipelines/fabric/impl/src/main/resources/include/define.p4
index 08487c7..7b46dee 100644
--- a/pipelines/fabric/impl/src/main/resources/include/define.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/define.p4
@@ -67,6 +67,7 @@
 #define IP_VERSION_6 6
 #endif
 
+#define PACKET_OUT_HDR_SIZE 2
 #define ETH_HDR_SIZE 14
 #define IPV4_HDR_SIZE 20
 #define UDP_HDR_SIZE 8
diff --git a/pipelines/fabric/impl/src/main/resources/include/header.p4 b/pipelines/fabric/impl/src/main/resources/include/header.p4
index 9dc6102..ce6fcf8 100644
--- a/pipelines/fabric/impl/src/main/resources/include/header.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/header.p4
@@ -30,7 +30,8 @@
 @controller_header("packet_out")
 header packet_out_header_t {
     port_num_t egress_port;
-    bit<7> _pad;
+    bit<1> do_forwarding;
+    bit<6> _pad;
 }
 
 header ethernet_t {
diff --git a/pipelines/fabric/impl/src/main/resources/include/parser.p4 b/pipelines/fabric/impl/src/main/resources/include/parser.p4
index de0a76b..21032c7 100644
--- a/pipelines/fabric/impl/src/main/resources/include/parser.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/parser.p4
@@ -28,13 +28,28 @@
 
     state start {
         transition select(standard_metadata.ingress_port) {
-            CPU_PORT: parse_packet_out;
+            CPU_PORT: check_packet_out;
             default: parse_ethernet;
         }
     }
 
-    state parse_packet_out {
+    state check_packet_out {
+        packet_out_header_t tmp = packet.lookahead<packet_out_header_t>();
+        transition select(tmp.do_forwarding) {
+            0: parse_packet_out_and_accept;
+            default: strip_packet_out;
+        }
+    }
+
+    state parse_packet_out_and_accept {
+        // Will transmit over requested egress port as-is. No need to parse further.
         packet.extract(hdr.packet_out);
+        transition accept;
+    }
+
+    state strip_packet_out {
+        // Remove packet-out header and process as a regular packet.
+        packet.advance(PACKET_OUT_HDR_SIZE * 8);
         transition parse_ethernet;
     }
 
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
index 78933e1..19b8530 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
@@ -4,55 +4,61 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp", 16, false],
-        ["tmp_0", 16, false],
-        ["tmp_1", 4, false],
+        ["tmp_0", 1, false],
+        ["tmp_1", 16, false],
+        ["tmp_3", 16, false],
+        ["tmp_5", 4, false],
+        ["tmp_6", 16, false],
         ["tmp_2", 32, false],
-        ["tmp_3", 32, false],
-        ["bng_ingress_upstream_tmp", 1, false],
-        ["bng_ingress_downstream_tmp", 1, false],
+        ["tmp_4", 32, false],
         ["bng_ingress_upstream_hasReturned", 1, false],
-        ["fabric_metadata_t._ip_eth_type0", 16, false],
-        ["fabric_metadata_t._vlan_id1", 12, false],
-        ["fabric_metadata_t._vlan_pri2", 3, false],
-        ["fabric_metadata_t._vlan_cfi3", 1, false],
-        ["fabric_metadata_t._push_double_vlan4", 1, false],
-        ["fabric_metadata_t._inner_vlan_id5", 12, false],
-        ["fabric_metadata_t._inner_vlan_pri6", 3, false],
-        ["fabric_metadata_t._inner_vlan_cfi7", 1, false],
-        ["fabric_metadata_t._mpls_label8", 20, false],
-        ["fabric_metadata_t._mpls_ttl9", 8, false],
-        ["fabric_metadata_t._skip_forwarding10", 1, false],
-        ["fabric_metadata_t._skip_next11", 1, false],
-        ["fabric_metadata_t._fwd_type12", 3, false],
-        ["fabric_metadata_t._next_id13", 32, false],
-        ["fabric_metadata_t._is_multicast14", 1, false],
-        ["fabric_metadata_t._is_controller_packet_out15", 1, false],
-        ["fabric_metadata_t._ip_proto16", 8, false],
-        ["fabric_metadata_t._l4_sport17", 16, false],
-        ["fabric_metadata_t._l4_dport18", 16, false],
-        ["fabric_metadata_t._ipv4_src_addr19", 32, false],
-        ["fabric_metadata_t._ipv4_dst_addr20", 32, false],
-        ["fabric_metadata_t._bng_type21", 2, false],
-        ["fabric_metadata_t._bng_line_id22", 32, false],
-        ["fabric_metadata_t._bng_pppoe_session_id23", 16, false],
-        ["fabric_metadata_t._bng_ds_meter_result24", 32, false],
-        ["fabric_metadata_t._bng_s_tag25", 12, false],
-        ["fabric_metadata_t._bng_c_tag26", 12, false],
-        ["_padding_0", 3, false]
+        ["userMetadata._ip_eth_type0", 16, false],
+        ["userMetadata._vlan_id1", 12, false],
+        ["userMetadata._vlan_pri2", 3, false],
+        ["userMetadata._vlan_cfi3", 1, false],
+        ["userMetadata._push_double_vlan4", 1, false],
+        ["userMetadata._inner_vlan_id5", 12, false],
+        ["userMetadata._inner_vlan_pri6", 3, false],
+        ["userMetadata._inner_vlan_cfi7", 1, false],
+        ["userMetadata._mpls_label8", 20, false],
+        ["userMetadata._mpls_ttl9", 8, false],
+        ["userMetadata._skip_forwarding10", 1, false],
+        ["userMetadata._skip_next11", 1, false],
+        ["userMetadata._fwd_type12", 3, false],
+        ["userMetadata._next_id13", 32, false],
+        ["userMetadata._is_multicast14", 1, false],
+        ["userMetadata._is_controller_packet_out15", 1, false],
+        ["userMetadata._ip_proto16", 8, false],
+        ["userMetadata._l4_sport17", 16, false],
+        ["userMetadata._l4_dport18", 16, false],
+        ["userMetadata._ipv4_src_addr19", 32, false],
+        ["userMetadata._ipv4_dst_addr20", 32, false],
+        ["userMetadata._bng_type21", 2, false],
+        ["userMetadata._bng_line_id22", 32, false],
+        ["userMetadata._bng_pppoe_session_id23", 16, false],
+        ["userMetadata._bng_ds_meter_result24", 32, false],
+        ["userMetadata._bng_s_tag25", 12, false],
+        ["userMetadata._bng_c_tag26", 12, false],
+        ["_padding_0", 4, false]
+      ]
+    },
+    {
+      "name" : "packet_out_header_t",
+      "id" : 1,
+      "fields" : [
+        ["egress_port", 9, false],
+        ["do_forwarding", 1, false],
+        ["_pad", 6, false]
       ]
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "fields" : [
         ["ingress_port", 9, false],
         ["egress_spec", 9, false],
         ["egress_port", 9, false],
-        ["clone_spec", 32, false],
         ["instance_type", 32, false],
-        ["drop", 1, false],
-        ["recirculate_port", 16, false],
         ["packet_length", 32, false],
         ["enq_timestamp", 32, false],
         ["enq_qdepth", 19, false],
@@ -60,20 +66,17 @@
         ["deq_qdepth", 19, false],
         ["ingress_global_timestamp", 48, false],
         ["egress_global_timestamp", 48, false],
-        ["lf_field_list", 32, false],
         ["mcast_grp", 16, false],
-        ["resubmit_flag", 32, false],
         ["egress_rid", 16, false],
-        ["recirculate_flag", 32, false],
         ["checksum_error", 1, false],
         ["parser_error", 32, false],
         ["priority", 3, false],
-        ["_padding", 2, false]
+        ["_padding", 3, false]
       ]
     },
     {
       "name" : "ethernet_t",
-      "id" : 2,
+      "id" : 3,
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false]
@@ -81,7 +84,7 @@
     },
     {
       "name" : "vlan_tag_t",
-      "id" : 3,
+      "id" : 4,
       "fields" : [
         ["eth_type", 16, false],
         ["pri", 3, false],
@@ -91,14 +94,14 @@
     },
     {
       "name" : "eth_type_t",
-      "id" : 4,
+      "id" : 5,
       "fields" : [
         ["value", 16, false]
       ]
     },
     {
       "name" : "pppoe_t",
-      "id" : 5,
+      "id" : 6,
       "fields" : [
         ["version", 4, false],
         ["type_id", 4, false],
@@ -110,7 +113,7 @@
     },
     {
       "name" : "mpls_t",
-      "id" : 6,
+      "id" : 7,
       "fields" : [
         ["label", 20, false],
         ["tc", 3, false],
@@ -120,7 +123,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 7,
+      "id" : 8,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -139,7 +142,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -156,7 +159,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -166,7 +169,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 10,
+      "id" : 11,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -177,14 +180,6 @@
       ]
     },
     {
-      "name" : "packet_out_header_t",
-      "id" : 11,
-      "fields" : [
-        ["egress_port", 9, false],
-        ["_pad", 7, false]
-      ]
-    },
-    {
       "name" : "packet_in_header_t",
       "id" : 12,
       "fields" : [
@@ -195,99 +190,106 @@
   ],
   "headers" : [
     {
-      "name" : "scalars",
+      "name" : "tmp",
       "id" : 0,
+      "header_type" : "packet_out_header_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "scalars",
+      "id" : 1,
       "header_type" : "scalars_0",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "header_type" : "standard_metadata",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "ethernet",
-      "id" : 2,
+      "id" : 3,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "vlan_tag",
-      "id" : 3,
-      "header_type" : "vlan_tag_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "inner_vlan_tag",
       "id" : 4,
       "header_type" : "vlan_tag_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "eth_type",
+      "name" : "inner_vlan_tag",
       "id" : 5,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "eth_type",
+      "id" : 6,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "pppoe",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "pppoe_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "mpls",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 10,
+      "id" : 11,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 11,
+      "id" : 12,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 13,
+      "id" : 14,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
@@ -340,10 +342,11 @@
               "type" : "hexstr",
               "value" : "0x00ff",
               "mask" : null,
-              "next_state" : "parse_packet_out"
+              "next_state" : "check_packet_out"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -356,12 +359,229 @@
           ]
         },
         {
-          "name" : "parse_packet_out",
+          "name" : "check_packet_out",
           "id" : 1,
           "parser_ops" : [
             {
               "parameters" : [
                 {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_6"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 16]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "parameters" : [
+                    {
+                      "type" : "header",
+                      "value" : "tmp"
+                    }
+                  ],
+                  "op" : "add_header"
+                }
+              ],
+              "op" : "primitive"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "egress_port"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x7"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01ff"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "do_forwarding"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "_pad"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "tmp_6"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x3f"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x00",
+              "mask" : null,
+              "next_state" : "parse_packet_out_and_accept"
+            },
+            {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : "strip_packet_out"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_0"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_packet_out_and_accept",
+          "id" : 2,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
                   "type" : "regular",
                   "value" : "packet_out"
                 }
@@ -371,7 +591,32 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "strip_packet_out",
+          "id" : 3,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "hexstr",
+                  "value" : "0x00000010"
+                }
+              ],
+              "op" : "advance"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -380,7 +625,7 @@
         },
         {
           "name" : "parse_ethernet",
-          "id" : 2,
+          "id" : 4,
           "parser_ops" : [
             {
               "parameters" : [
@@ -395,7 +640,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+                  "value" : ["scalars", "userMetadata._vlan_id1"]
                 },
                 {
                   "type" : "hexstr",
@@ -408,7 +653,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -438,7 +683,8 @@
               "next_state" : "parse_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -446,13 +692,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
         {
           "name" : "parse_vlan_tag",
-          "id" : 3,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -467,7 +713,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag25"]
+                  "value" : ["scalars", "userMetadata._bng_s_tag25"]
                 },
                 {
                   "type" : "field",
@@ -480,7 +726,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -498,7 +744,8 @@
               "next_state" : "parse_inner_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -506,13 +753,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
         {
           "name" : "parse_inner_vlan_tag",
-          "id" : 4,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -527,7 +774,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag26"]
+                  "value" : ["scalars", "userMetadata._bng_c_tag26"]
                 },
                 {
                   "type" : "field",
@@ -539,7 +786,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -548,7 +796,7 @@
         },
         {
           "name" : "parse_eth_type",
-          "id" : 5,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -586,7 +834,8 @@
               "next_state" : "parse_pppoe"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -600,7 +849,7 @@
         },
         {
           "name" : "parse_pppoe",
-          "id" : 6,
+          "id" : 8,
           "parser_ops" : [
             {
               "parameters" : [
@@ -626,7 +875,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -640,7 +890,7 @@
         },
         {
           "name" : "parse_mpls",
-          "id" : 7,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -655,7 +905,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+                  "value" : ["scalars", "userMetadata._mpls_label8"]
                 },
                 {
                   "type" : "field",
@@ -668,7 +918,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
+                  "value" : ["scalars", "userMetadata._mpls_ttl9"]
                 },
                 {
                   "type" : "field",
@@ -681,7 +931,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_5"]
                 },
                 {
                   "type" : "lookahead",
@@ -699,7 +949,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -707,13 +958,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_5"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 8,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -728,7 +979,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+                  "value" : ["scalars", "userMetadata._ip_proto16"]
                 },
                 {
                   "type" : "field",
@@ -741,7 +992,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+                  "value" : ["scalars", "userMetadata._ip_eth_type0"]
                 },
                 {
                   "type" : "hexstr",
@@ -754,7 +1005,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+                  "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
                 },
                 {
                   "type" : "field",
@@ -767,7 +1018,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+                  "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
                 },
                 {
                   "type" : "field",
@@ -797,7 +1048,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -811,7 +1063,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 9,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -826,7 +1078,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+                  "value" : ["scalars", "userMetadata._l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -839,7 +1091,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+                  "value" : ["scalars", "userMetadata._l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -851,7 +1103,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -860,7 +1113,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 10,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -875,7 +1128,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+                  "value" : ["scalars", "userMetadata._l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -888,7 +1141,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+                  "value" : ["scalars", "userMetadata._l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -900,7 +1153,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -914,7 +1168,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 11,
+          "id" : 13,
           "parser_ops" : [
             {
               "parameters" : [
@@ -928,7 +1182,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -945,11 +1200,12 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 268,
+        "line" : 283,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "ipv4", "tcp", "udp", "icmp"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "ipv4", "tcp", "udp", "icmp"],
+      "primitives" : []
     }
   ],
   "meter_arrays" : [
@@ -1403,7 +1659,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -1425,7 +1681,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
+              "value" : ["scalars", "userMetadata._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -1434,7 +1690,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 161,
+            "line" : 162,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -1475,7 +1731,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -1504,7 +1760,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -1531,7 +1787,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
+              "value" : ["scalars", "userMetadata._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -1540,7 +1796,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 164,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -1550,7 +1806,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id23"]
+              "value" : ["scalars", "userMetadata._bng_pppoe_session_id23"]
             },
             {
               "type" : "runtime_data",
@@ -1573,7 +1829,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -1595,7 +1851,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
+              "value" : ["scalars", "userMetadata._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -1604,7 +1860,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 164,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -1618,7 +1874,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -1672,7 +1928,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
             },
             {
               "type" : "runtime_data",
@@ -1698,7 +1954,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -1727,7 +1983,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -1774,7 +2030,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -1805,7 +2061,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+              "value" : ["scalars", "userMetadata._fwd_type12"]
             },
             {
               "type" : "runtime_data",
@@ -1836,7 +2092,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -1867,7 +2123,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label8"]
             },
             {
               "type" : "hexstr",
@@ -1886,7 +2142,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -1917,7 +2173,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -1954,7 +2210,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -1999,7 +2255,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -2081,7 +2337,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -2128,7 +2384,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -2163,7 +2419,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -2182,7 +2438,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._push_double_vlan4"]
+              "value" : ["scalars", "userMetadata._push_double_vlan4"]
             },
             {
               "type" : "expression",
@@ -2211,7 +2467,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
             },
             {
               "type" : "runtime_data",
@@ -2230,7 +2486,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_s_tag25"]
+              "value" : ["scalars", "userMetadata._bng_s_tag25"]
             },
             {
               "type" : "runtime_data",
@@ -2249,7 +2505,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_c_tag26"]
+              "value" : ["scalars", "userMetadata._bng_c_tag26"]
             },
             {
               "type" : "runtime_data",
@@ -2400,7 +2656,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label8"]
             },
             {
               "type" : "runtime_data",
@@ -2507,7 +2763,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_multicast14"]
+              "value" : ["scalars", "userMetadata._is_multicast14"]
             },
             {
               "type" : "expression",
@@ -2534,7 +2790,7 @@
       ]
     },
     {
-      "name" : "act",
+      "name" : "packetio25",
       "id" : 35,
       "runtime_data" : [],
       "primitives" : [
@@ -2577,7 +2833,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out15"]
+              "value" : ["scalars", "userMetadata._is_controller_packet_out15"]
             },
             {
               "type" : "expression",
@@ -2614,7 +2870,7 @@
       ]
     },
     {
-      "name" : "act_0",
+      "name" : "filtering111",
       "id" : 36,
       "runtime_data" : [],
       "primitives" : [
@@ -2623,7 +2879,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "field",
@@ -2642,7 +2898,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             },
             {
               "type" : "field",
@@ -2661,7 +2917,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             },
             {
               "type" : "field",
@@ -2678,7 +2934,7 @@
       ]
     },
     {
-      "name" : "act_1",
+      "name" : "filtering117",
       "id" : 37,
       "runtime_data" : [],
       "primitives" : [
@@ -2687,7 +2943,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
             },
             {
               "type" : "field",
@@ -2706,7 +2962,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_pri6"]
+              "value" : ["scalars", "userMetadata._inner_vlan_pri6"]
             },
             {
               "type" : "field",
@@ -2725,7 +2981,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_cfi7"]
+              "value" : ["scalars", "userMetadata._inner_vlan_cfi7"]
             },
             {
               "type" : "field",
@@ -2742,7 +2998,7 @@
       ]
     },
     {
-      "name" : "act_2",
+      "name" : "filtering127",
       "id" : 38,
       "runtime_data" : [],
       "primitives" : [
@@ -2751,7 +3007,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
+              "value" : ["scalars", "userMetadata._mpls_ttl9"]
             },
             {
               "type" : "hexstr",
@@ -2768,7 +3024,7 @@
       ]
     },
     {
-      "name" : "act_3",
+      "name" : "port_counter31",
       "id" : 39,
       "runtime_data" : [],
       "primitives" : [
@@ -2826,7 +3082,7 @@
       ]
     },
     {
-      "name" : "act_4",
+      "name" : "port_counter34",
       "id" : 40,
       "runtime_data" : [],
       "primitives" : [
@@ -2835,7 +3091,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             },
             {
               "type" : "expression",
@@ -2871,7 +3127,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             }
           ],
           "source_info" : {
@@ -2884,7 +3140,7 @@
       ]
     },
     {
-      "name" : "act_5",
+      "name" : "bng126",
       "id" : 41,
       "runtime_data" : [],
       "primitives" : [
@@ -2893,115 +3149,6 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "bng_ingress_upstream_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_6",
-      "id" : 42,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "bng_ingress_upstream_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_7",
-      "id" : 43,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../header.p4",
-            "line" : 162,
-            "column" : 37,
-            "source_fragment" : "2w0x1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_8",
-      "id" : 44,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
               "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
             },
             {
@@ -3029,72 +3176,35 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 45,
+      "name" : "bng342",
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "count",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "counter_array",
-              "value" : "FabricIngress.bng_ingress.upstream.c_dropped"
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._bng_type21"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "type" : "hexstr",
+              "value" : "0x01"
             }
           ],
           "source_info" : {
-            "filename" : "include/bng.p4",
-            "line" : 131,
-            "column" : 20,
-            "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
+            "filename" : "include/control/../header.p4",
+            "line" : 163,
+            "column" : 37,
+            "source_fragment" : "2w0x1; ..."
           }
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 46,
-      "runtime_data" : [],
-      "primitives" : [
+        },
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "bng_ingress_downstream_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_11",
-      "id" : 47,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "bng_ingress_downstream_tmp"]
+              "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3115,8 +3225,34 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 48,
+      "name" : "bng131",
+      "id" : 43,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_dropped"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 131,
+            "column" : 20,
+            "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "bng238",
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3128,11 +3264,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result24"]
             }
           ],
           "source_info" : {
@@ -3145,8 +3281,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 49,
+      "name" : "bng241",
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3158,11 +3294,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result24"]
             }
           ],
           "source_info" : {
@@ -3176,7 +3312,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v4",
-      "id" : 50,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3193,7 +3329,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 123,
+            "line" : 124,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -3279,7 +3415,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id23"]
+              "value" : ["scalars", "userMetadata._bng_pppoe_session_id23"]
             }
           ],
           "source_info" : {
@@ -3298,7 +3434,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
+              "value" : ["scalars", "userMetadata._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -3364,7 +3500,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -3373,7 +3509,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 51,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3400,7 +3536,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             }
           ],
           "source_info" : {
@@ -3414,7 +3550,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 52,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3441,7 +3577,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label8"]
             }
           ],
           "source_info" : {
@@ -3498,7 +3634,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
+              "value" : ["scalars", "userMetadata._mpls_ttl9"]
             }
           ],
           "source_info" : {
@@ -3522,7 +3658,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -3531,7 +3667,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_outer_vlan",
-      "id" : 53,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3558,7 +3694,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             }
           ],
           "source_info" : {
@@ -3577,7 +3713,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             }
           ],
           "source_info" : {
@@ -3601,7 +3737,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3615,7 +3751,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             }
           ],
           "source_info" : {
@@ -3629,7 +3765,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_inner_vlan",
-      "id" : 54,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3656,7 +3792,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_cfi7"]
+              "value" : ["scalars", "userMetadata._inner_vlan_cfi7"]
             }
           ],
           "source_info" : {
@@ -3675,7 +3811,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_pri6"]
+              "value" : ["scalars", "userMetadata._inner_vlan_pri6"]
             }
           ],
           "source_info" : {
@@ -3694,7 +3830,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
             }
           ],
           "source_info" : {
@@ -3718,7 +3854,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3737,7 +3873,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3746,7 +3882,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 55,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3773,7 +3909,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             }
           ],
           "source_info" : {
@@ -3792,7 +3928,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             }
           ],
           "source_info" : {
@@ -3816,7 +3952,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3830,7 +3966,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             }
           ],
           "source_info" : {
@@ -3844,7 +3980,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 56,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3866,7 +4002,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.drop",
-      "id" : 57,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3887,8 +4023,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 58,
+      "name" : "packetio41",
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3904,8 +4040,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 59,
+      "name" : "packetio44",
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3955,8 +4091,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 60,
+      "name" : "next349",
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3977,8 +4113,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 61,
+      "name" : "next365",
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3999,8 +4135,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 62,
+      "name" : "next376",
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4021,8 +4157,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 63,
+      "name" : "next375",
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4070,8 +4206,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 64,
+      "name" : "next380",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4092,8 +4228,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 65,
+      "name" : "next379",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4154,7 +4290,7 @@
       "init_table" : "node_2",
       "tables" : [
         {
-          "name" : "tbl_act",
+          "name" : "tbl_packetio25",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -4170,10 +4306,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [35],
-          "actions" : ["act"],
+          "actions" : ["packetio25"],
           "base_default_next" : "node_4",
           "next_tables" : {
-            "act" : "node_4"
+            "packetio25" : "node_4"
           },
           "default_entry" : {
             "action_id" : 35,
@@ -4183,7 +4319,7 @@
           }
         },
         {
-          "name" : "tbl_act_0",
+          "name" : "tbl_filtering111",
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -4199,10 +4335,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [36],
-          "actions" : ["act_0"],
+          "actions" : ["filtering111"],
           "base_default_next" : "node_6",
           "next_tables" : {
-            "act_0" : "node_6"
+            "filtering111" : "node_6"
           },
           "default_entry" : {
             "action_id" : 36,
@@ -4212,7 +4348,7 @@
           }
         },
         {
-          "name" : "tbl_act_1",
+          "name" : "tbl_filtering117",
           "id" : 2,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -4228,10 +4364,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [37],
-          "actions" : ["act_1"],
+          "actions" : ["filtering117"],
           "base_default_next" : "node_8",
           "next_tables" : {
-            "act_1" : "node_8"
+            "filtering117" : "node_8"
           },
           "default_entry" : {
             "action_id" : 37,
@@ -4241,7 +4377,7 @@
           }
         },
         {
-          "name" : "tbl_act_2",
+          "name" : "tbl_filtering127",
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -4257,10 +4393,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [38],
-          "actions" : ["act_2"],
+          "actions" : ["filtering127"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_2" : "FabricIngress.filtering.ingress_port_vlan"
+            "filtering127" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
             "action_id" : 38,
@@ -4356,7 +4492,7 @@
             {
               "match_type" : "exact",
               "name" : "ip_eth_type",
-              "target" : ["scalars", "fabric_metadata_t._ip_eth_type0"],
+              "target" : ["scalars", "userMetadata._ip_eth_type0"],
               "mask" : null
             }
           ],
@@ -4392,7 +4528,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -4435,7 +4571,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t._mpls_label8"],
+              "target" : ["scalars", "userMetadata._mpls_label8"],
               "mask" : null
             }
           ],
@@ -4472,7 +4608,7 @@
             {
               "match_type" : "lpm",
               "name" : "ipv4_dst",
-              "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"],
+              "target" : ["scalars", "userMetadata._ipv4_dst_addr20"],
               "mask" : null
             }
           ],
@@ -4516,19 +4652,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto16"],
+              "target" : ["scalars", "userMetadata._ip_proto16"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport17"],
+              "target" : ["scalars", "userMetadata._l4_sport17"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport18"],
+              "target" : ["scalars", "userMetadata._l4_dport18"],
               "mask" : null
             },
             {
@@ -4616,7 +4752,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id13"],
               "mask" : null
             }
           ],
@@ -4650,7 +4786,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id13"],
               "mask" : null
             }
           ],
@@ -4687,7 +4823,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id13"],
               "mask" : null
             }
           ],
@@ -4713,7 +4849,7 @@
           }
         },
         {
-          "name" : "tbl_act_3",
+          "name" : "tbl_port_counter31",
           "id" : 13,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -4729,10 +4865,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [39],
-          "actions" : ["act_3"],
+          "actions" : ["port_counter31"],
           "base_default_next" : "node_26",
           "next_tables" : {
-            "act_3" : "node_26"
+            "port_counter31" : "node_26"
           },
           "default_entry" : {
             "action_id" : 39,
@@ -4742,7 +4878,7 @@
           }
         },
         {
-          "name" : "tbl_act_4",
+          "name" : "tbl_port_counter34",
           "id" : 14,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -4758,10 +4894,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [40],
-          "actions" : ["act_4"],
+          "actions" : ["port_counter34"],
           "base_default_next" : "FabricIngress.bng_ingress.t_line_map",
           "next_tables" : {
-            "act_4" : "FabricIngress.bng_ingress.t_line_map"
+            "port_counter34" : "FabricIngress.bng_ingress.t_line_map"
           },
           "default_entry" : {
             "action_id" : 40,
@@ -4783,13 +4919,13 @@
             {
               "match_type" : "exact",
               "name" : "s_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_s_tag25"],
+              "target" : ["scalars", "userMetadata._bng_s_tag25"],
               "mask" : null
             },
             {
               "match_type" : "exact",
               "name" : "c_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_c_tag26"],
+              "target" : ["scalars", "userMetadata._bng_c_tag26"],
               "mask" : null
             }
           ],
@@ -4813,7 +4949,7 @@
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_bng342",
           "id" : 16,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -4828,14 +4964,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_7"],
+          "action_ids" : [42],
+          "actions" : ["bng342"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
           "next_tables" : {
-            "act_7" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+            "bng342" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4874,8 +5010,8 @@
           "actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_6",
-            "__MISS__" : "tbl_act_7"
+            "__HIT__" : "tbl_bng126",
+            "__MISS__" : "node_33"
           },
           "default_entry" : {
             "action_id" : 0,
@@ -4885,54 +5021,8 @@
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_bng126",
           "id" : 18,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_34",
-          "next_tables" : {
-            "act_5" : "node_34"
-          },
-          "default_entry" : {
-            "action_id" : 41,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_7",
-          "id" : 19,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_34",
-          "next_tables" : {
-            "act_6" : "node_34"
-          },
-          "default_entry" : {
-            "action_id" : 42,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_8",
-          "id" : 20,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 126,
@@ -4946,14 +5036,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_36",
+          "action_ids" : [41],
+          "actions" : ["bng126"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_8" : "node_36"
+            "bng126" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4961,7 +5051,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "id" : 21,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 87,
@@ -4972,7 +5062,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
+              "target" : ["scalars", "userMetadata._bng_line_id22"],
               "mask" : null
             },
             {
@@ -4998,7 +5088,7 @@
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_9",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_bng131",
             "FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
           },
           "default_entry" : {
@@ -5009,8 +5099,8 @@
           }
         },
         {
-          "name" : "tbl_act_9",
-          "id" : 22,
+          "name" : "tbl_bng131",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 131,
@@ -5024,14 +5114,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_9"],
+          "action_ids" : [43],
+          "actions" : ["bng131"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_9" : null
+            "bng131" : null
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5039,7 +5129,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_line_session_map",
-          "id" : 23,
+          "id" : 21,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 169,
@@ -5050,7 +5140,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
+              "target" : ["scalars", "userMetadata._bng_line_id22"],
               "mask" : null
             }
           ],
@@ -5064,8 +5154,8 @@
           "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_10",
-            "__MISS__" : "tbl_act_11"
+            "__MISS__" : null,
+            "__HIT__" : "node_38"
           },
           "default_entry" : {
             "action_id" : 1,
@@ -5075,54 +5165,8 @@
           }
         },
         {
-          "name" : "tbl_act_10",
-          "id" : 24,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_43",
-          "next_tables" : {
-            "act_10" : "node_43"
-          },
-          "default_entry" : {
-            "action_id" : 46,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 25,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_43",
-          "next_tables" : {
-            "act_11" : "node_43"
-          },
-          "default_entry" : {
-            "action_id" : 47,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "id" : 26,
+          "id" : 22,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 194,
@@ -5133,7 +5177,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
+              "target" : ["scalars", "userMetadata._bng_line_id22"],
               "mask" : null
             },
             {
@@ -5165,8 +5209,8 @@
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_12",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_13"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_bng238",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_bng241"
           },
           "default_entry" : {
             "action_id" : 14,
@@ -5176,8 +5220,8 @@
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 27,
+          "name" : "tbl_bng238",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 238,
@@ -5191,22 +5235,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
-          "actions" : ["act_12"],
+          "action_ids" : [44],
+          "actions" : ["bng238"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_12" : null
+            "bng238" : null
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
-          "id" : 28,
+          "name" : "tbl_bng241",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 241,
@@ -5220,14 +5264,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_13"],
+          "action_ids" : [45],
+          "actions" : ["bng241"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_13" : null
+            "bng241" : null
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5250,23 +5294,23 @@
             "input" : [
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+                "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+                "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+                "value" : ["scalars", "userMetadata._ip_proto16"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+                "value" : ["scalars", "userMetadata._l4_sport17"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+                "value" : ["scalars", "userMetadata._l4_dport18"]
               }
             ]
           }
@@ -5293,7 +5337,7 @@
               }
             }
           },
-          "true_next" : "tbl_act",
+          "true_next" : "tbl_packetio25",
           "false_next" : "node_4"
         },
         {
@@ -5316,7 +5360,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_0",
+          "true_next" : "tbl_filtering111",
           "false_next" : "node_6"
         },
         {
@@ -5339,7 +5383,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_1",
+          "true_next" : "tbl_filtering117",
           "false_next" : "node_8"
         },
         {
@@ -5369,7 +5413,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_2",
+          "true_next" : "tbl_filtering127",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -5379,26 +5423,23 @@
             "filename" : "fabric.p4",
             "line" : 69,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+            "source_fragment" : "fabric_metadata.skip_forwarding"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+                    "value" : ["scalars", "userMetadata._skip_forwarding10"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -5420,7 +5461,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -5446,7 +5487,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -5472,7 +5513,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -5490,26 +5531,23 @@
             "filename" : "fabric.p4",
             "line" : 73,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_next == false"
+            "source_fragment" : "fabric_metadata.skip_next"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+                    "value" : ["scalars", "userMetadata._skip_next11"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -5539,7 +5577,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_3",
+          "true_next" : "tbl_port_counter31",
           "false_next" : "node_26"
         },
         {
@@ -5565,7 +5603,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_4",
+          "true_next" : "tbl_port_counter34",
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
@@ -5588,32 +5626,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_bng342",
           "false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
         },
         {
-          "name" : "node_34",
+          "name" : "node_33",
           "id" : 12,
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "bng_ingress_upstream_tmp"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_8",
-          "false_next" : "node_36"
-        },
-        {
-          "name" : "node_36",
-          "id" : 13,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
               "op" : "not",
               "left" : null,
               "right" : {
@@ -5630,11 +5651,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_37"
+          "true_next" : "node_34"
         },
         {
-          "name" : "node_37",
-          "id" : 14,
+          "name" : "node_34",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 128,
@@ -5656,25 +5677,8 @@
           "true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4"
         },
         {
-          "name" : "node_43",
-          "id" : 15,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "bng_ingress_downstream_tmp"]
-              }
-            }
-          },
-          "false_next" : null,
-          "true_next" : "node_44"
-        },
-        {
-          "name" : "node_44",
-          "id" : 16,
+          "name" : "node_38",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 235,
@@ -5706,11 +5710,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_50",
+      "init_table" : "node_44",
       "tables" : [
         {
-          "name" : "tbl_act_14",
-          "id" : 29,
+          "name" : "tbl_packetio41",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -5724,22 +5728,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_52",
+          "action_ids" : [54],
+          "actions" : ["packetio41"],
+          "base_default_next" : "node_46",
           "next_tables" : {
-            "act_14" : "node_52"
+            "packetio41" : "node_46"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
-          "id" : 30,
+          "name" : "tbl_packetio44",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -5753,22 +5757,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_54",
+          "action_ids" : [55],
+          "actions" : ["packetio44"],
+          "base_default_next" : "node_48",
           "next_tables" : {
-            "act_15" : "node_54"
+            "packetio44" : "node_48"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
-          "id" : 31,
+          "name" : "tbl_next349",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 349,
@@ -5782,14 +5786,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
-          "actions" : ["act_16"],
-          "base_default_next" : "node_56",
+          "action_ids" : [56],
+          "actions" : ["next349"],
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "act_16" : "node_56"
+            "next349" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5797,7 +5801,7 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 32,
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -5811,14 +5815,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
+          "action_ids" : [47],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
-          "base_default_next" : "node_60",
+          "base_default_next" : "node_54",
           "next_tables" : {
-            "FabricEgress.egress_next.pop_mpls_if_present" : "node_60"
+            "FabricEgress.egress_next.pop_mpls_if_present" : "node_54"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5826,7 +5830,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 33,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 355,
@@ -5840,14 +5844,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
+          "action_ids" : [48],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
-          "base_default_next" : "node_60",
+          "base_default_next" : "node_54",
           "next_tables" : {
-            "FabricEgress.egress_next.set_mpls" : "node_60"
+            "FabricEgress.egress_next.set_mpls" : "node_54"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5855,7 +5859,7 @@
         },
         {
           "name" : "tbl_egress_next_push_outer_vlan",
-          "id" : 34,
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 361,
@@ -5869,14 +5873,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
+          "action_ids" : [49],
           "actions" : ["FabricEgress.egress_next.push_outer_vlan"],
           "base_default_next" : "tbl_egress_next_push_inner_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.push_outer_vlan" : "tbl_egress_next_push_inner_vlan"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5884,7 +5888,7 @@
         },
         {
           "name" : "tbl_egress_next_push_inner_vlan",
-          "id" : 35,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 362,
@@ -5898,22 +5902,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
+          "action_ids" : [50],
           "actions" : ["FabricEgress.egress_next.push_inner_vlan"],
-          "base_default_next" : "node_65",
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "FabricEgress.egress_next.push_inner_vlan" : "node_65"
+            "FabricEgress.egress_next.push_inner_vlan" : "node_59"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 36,
+          "name" : "tbl_next365",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 365,
@@ -5927,14 +5931,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_17"],
+          "action_ids" : [57],
+          "actions" : ["next365"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
-            "act_17" : "FabricEgress.egress_next.egress_vlan"
+            "next365" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 61,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5942,7 +5946,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 37,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -5953,7 +5957,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -5969,24 +5973,24 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55, 56, 57],
+          "action_ids" : [51, 52, 53],
           "actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
-          "base_default_next" : "node_65",
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_65",
-            "FabricEgress.egress_next.pop_vlan" : "node_65",
-            "FabricEgress.egress_next.drop" : "node_65"
+            "FabricEgress.egress_next.push_vlan" : "node_59",
+            "FabricEgress.egress_next.pop_vlan" : "node_59",
+            "FabricEgress.egress_next.drop" : "node_59"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 38,
+          "name" : "tbl_next375",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 375,
@@ -6000,22 +6004,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_67",
+          "action_ids" : [59],
+          "actions" : ["next375"],
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "act_19" : "node_67"
+            "next375" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
-          "id" : 39,
+          "name" : "tbl_next376",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 376,
@@ -6029,22 +6033,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_73",
+          "action_ids" : [58],
+          "actions" : ["next376"],
+          "base_default_next" : "node_67",
           "next_tables" : {
-            "act_18" : "node_73"
+            "next376" : "node_67"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
-          "id" : 40,
+          "name" : "tbl_next379",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 379,
@@ -6058,22 +6062,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_71",
+          "action_ids" : [61],
+          "actions" : ["next379"],
+          "base_default_next" : "node_65",
           "next_tables" : {
-            "act_21" : "node_71"
+            "next379" : "node_65"
           },
           "default_entry" : {
-            "action_id" : 65,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 41,
+          "name" : "tbl_next380",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 380,
@@ -6087,14 +6091,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_73",
+          "action_ids" : [60],
+          "actions" : ["next380"],
+          "base_default_next" : "node_67",
           "next_tables" : {
-            "act_20" : "node_73"
+            "next380" : "node_67"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6102,7 +6106,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v4",
-          "id" : 42,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 297,
@@ -6116,14 +6120,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
+          "action_ids" : [46],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.bng_egress.downstream.encap_v4" : null
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6133,41 +6137,31 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_50",
-          "id" : 17,
+          "name" : "node_44",
+          "id" : 15,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 39,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
+            "filename" : "fabric.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out15"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._is_controller_packet_out15"]
               }
             }
           },
-          "true_next" : "tbl_act_14",
-          "false_next" : "node_52"
+          "true_next" : "tbl_packetio41",
+          "false_next" : "node_46"
         },
         {
-          "name" : "node_52",
-          "id" : 18,
+          "name" : "node_46",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -6188,12 +6182,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "node_54"
+          "true_next" : "tbl_packetio44",
+          "false_next" : "node_48"
         },
         {
-          "name" : "node_54",
-          "id" : 19,
+          "name" : "node_48",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 347,
@@ -6207,21 +6201,11 @@
               "left" : {
                 "type" : "expression",
                 "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast14"]
-                      }
-                    }
-                  },
+                  "op" : "d2b",
+                  "left" : null,
                   "right" : {
-                    "type" : "bool",
-                    "value" : true
+                    "type" : "field",
+                    "value" : ["scalars", "userMetadata._is_multicast14"]
                   }
                 }
               },
@@ -6241,12 +6225,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_16",
-          "false_next" : "node_56"
+          "true_next" : "tbl_next349",
+          "false_next" : "node_50"
         },
         {
-          "name" : "node_56",
-          "id" : 20,
+          "name" : "node_50",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 352,
@@ -6259,7 +6243,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+                "value" : ["scalars", "userMetadata._mpls_label8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -6267,12 +6251,12 @@
               }
             }
           },
-          "true_next" : "node_57",
+          "true_next" : "node_51",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_57",
-          "id" : 21,
+          "name" : "node_51",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -6291,44 +6275,34 @@
             }
           },
           "true_next" : "tbl_egress_next_pop_mpls_if_present",
-          "false_next" : "node_60"
+          "false_next" : "node_54"
         },
         {
-          "name" : "node_60",
-          "id" : 22,
+          "name" : "node_54",
+          "id" : 20,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 359,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.push_double_vlan == true"
+            "filename" : "fabric.p4",
+            "line" : 104,
+            "column" : 31,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._push_double_vlan4"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._push_double_vlan4"]
               }
             }
           },
           "true_next" : "tbl_egress_next_push_outer_vlan",
-          "false_next" : "tbl_act_17"
+          "false_next" : "tbl_next365"
         },
         {
-          "name" : "node_65",
-          "id" : 23,
+          "name" : "node_59",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 374,
@@ -6346,12 +6320,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_18",
-          "false_next" : "node_69"
+          "true_next" : "tbl_next375",
+          "false_next" : "node_63"
         },
         {
-          "name" : "node_67",
-          "id" : 24,
+          "name" : "node_61",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 376,
@@ -6372,12 +6346,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_73"
+          "true_next" : "tbl_next376",
+          "false_next" : "node_67"
         },
         {
-          "name" : "node_69",
-          "id" : 25,
+          "name" : "node_63",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 378,
@@ -6405,7 +6379,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                    "value" : ["scalars", "userMetadata._fwd_type12"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -6415,12 +6389,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_20",
-          "false_next" : "node_73"
+          "true_next" : "tbl_next379",
+          "false_next" : "node_67"
         },
         {
-          "name" : "node_71",
-          "id" : 26,
+          "name" : "node_65",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 380,
@@ -6441,12 +6415,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_21",
-          "false_next" : "node_73"
+          "true_next" : "tbl_next380",
+          "false_next" : "node_67"
         },
         {
-          "name" : "node_73",
-          "id" : 27,
+          "name" : "node_67",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 358,
@@ -6459,7 +6433,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._bng_type21"]
+                "value" : ["scalars", "userMetadata._bng_type21"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -6468,11 +6442,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_74"
+          "true_next" : "node_68"
         },
         {
-          "name" : "node_74",
-          "id" : 28,
+          "name" : "node_68",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 296,
@@ -6578,33 +6552,21 @@
       ["standard_metadata", "egress_global_timestamp"]
     ],
     [
-      "intrinsic_metadata.lf_field_list",
-      ["standard_metadata", "lf_field_list"]
-    ],
-    [
       "intrinsic_metadata.mcast_grp",
       ["standard_metadata", "mcast_grp"]
     ],
     [
-      "intrinsic_metadata.resubmit_flag",
-      ["standard_metadata", "resubmit_flag"]
-    ],
-    [
       "intrinsic_metadata.egress_rid",
       ["standard_metadata", "egress_rid"]
     ],
     [
-      "intrinsic_metadata.recirculate_flag",
-      ["standard_metadata", "recirculate_flag"]
-    ],
-    [
       "intrinsic_metadata.priority",
       ["standard_metadata", "priority"]
     ]
   ],
   "program" : "fabric.p4",
   "__meta__" : {
-    "version" : [2, 18],
+    "version" : [2, 23],
     "compiler" : "https://github.com/p4lang/p4c"
   }
 }
\ No newline at end of file
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 {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 473ae1e..1c1b0fe 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -4,83 +4,88 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
+        ["tmp_0", 1, false],
+        ["tmp_2", 32, false],
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp_0", 16, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
-        ["tmp", 32, false],
-        ["tmp_3", 32, false],
+        ["tmp_3", 16, false],
+        ["tmp_5", 4, false],
+        ["tmp_6", 16, false],
         ["tmp_4", 32, false],
-        ["bng_ingress_upstream_tmp", 1, false],
-        ["bng_ingress_downstream_tmp", 1, false],
-        ["spgw_tmp", 1, false],
+        ["tmp_7", 32, false],
         ["bng_ingress_upstream_hasReturned", 1, false],
         ["key_0", 64, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["fabric_metadata_t._ip_eth_type0", 16, false],
-        ["fabric_metadata_t._vlan_id1", 12, false],
-        ["fabric_metadata_t._vlan_pri2", 3, false],
-        ["fabric_metadata_t._vlan_cfi3", 1, false],
-        ["fabric_metadata_t._push_double_vlan4", 1, false],
-        ["fabric_metadata_t._inner_vlan_id5", 12, false],
-        ["fabric_metadata_t._inner_vlan_pri6", 3, false],
-        ["fabric_metadata_t._inner_vlan_cfi7", 1, false],
-        ["fabric_metadata_t._mpls_label8", 20, false],
-        ["fabric_metadata_t._mpls_ttl9", 8, false],
-        ["fabric_metadata_t._skip_forwarding10", 1, false],
-        ["fabric_metadata_t._skip_next11", 1, false],
-        ["fabric_metadata_t._fwd_type12", 3, false],
-        ["fabric_metadata_t._next_id13", 32, false],
-        ["fabric_metadata_t._is_multicast14", 1, false],
-        ["fabric_metadata_t._is_controller_packet_out15", 1, false],
-        ["fabric_metadata_t._ip_proto16", 8, false],
-        ["fabric_metadata_t._l4_sport17", 16, false],
-        ["fabric_metadata_t._l4_dport18", 16, false],
-        ["fabric_metadata_t._ipv4_src_addr19", 32, false],
-        ["fabric_metadata_t._ipv4_dst_addr20", 32, false],
-        ["fabric_metadata_t._inner_l4_sport21", 16, false],
-        ["fabric_metadata_t._inner_l4_dport22", 16, false],
-        ["fabric_metadata_t._spgw_ipv4_len23", 16, false],
-        ["fabric_metadata_t._spgw_teid24", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_src_port25", 16, false],
-        ["fabric_metadata_t._spgw_tunnel_src_addr26", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_dst_addr27", 32, false],
-        ["fabric_metadata_t._spgw_ctr_id28", 32, false],
-        ["fabric_metadata_t._spgw_far_id29", 32, false],
-        ["fabric_metadata_t._spgw_src_iface30", 8, false],
-        ["fabric_metadata_t._spgw_skip_spgw31", 1, false],
-        ["fabric_metadata_t._spgw_notify_spgwc32", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_encap33", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_decap34", 1, false],
-        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr35", 1, false],
-        ["fabric_metadata_t._bng_type36", 2, false],
-        ["fabric_metadata_t._bng_line_id37", 32, false],
-        ["fabric_metadata_t._bng_pppoe_session_id38", 16, false],
-        ["fabric_metadata_t._bng_ds_meter_result39", 32, false],
-        ["fabric_metadata_t._bng_s_tag40", 12, false],
-        ["fabric_metadata_t._bng_c_tag41", 12, false],
-        ["fabric_metadata_t._int_meta_source42", 1, false],
-        ["fabric_metadata_t._int_meta_transit43", 1, false],
-        ["fabric_metadata_t._int_meta_sink44", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id45", 32, false],
-        ["fabric_metadata_t._int_meta_new_words46", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes47", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp48", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp49", 32, false],
-        ["_padding_0", 3, false]
+        ["userMetadata._ip_eth_type0", 16, false],
+        ["userMetadata._vlan_id1", 12, false],
+        ["userMetadata._vlan_pri2", 3, false],
+        ["userMetadata._vlan_cfi3", 1, false],
+        ["userMetadata._push_double_vlan4", 1, false],
+        ["userMetadata._inner_vlan_id5", 12, false],
+        ["userMetadata._inner_vlan_pri6", 3, false],
+        ["userMetadata._inner_vlan_cfi7", 1, false],
+        ["userMetadata._mpls_label8", 20, false],
+        ["userMetadata._mpls_ttl9", 8, false],
+        ["userMetadata._skip_forwarding10", 1, false],
+        ["userMetadata._skip_next11", 1, false],
+        ["userMetadata._fwd_type12", 3, false],
+        ["userMetadata._next_id13", 32, false],
+        ["userMetadata._is_multicast14", 1, false],
+        ["userMetadata._is_controller_packet_out15", 1, false],
+        ["userMetadata._ip_proto16", 8, false],
+        ["userMetadata._l4_sport17", 16, false],
+        ["userMetadata._l4_dport18", 16, false],
+        ["userMetadata._ipv4_src_addr19", 32, false],
+        ["userMetadata._ipv4_dst_addr20", 32, false],
+        ["userMetadata._inner_l4_sport21", 16, false],
+        ["userMetadata._inner_l4_dport22", 16, false],
+        ["userMetadata._spgw_ipv4_len23", 16, false],
+        ["userMetadata._spgw_teid24", 32, false],
+        ["userMetadata._spgw_tunnel_src_port25", 16, false],
+        ["userMetadata._spgw_tunnel_src_addr26", 32, false],
+        ["userMetadata._spgw_tunnel_dst_addr27", 32, false],
+        ["userMetadata._spgw_ctr_id28", 32, false],
+        ["userMetadata._spgw_far_id29", 32, false],
+        ["userMetadata._spgw_src_iface30", 8, false],
+        ["userMetadata._spgw_skip_spgw31", 1, false],
+        ["userMetadata._spgw_notify_spgwc32", 1, false],
+        ["userMetadata._spgw_needs_gtpu_encap33", 1, false],
+        ["userMetadata._spgw_needs_gtpu_decap34", 1, false],
+        ["userMetadata._spgw_skip_egress_pdr_ctr35", 1, false],
+        ["userMetadata._bng_type36", 2, false],
+        ["userMetadata._bng_line_id37", 32, false],
+        ["userMetadata._bng_pppoe_session_id38", 16, false],
+        ["userMetadata._bng_ds_meter_result39", 32, false],
+        ["userMetadata._bng_s_tag40", 12, false],
+        ["userMetadata._bng_c_tag41", 12, false],
+        ["userMetadata._int_meta_source42", 1, false],
+        ["userMetadata._int_meta_transit43", 1, false],
+        ["userMetadata._int_meta_sink44", 1, false],
+        ["userMetadata._int_meta_switch_id45", 32, false],
+        ["userMetadata._int_meta_new_words46", 8, false],
+        ["userMetadata._int_meta_new_bytes47", 16, false],
+        ["userMetadata._int_meta_ig_tstamp48", 32, false],
+        ["userMetadata._int_meta_eg_tstamp49", 32, false],
+        ["_padding_0", 5, false]
+      ]
+    },
+    {
+      "name" : "packet_out_header_t",
+      "id" : 1,
+      "fields" : [
+        ["egress_port", 9, false],
+        ["do_forwarding", 1, false],
+        ["_pad", 6, false]
       ]
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "fields" : [
         ["ingress_port", 9, false],
         ["egress_spec", 9, false],
         ["egress_port", 9, false],
-        ["clone_spec", 32, false],
         ["instance_type", 32, false],
-        ["drop", 1, false],
-        ["recirculate_port", 16, false],
         ["packet_length", 32, false],
         ["enq_timestamp", 32, false],
         ["enq_qdepth", 19, false],
@@ -88,20 +93,17 @@
         ["deq_qdepth", 19, false],
         ["ingress_global_timestamp", 48, false],
         ["egress_global_timestamp", 48, false],
-        ["lf_field_list", 32, false],
         ["mcast_grp", 16, false],
-        ["resubmit_flag", 32, false],
         ["egress_rid", 16, false],
-        ["recirculate_flag", 32, false],
         ["checksum_error", 1, false],
         ["parser_error", 32, false],
         ["priority", 3, false],
-        ["_padding", 2, false]
+        ["_padding", 3, false]
       ]
     },
     {
       "name" : "ethernet_t",
-      "id" : 2,
+      "id" : 3,
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false]
@@ -109,7 +111,7 @@
     },
     {
       "name" : "vlan_tag_t",
-      "id" : 3,
+      "id" : 4,
       "fields" : [
         ["eth_type", 16, false],
         ["pri", 3, false],
@@ -119,14 +121,14 @@
     },
     {
       "name" : "eth_type_t",
-      "id" : 4,
+      "id" : 5,
       "fields" : [
         ["value", 16, false]
       ]
     },
     {
       "name" : "pppoe_t",
-      "id" : 5,
+      "id" : 6,
       "fields" : [
         ["version", 4, false],
         ["type_id", 4, false],
@@ -138,7 +140,7 @@
     },
     {
       "name" : "mpls_t",
-      "id" : 6,
+      "id" : 7,
       "fields" : [
         ["label", 20, false],
         ["tc", 3, false],
@@ -148,7 +150,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 7,
+      "id" : 8,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -167,7 +169,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -177,7 +179,7 @@
     },
     {
       "name" : "gtpu_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["version", 3, false],
         ["pt", 1, false],
@@ -192,7 +194,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 10,
+      "id" : 11,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -209,7 +211,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 11,
+      "id" : 12,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -221,7 +223,7 @@
     },
     {
       "name" : "ipv6_t",
-      "id" : 12,
+      "id" : 13,
       "fields" : [
         ["version", 4, false],
         ["traffic_class", 8, false],
@@ -234,14 +236,6 @@
       ]
     },
     {
-      "name" : "packet_out_header_t",
-      "id" : 13,
-      "fields" : [
-        ["egress_port", 9, false],
-        ["_pad", 7, false]
-      ]
-    },
-    {
       "name" : "packet_in_header_t",
       "id" : 14,
       "fields" : [
@@ -373,281 +367,288 @@
   ],
   "headers" : [
     {
-      "name" : "scalars",
+      "name" : "tmp",
       "id" : 0,
+      "header_type" : "packet_out_header_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "scalars",
+      "id" : 1,
       "header_type" : "scalars_0",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "header_type" : "standard_metadata",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "ethernet",
-      "id" : 2,
+      "id" : 3,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "vlan_tag",
-      "id" : 3,
-      "header_type" : "vlan_tag_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "inner_vlan_tag",
       "id" : 4,
       "header_type" : "vlan_tag_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "eth_type",
+      "name" : "inner_vlan_tag",
       "id" : 5,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "eth_type",
+      "id" : 6,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "pppoe",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "pppoe_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "mpls",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "outer_gtpu",
-      "id" : 10,
-      "header_type" : "gtpu_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "gtpu",
       "id" : 11,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "inner_ipv4",
+      "name" : "gtpu",
       "id" : 12,
+      "header_type" : "gtpu_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "inner_ipv4",
+      "id" : 13,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 13,
+      "id" : 14,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_tcp",
-      "id" : 14,
+      "id" : 15,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_icmp",
-      "id" : 15,
+      "id" : 16,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 16,
+      "id" : 17,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv6",
-      "id" : 17,
+      "id" : 18,
       "header_type" : "ipv6_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 18,
+      "id" : 19,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 19,
+      "id" : 20,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 20,
+      "id" : 21,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 21,
+      "id" : 22,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 22,
+      "id" : 23,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ethernet",
-      "id" : 23,
+      "id" : 24,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_eth_type",
-      "id" : 24,
+      "id" : 25,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ipv4",
-      "id" : 25,
+      "id" : 26,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_udp",
-      "id" : 26,
+      "id" : 27,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_fixed_header",
-      "id" : 27,
+      "id" : 28,
       "header_type" : "report_fixed_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_shim",
-      "id" : 28,
+      "id" : 29,
       "header_type" : "intl4_shim_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_header",
-      "id" : 29,
+      "id" : 30,
       "header_type" : "int_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_switch_id",
-      "id" : 30,
+      "id" : 31,
       "header_type" : "int_switch_id_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_port_ids",
-      "id" : 31,
+      "id" : 32,
       "header_type" : "int_port_ids_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_hop_latency",
-      "id" : 32,
+      "id" : 33,
       "header_type" : "int_hop_latency_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_occupancy",
-      "id" : 33,
+      "id" : 34,
       "header_type" : "int_q_occupancy_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_ingress_tstamp",
-      "id" : 34,
+      "id" : 35,
       "header_type" : "int_ingress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tstamp",
-      "id" : 35,
+      "id" : 36,
       "header_type" : "int_egress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_congestion",
-      "id" : 36,
+      "id" : 37,
       "header_type" : "int_q_congestion_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tx_util",
-      "id" : 37,
+      "id" : 38,
       "header_type" : "int_egress_port_tx_util_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_data",
-      "id" : 38,
+      "id" : 39,
       "header_type" : "int_data_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_tail",
-      "id" : 39,
+      "id" : 40,
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
@@ -730,10 +731,11 @@
               "type" : "hexstr",
               "value" : "0x00ff",
               "mask" : null,
-              "next_state" : "parse_packet_out"
+              "next_state" : "check_packet_out"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -746,12 +748,229 @@
           ]
         },
         {
-          "name" : "parse_packet_out",
+          "name" : "check_packet_out",
           "id" : 1,
           "parser_ops" : [
             {
               "parameters" : [
                 {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_6"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 16]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "parameters" : [
+                    {
+                      "type" : "header",
+                      "value" : "tmp"
+                    }
+                  ],
+                  "op" : "add_header"
+                }
+              ],
+              "op" : "primitive"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "egress_port"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x7"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01ff"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "do_forwarding"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "_pad"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "tmp_6"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x3f"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x00",
+              "mask" : null,
+              "next_state" : "parse_packet_out_and_accept"
+            },
+            {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : "strip_packet_out"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_0"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_packet_out_and_accept",
+          "id" : 2,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
                   "type" : "regular",
                   "value" : "packet_out"
                 }
@@ -761,7 +980,32 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "strip_packet_out",
+          "id" : 3,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "hexstr",
+                  "value" : "0x00000010"
+                }
+              ],
+              "op" : "advance"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -770,7 +1014,7 @@
         },
         {
           "name" : "parse_ethernet",
-          "id" : 2,
+          "id" : 4,
           "parser_ops" : [
             {
               "parameters" : [
@@ -785,7 +1029,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+                  "value" : ["scalars", "userMetadata._vlan_id1"]
                 },
                 {
                   "type" : "hexstr",
@@ -798,7 +1042,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -828,7 +1072,8 @@
               "next_state" : "parse_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -836,13 +1081,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
         {
           "name" : "parse_vlan_tag",
-          "id" : 3,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -857,7 +1102,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag40"]
+                  "value" : ["scalars", "userMetadata._bng_s_tag40"]
                 },
                 {
                   "type" : "field",
@@ -870,7 +1115,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -888,7 +1133,8 @@
               "next_state" : "parse_inner_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -896,13 +1142,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
         {
           "name" : "parse_inner_vlan_tag",
-          "id" : 4,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -917,7 +1163,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag41"]
+                  "value" : ["scalars", "userMetadata._bng_c_tag41"]
                 },
                 {
                   "type" : "field",
@@ -929,7 +1175,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -938,7 +1185,7 @@
         },
         {
           "name" : "parse_eth_type",
-          "id" : 5,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -982,7 +1229,8 @@
               "next_state" : "parse_pppoe"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -996,7 +1244,7 @@
         },
         {
           "name" : "parse_pppoe",
-          "id" : 6,
+          "id" : 8,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1028,7 +1276,8 @@
               "next_state" : "parse_ipv6"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1042,7 +1291,7 @@
         },
         {
           "name" : "parse_mpls",
-          "id" : 7,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1057,7 +1306,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+                  "value" : ["scalars", "userMetadata._mpls_label8"]
                 },
                 {
                   "type" : "field",
@@ -1070,7 +1319,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
+                  "value" : ["scalars", "userMetadata._mpls_ttl9"]
                 },
                 {
                   "type" : "field",
@@ -1083,7 +1332,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_5"]
                 },
                 {
                   "type" : "lookahead",
@@ -1107,7 +1356,8 @@
               "next_state" : "parse_ipv6"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -1115,13 +1365,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_5"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 8,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1136,7 +1386,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+                  "value" : ["scalars", "userMetadata._ip_proto16"]
                 },
                 {
                   "type" : "field",
@@ -1149,7 +1399,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+                  "value" : ["scalars", "userMetadata._ip_eth_type0"]
                 },
                 {
                   "type" : "hexstr",
@@ -1162,7 +1412,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+                  "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
                 },
                 {
                   "type" : "field",
@@ -1175,7 +1425,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+                  "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
                 },
                 {
                   "type" : "field",
@@ -1218,7 +1468,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1232,7 +1483,7 @@
         },
         {
           "name" : "parse_ipv6",
-          "id" : 9,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1247,7 +1498,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+                  "value" : ["scalars", "userMetadata._ip_proto16"]
                 },
                 {
                   "type" : "field",
@@ -1260,7 +1511,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+                  "value" : ["scalars", "userMetadata._ip_eth_type0"]
                 },
                 {
                   "type" : "hexstr",
@@ -1290,7 +1541,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1304,7 +1556,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 10,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1319,7 +1571,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+                  "value" : ["scalars", "userMetadata._l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -1332,7 +1584,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+                  "value" : ["scalars", "userMetadata._l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -1344,7 +1596,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int"
             }
@@ -1353,7 +1606,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 11,
+          "id" : 13,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1368,7 +1621,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+                  "value" : ["scalars", "userMetadata._l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -1381,7 +1634,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+                  "value" : ["scalars", "userMetadata._l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -1399,7 +1652,8 @@
               "next_state" : "parse_gtpu"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int"
             }
@@ -1413,7 +1667,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 12,
+          "id" : 14,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1427,7 +1681,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1436,7 +1691,7 @@
         },
         {
           "name" : "parse_gtpu",
-          "id" : 13,
+          "id" : 15,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1490,7 +1745,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1504,7 +1760,7 @@
         },
         {
           "name" : "parse_inner_udp",
-          "id" : 14,
+          "id" : 16,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1519,7 +1775,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+                  "value" : ["scalars", "userMetadata._inner_l4_sport21"]
                 },
                 {
                   "type" : "field",
@@ -1532,7 +1788,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+                  "value" : ["scalars", "userMetadata._inner_l4_dport22"]
                 },
                 {
                   "type" : "field",
@@ -1544,7 +1800,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int"
             }
@@ -1553,7 +1810,7 @@
         },
         {
           "name" : "parse_int",
-          "id" : 15,
+          "id" : 17,
           "parser_ops" : [],
           "transitions" : [
             {
@@ -1563,7 +1820,8 @@
               "next_state" : "parse_intl4_shim"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1577,7 +1835,7 @@
         },
         {
           "name" : "parse_intl4_shim",
-          "id" : 16,
+          "id" : 18,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1606,7 +1864,8 @@
               "next_state" : "parse_intl4_tail"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int_data"
             }
@@ -1620,13 +1879,13 @@
         },
         {
           "name" : "parse_int_data",
-          "id" : 17,
+          "id" : 19,
           "parser_ops" : [
             {
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "expression",
@@ -1698,7 +1957,7 @@
                   "type" : "expression",
                   "value" : {
                     "type" : "field",
-                    "value" : ["scalars", "tmp"]
+                    "value" : ["scalars", "tmp_2"]
                   }
                 }
               ],
@@ -1707,7 +1966,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_intl4_tail"
             }
@@ -1716,7 +1976,7 @@
         },
         {
           "name" : "parse_intl4_tail",
-          "id" : 18,
+          "id" : 20,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1730,7 +1990,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1747,11 +2008,12 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 268,
+        "line" : 283,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "report_ethernet", "report_eth_type", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
+      "order" : ["packet_in", "report_ethernet", "report_eth_type", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"],
+      "primitives" : []
     }
   ],
   "meter_arrays" : [
@@ -2018,7 +2280,7 @@
       "id" : 19,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 109,
+        "line" : 108,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2066,7 +2328,7 @@
       "id" : 23,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 296,
+        "line" : 295,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2142,7 +2404,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 359,
+        "line" : 358,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -2362,7 +2624,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source42"]
+              "value" : ["scalars", "userMetadata._int_meta_source42"]
             },
             {
               "type" : "expression",
@@ -2398,7 +2660,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
+              "value" : ["scalars", "userMetadata._int_meta_sink44"]
             },
             {
               "type" : "expression",
@@ -2476,7 +2738,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2498,7 +2760,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2507,7 +2769,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 161,
+            "line" : 162,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2539,7 +2801,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2548,7 +2810,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 161,
+            "line" : 162,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2589,7 +2851,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2618,7 +2880,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2649,7 +2911,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 121,
             "column" : 31,
             "source_fragment" : "0x86dd; ..."
           }
@@ -2678,7 +2940,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2705,7 +2967,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2714,7 +2976,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 164,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2724,7 +2986,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
+              "value" : ["scalars", "userMetadata._bng_pppoe_session_id38"]
             },
             {
               "type" : "runtime_data",
@@ -2747,7 +3009,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2769,7 +3031,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2778,7 +3040,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 164,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2792,7 +3054,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2858,7 +3120,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             },
             {
               "type" : "runtime_data",
@@ -2884,7 +3146,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -2913,7 +3175,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -2960,7 +3222,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -2991,7 +3253,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+              "value" : ["scalars", "userMetadata._fwd_type12"]
             },
             {
               "type" : "runtime_data",
@@ -3022,7 +3284,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3053,7 +3315,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label8"]
             },
             {
               "type" : "hexstr",
@@ -3072,7 +3334,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3103,7 +3365,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3140,7 +3402,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3171,7 +3433,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3216,7 +3478,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -3298,7 +3560,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -3345,7 +3607,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -3380,7 +3642,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -3399,7 +3661,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._push_double_vlan4"]
+              "value" : ["scalars", "userMetadata._push_double_vlan4"]
             },
             {
               "type" : "expression",
@@ -3428,7 +3690,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
             },
             {
               "type" : "runtime_data",
@@ -3447,7 +3709,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_s_tag40"]
+              "value" : ["scalars", "userMetadata._bng_s_tag40"]
             },
             {
               "type" : "runtime_data",
@@ -3466,7 +3728,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_c_tag41"]
+              "value" : ["scalars", "userMetadata._bng_c_tag41"]
             },
             {
               "type" : "runtime_data",
@@ -3528,7 +3790,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3679,7 +3941,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label8"]
             },
             {
               "type" : "runtime_data",
@@ -3887,7 +4149,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label8"]
             },
             {
               "type" : "runtime_data",
@@ -3994,7 +4256,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_multicast14"]
+              "value" : ["scalars", "userMetadata._is_multicast14"]
             },
             {
               "type" : "expression",
@@ -4030,7 +4292,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -4039,7 +4301,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4049,7 +4311,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "userMetadata._ip_proto16"]
             },
             {
               "type" : "field",
@@ -4068,7 +4330,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "field",
@@ -4087,7 +4349,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "field",
@@ -4106,11 +4368,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport21"]
             }
           ],
           "source_info" : {
@@ -4125,11 +4387,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport22"]
             }
           ],
           "source_info" : {
@@ -4249,7 +4511,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -4258,7 +4520,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4268,7 +4530,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "userMetadata._ip_proto16"]
             },
             {
               "type" : "field",
@@ -4287,7 +4549,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "field",
@@ -4306,7 +4568,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "field",
@@ -4325,11 +4587,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport21"]
             }
           ],
           "source_info" : {
@@ -4344,11 +4606,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport22"]
             }
           ],
           "source_info" : {
@@ -4453,7 +4715,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -4462,7 +4724,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4472,7 +4734,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "userMetadata._ip_proto16"]
             },
             {
               "type" : "field",
@@ -4491,7 +4753,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "field",
@@ -4510,7 +4772,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "field",
@@ -4529,11 +4791,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport21"]
             }
           ],
           "source_info" : {
@@ -4548,11 +4810,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport22"]
             }
           ],
           "source_info" : {
@@ -4672,7 +4934,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -4681,7 +4943,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4691,7 +4953,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "userMetadata._ip_proto16"]
             },
             {
               "type" : "field",
@@ -4710,7 +4972,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "field",
@@ -4729,7 +4991,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "field",
@@ -4748,11 +5010,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport21"]
             }
           ],
           "source_info" : {
@@ -4767,11 +5029,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport22"]
             }
           ],
           "source_info" : {
@@ -4857,7 +5119,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -4866,7 +5128,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4876,7 +5138,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "userMetadata._ip_proto16"]
             },
             {
               "type" : "field",
@@ -4895,7 +5157,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "field",
@@ -4914,7 +5176,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "field",
@@ -4933,11 +5195,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport21"]
             }
           ],
           "source_info" : {
@@ -4952,11 +5214,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport22"]
             }
           ],
           "source_info" : {
@@ -5076,7 +5338,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -5085,7 +5347,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -5095,7 +5357,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "userMetadata._ip_proto16"]
             },
             {
               "type" : "field",
@@ -5114,7 +5376,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "field",
@@ -5133,7 +5395,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "field",
@@ -5152,11 +5414,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport21"]
             }
           ],
           "source_info" : {
@@ -5171,11 +5433,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport22"]
             }
           ],
           "source_info" : {
@@ -5280,7 +5542,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -5289,7 +5551,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -5299,7 +5561,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "userMetadata._ip_proto16"]
             },
             {
               "type" : "field",
@@ -5318,7 +5580,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "field",
@@ -5337,7 +5599,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "field",
@@ -5356,11 +5618,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport21"]
             }
           ],
           "source_info" : {
@@ -5375,11 +5637,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport22"]
             }
           ],
           "source_info" : {
@@ -5499,7 +5761,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -5508,7 +5770,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -5518,7 +5780,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "userMetadata._ip_proto16"]
             },
             {
               "type" : "field",
@@ -5537,7 +5799,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "field",
@@ -5556,7 +5818,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "field",
@@ -5575,11 +5837,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport21"]
             }
           ],
           "source_info" : {
@@ -5594,11 +5856,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport22"]
             }
           ],
           "source_info" : {
@@ -5689,7 +5951,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
+              "value" : ["scalars", "userMetadata._spgw_src_iface30"]
             },
             {
               "type" : "runtime_data",
@@ -5698,7 +5960,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 121,
+            "line" : 120,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -5708,7 +5970,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
+              "value" : ["scalars", "userMetadata._spgw_skip_spgw31"]
             },
             {
               "type" : "expression",
@@ -5727,7 +5989,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 122,
+            "line" : 121,
             "column" : 33,
             "source_fragment" : "= false; ..."
           }
@@ -5744,7 +6006,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
+              "value" : ["scalars", "userMetadata._spgw_src_iface30"]
             },
             {
               "type" : "hexstr",
@@ -5753,7 +6015,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 109,
+            "line" : 110,
             "column" : 44,
             "source_fragment" : "8w0; ..."
           }
@@ -5763,7 +6025,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
+              "value" : ["scalars", "userMetadata._spgw_skip_spgw31"]
             },
             {
               "type" : "expression",
@@ -5782,7 +6044,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 126,
+            "line" : 125,
             "column" : 33,
             "source_fragment" : "= true; ..."
           }
@@ -5812,7 +6074,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
             },
             {
               "type" : "runtime_data",
@@ -5821,7 +6083,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -5831,7 +6093,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id29"]
+              "value" : ["scalars", "userMetadata._spgw_far_id29"]
             },
             {
               "type" : "runtime_data",
@@ -5840,7 +6102,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -5850,7 +6112,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
             },
             {
               "type" : "expression",
@@ -5879,7 +6141,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -5909,7 +6171,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
             },
             {
               "type" : "runtime_data",
@@ -5918,7 +6180,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -5928,7 +6190,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id29"]
+              "value" : ["scalars", "userMetadata._spgw_far_id29"]
             },
             {
               "type" : "runtime_data",
@@ -5937,7 +6199,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -5947,7 +6209,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
             },
             {
               "type" : "expression",
@@ -5976,7 +6238,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -6010,7 +6272,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
             },
             {
               "type" : "runtime_data",
@@ -6019,7 +6281,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -6029,7 +6291,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id29"]
+              "value" : ["scalars", "userMetadata._spgw_far_id29"]
             },
             {
               "type" : "runtime_data",
@@ -6038,7 +6300,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -6048,7 +6310,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
             },
             {
               "type" : "expression",
@@ -6077,7 +6339,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -6111,7 +6373,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
             },
             {
               "type" : "runtime_data",
@@ -6120,7 +6382,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -6130,7 +6392,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id29"]
+              "value" : ["scalars", "userMetadata._spgw_far_id29"]
             },
             {
               "type" : "runtime_data",
@@ -6139,7 +6401,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -6149,7 +6411,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
             },
             {
               "type" : "expression",
@@ -6178,7 +6440,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -6204,7 +6466,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding10"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 195,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -6234,45 +6535,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 196,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 197,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -6282,7 +6544,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc32"]
             },
             {
               "type" : "expression",
@@ -6311,7 +6573,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 198,
+            "line" : 197,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -6353,7 +6615,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding10"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 206,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -6383,45 +6684,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 207,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 208,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -6431,7 +6693,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc32"]
             },
             {
               "type" : "expression",
@@ -6460,7 +6722,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 209,
+            "line" : 208,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -6470,7 +6732,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap33"]
             },
             {
               "type" : "expression",
@@ -6489,7 +6751,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 211,
+            "line" : 210,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -6499,7 +6761,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
+              "value" : ["scalars", "userMetadata._spgw_teid24"]
             },
             {
               "type" : "runtime_data",
@@ -6508,7 +6770,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 211,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -6518,7 +6780,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port25"]
             },
             {
               "type" : "runtime_data",
@@ -6527,7 +6789,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 212,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -6537,7 +6799,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr26"]
             },
             {
               "type" : "runtime_data",
@@ -6546,27 +6808,27 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
+            "line" : 213,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr27"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
             "line" : 214,
             "column" : 39,
-            "source_fragment" : "= tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 4
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 215,
-            "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
@@ -6575,7 +6837,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "runtime_data",
@@ -6584,7 +6846,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 217,
+            "line" : 216,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -6594,7 +6856,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -6603,7 +6865,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 217,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -6613,7 +6875,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "runtime_data",
@@ -6622,7 +6884,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 218,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -6632,7 +6894,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "hexstr",
@@ -6641,7 +6903,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 220,
+            "line" : 219,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -6683,7 +6945,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding10"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 206,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next11"]
             },
             {
               "type" : "expression",
@@ -6713,45 +7014,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 207,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 208,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -6761,7 +7023,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc32"]
             },
             {
               "type" : "expression",
@@ -6790,7 +7052,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 209,
+            "line" : 208,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -6800,7 +7062,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap33"]
             },
             {
               "type" : "expression",
@@ -6819,7 +7081,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 211,
+            "line" : 210,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -6829,7 +7091,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
+              "value" : ["scalars", "userMetadata._spgw_teid24"]
             },
             {
               "type" : "runtime_data",
@@ -6838,7 +7100,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 211,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -6848,7 +7110,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port25"]
             },
             {
               "type" : "runtime_data",
@@ -6857,7 +7119,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 212,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -6867,7 +7129,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr26"]
             },
             {
               "type" : "runtime_data",
@@ -6876,27 +7138,27 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
+            "line" : 213,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr27"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
             "line" : 214,
             "column" : 39,
-            "source_fragment" : "= tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 4
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 215,
-            "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
@@ -6905,7 +7167,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
             },
             {
               "type" : "runtime_data",
@@ -6914,7 +7176,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 217,
+            "line" : 216,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -6924,7 +7186,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -6933,7 +7195,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 217,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -6943,7 +7205,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport17"]
             },
             {
               "type" : "runtime_data",
@@ -6952,7 +7214,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 218,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -6962,7 +7224,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             },
             {
               "type" : "hexstr",
@@ -6971,7 +7233,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 220,
+            "line" : 219,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -6981,7 +7243,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr35"]
+              "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr35"]
             },
             {
               "type" : "expression",
@@ -7000,7 +7262,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 231,
+            "line" : 230,
             "column" : 43,
             "source_fragment" : "= true; ..."
           }
@@ -7008,7 +7270,7 @@
       ]
     },
     {
-      "name" : "act",
+      "name" : "packetio25",
       "id" : 71,
       "runtime_data" : [],
       "primitives" : [
@@ -7051,7 +7313,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out15"]
+              "value" : ["scalars", "userMetadata._is_controller_packet_out15"]
             },
             {
               "type" : "expression",
@@ -7088,71 +7350,11 @@
       ]
     },
     {
-      "name" : "act_0",
+      "name" : "spgw265",
       "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_1",
-      "id" : 73,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_2",
-      "id" : 74,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "count",
           "parameters" : [
             {
@@ -7161,12 +7363,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
+            "line" : 265,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -7174,8 +7376,8 @@
       ]
     },
     {
-      "name" : "act_3",
-      "id" : 75,
+      "name" : "spgw282",
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7183,7 +7385,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len23"]
             },
             {
               "type" : "field",
@@ -7192,7 +7394,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 282,
             "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
@@ -7200,8 +7402,8 @@
       ]
     },
     {
-      "name" : "act_4",
-      "id" : 76,
+      "name" : "filtering111",
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7209,7 +7411,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "field",
@@ -7228,7 +7430,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             },
             {
               "type" : "field",
@@ -7247,7 +7449,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             },
             {
               "type" : "field",
@@ -7264,8 +7466,8 @@
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 77,
+      "name" : "filtering117",
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7273,7 +7475,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
             },
             {
               "type" : "field",
@@ -7292,7 +7494,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_pri6"]
+              "value" : ["scalars", "userMetadata._inner_vlan_pri6"]
             },
             {
               "type" : "field",
@@ -7311,7 +7513,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_cfi7"]
+              "value" : ["scalars", "userMetadata._inner_vlan_cfi7"]
             },
             {
               "type" : "field",
@@ -7328,8 +7530,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 78,
+      "name" : "filtering127",
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7337,7 +7539,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
+              "value" : ["scalars", "userMetadata._mpls_ttl9"]
             },
             {
               "type" : "hexstr",
@@ -7354,8 +7556,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 79,
+      "name" : "port_counter31",
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7363,7 +7565,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             },
             {
               "type" : "expression",
@@ -7399,7 +7601,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             }
           ],
           "source_info" : {
@@ -7412,8 +7614,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 80,
+      "name" : "port_counter34",
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7421,7 +7623,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_4"]
+              "value" : ["scalars", "tmp_7"]
             },
             {
               "type" : "expression",
@@ -7457,7 +7659,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_4"]
+              "value" : ["scalars", "tmp_7"]
             }
           ],
           "source_info" : {
@@ -7470,8 +7672,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 81,
+      "name" : "int_main89",
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7496,117 +7698,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 82,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "bng_ingress_upstream_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_11",
-      "id" : 83,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "bng_ingress_upstream_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_12",
-      "id" : 84,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../header.p4",
-            "line" : 162,
-            "column" : 37,
-            "source_fragment" : "2w0x1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_13",
-      "id" : 85,
+      "name" : "bng126",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7641,8 +7734,57 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 86,
+      "name" : "bng342",
+      "id" : 81,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._bng_type36"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 163,
+            "column" : 37,
+            "source_fragment" : "2w0x1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "bng131",
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7654,7 +7796,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -7667,8 +7809,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 87,
+      "name" : "bng139",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7680,7 +7822,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -7693,8 +7835,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 88,
+      "name" : "bng112",
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7746,74 +7888,14 @@
             "filename" : "include/bng.p4",
             "line" : 112,
             "column" : 12,
-            "source_fragment" : "hdr.ipv6.src_addr[127:64]"
+            "source_fragment" : "            hdr.ipv6.src_addr[127:64] : exact @name(\\\"ipv6_src_net_id\\\");"
           }
         }
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 89,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "bng_ingress_downstream_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_18",
-      "id" : 90,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "bng_ingress_downstream_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 91,
+      "name" : "bng238",
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7825,11 +7907,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -7842,8 +7924,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 92,
+      "name" : "bng241",
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7855,11 +7937,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -7872,8 +7954,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 93,
+      "name" : "bng250",
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7885,11 +7967,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -7902,8 +7984,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 94,
+      "name" : "bng253",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7915,11 +7997,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -7933,37 +8015,37 @@
     },
     {
       "name" : "nop",
-      "id" : 95,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 96,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 97,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 98,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 99,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v4",
-      "id" : 100,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7980,7 +8062,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 123,
+            "line" : 124,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -8066,7 +8148,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
+              "value" : ["scalars", "userMetadata._bng_pppoe_session_id38"]
             }
           ],
           "source_info" : {
@@ -8085,7 +8167,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -8151,7 +8233,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -8160,7 +8242,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v6",
-      "id" : 101,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8177,7 +8259,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 123,
+            "line" : 124,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -8263,7 +8345,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
+              "value" : ["scalars", "userMetadata._bng_pppoe_session_id38"]
             }
           ],
           "source_info" : {
@@ -8282,7 +8364,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -8348,7 +8430,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 127,
             "column" : 35,
             "source_fragment" : "0x0057; ..."
           }
@@ -8357,7 +8439,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 102,
+      "id" : 96,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -8425,7 +8507,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 157,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -8716,7 +8798,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport18"]
             }
           ],
           "source_info" : {
@@ -8843,7 +8925,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 152,
+            "line" : 153,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -8852,7 +8934,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 103,
+      "id" : 97,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -8865,7 +8947,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit43"]
+              "value" : ["scalars", "userMetadata._int_meta_transit43"]
             },
             {
               "type" : "expression",
@@ -8894,7 +8976,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
             },
             {
               "type" : "runtime_data",
@@ -8912,13 +8994,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 104,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 105,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8992,7 +9074,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9006,7 +9088,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9034,7 +9116,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9048,7 +9130,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9075,7 +9157,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 106,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9117,7 +9199,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9131,7 +9213,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9159,7 +9241,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9173,7 +9255,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9200,6 +9282,1202 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
+      "id" : 101,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
+      "id" : 102,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
+      "id" : 103,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
+      "id" : 104,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
+      "id" : 105,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
+      "id" : 106,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
       "id" : 107,
       "runtime_data" : [],
       "primitives" : [
@@ -9274,6 +10552,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
+      "id" : 108,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -9304,11 +10707,45 @@
           }
         },
         {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9322,7 +10759,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9350,7 +10787,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9364,7 +10801,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9390,177 +10827,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 108,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
       "id" : 109,
       "runtime_data" : [],
       "primitives" : [
@@ -9635,176 +10902,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 110,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -9839,6 +10936,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
+      "id" : 110,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_port_ids"
             }
           ],
@@ -9914,11 +11136,45 @@
           }
         },
         {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9932,7 +11188,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9960,7 +11216,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9974,7 +11230,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10000,7 +11256,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
       "id" : 111,
       "runtime_data" : [],
       "primitives" : [
@@ -10075,6 +11331,210 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
+      "id" : 112,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -10184,11 +11644,45 @@
           }
         },
         {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10202,7 +11696,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10230,7 +11724,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10244,7 +11738,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10270,132 +11764,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 112,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
       "id" : 113,
       "runtime_data" : [],
       "primitives" : [
@@ -10470,989 +11839,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 114,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 115,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 116,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 117,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 118,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -11585,7 +11971,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -11600,7 +11986,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11614,311 +12000,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 119,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11946,7 +12028,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11960,7 +12042,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11987,13 +12069,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 120,
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 121,
+      "id" : 115,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12035,7 +12117,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12049,7 +12131,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12077,7 +12159,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12091,7 +12173,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12118,7 +12200,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 122,
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12179,7 +12261,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12193,7 +12275,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12221,7 +12303,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12235,7 +12317,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12262,6 +12344,1075 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
+      "id" : 117,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
+      "id" : 118,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
+      "id" : 119,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
+      "id" : 120,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
+      "id" : 121,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
+      "id" : 122,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
       "id" : 123,
       "runtime_data" : [],
       "primitives" : [
@@ -12304,6 +13455,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
+      "id" : 124,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -12353,11 +13629,45 @@
           }
         },
         {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12371,7 +13681,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12399,7 +13709,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12413,7 +13723,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12439,155 +13749,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 124,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
       "id" : 125,
       "runtime_data" : [],
       "primitives" : [
@@ -12630,154 +13792,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 126,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -12831,6 +13845,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
+      "id" : 126,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_egress_tstamp"
             }
           ],
@@ -12884,11 +14023,45 @@
           }
         },
         {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12902,7 +14075,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12930,7 +14103,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12944,7 +14117,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12970,7 +14143,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
       "id" : 127,
       "runtime_data" : [],
       "primitives" : [
@@ -13013,6 +14186,188 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
+      "id" : 128,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -13119,97 +14474,6 @@
           }
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 128,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -13248,7 +14512,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -13262,11 +14526,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x01"
+                        "value" : "0x03"
                       }
                     }
                   },
@@ -13280,9 +14544,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 97,
+            "line" : 109,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -13290,7 +14554,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -13304,11 +14568,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0004"
+                        "value" : "0x000c"
                       }
                     }
                   },
@@ -13322,15 +14586,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 110,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
       "id" : 129,
       "runtime_data" : [],
       "primitives" : [
@@ -13373,919 +14637,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 130,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 131,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 132,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 133,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 134,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -14430,7 +14781,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -14444,276 +14795,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 135,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -14741,7 +14823,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -14755,7 +14837,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -14782,7 +14864,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 136,
+      "id" : 130,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -14888,7 +14970,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -15116,7 +15198,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 131,
+            "line" : 132,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -15302,7 +15384,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 162,
+            "line" : 163,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -15397,7 +15479,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 166,
+            "line" : 167,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -15444,7 +15526,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 137,
+      "id" : 131,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15489,7 +15571,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 138,
+      "id" : 132,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15820,7 +15902,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 139,
+      "id" : 133,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15847,7 +15929,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             }
           ],
           "source_info" : {
@@ -15861,7 +15943,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 140,
+      "id" : 134,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15888,7 +15970,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label8"]
             }
           ],
           "source_info" : {
@@ -15945,7 +16027,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
+              "value" : ["scalars", "userMetadata._mpls_ttl9"]
             }
           ],
           "source_info" : {
@@ -15969,7 +16051,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -15978,7 +16060,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_outer_vlan",
-      "id" : 141,
+      "id" : 135,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16005,7 +16087,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             }
           ],
           "source_info" : {
@@ -16024,7 +16106,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             }
           ],
           "source_info" : {
@@ -16048,7 +16130,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -16062,7 +16144,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             }
           ],
           "source_info" : {
@@ -16076,7 +16158,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_inner_vlan",
-      "id" : 142,
+      "id" : 136,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16103,7 +16185,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_cfi7"]
+              "value" : ["scalars", "userMetadata._inner_vlan_cfi7"]
             }
           ],
           "source_info" : {
@@ -16122,7 +16204,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_pri6"]
+              "value" : ["scalars", "userMetadata._inner_vlan_pri6"]
             }
           ],
           "source_info" : {
@@ -16141,7 +16223,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
             }
           ],
           "source_info" : {
@@ -16165,7 +16247,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -16184,7 +16266,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -16193,7 +16275,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 143,
+      "id" : 137,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16220,7 +16302,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             }
           ],
           "source_info" : {
@@ -16239,7 +16321,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             }
           ],
           "source_info" : {
@@ -16263,7 +16345,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -16277,7 +16359,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             }
           ],
           "source_info" : {
@@ -16291,7 +16373,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 144,
+      "id" : 138,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16313,7 +16395,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.drop",
-      "id" : 145,
+      "id" : 139,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16335,7 +16417,7 @@
     },
     {
       "name" : "FabricEgress.spgw.gtpu_encap",
-      "id" : 146,
+      "id" : 140,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16348,7 +16430,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 301,
+            "line" : 300,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -16367,7 +16449,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 302,
+            "line" : 301,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -16386,7 +16468,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 134,
+            "line" : 135,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -16405,7 +16487,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 304,
+            "line" : 303,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -16424,7 +16506,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 305,
+            "line" : 304,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -16466,7 +16548,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 305,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -16485,7 +16567,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 308,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -16504,7 +16586,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 308,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -16523,7 +16605,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -16542,7 +16624,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 147,
+            "line" : 148,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -16561,7 +16643,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 131,
+            "line" : 132,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -16575,12 +16657,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr26"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -16594,12 +16676,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr27"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 313,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -16618,7 +16700,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 314,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -16633,7 +16715,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 317,
+            "line" : 316,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -16647,12 +16729,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port25"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -16671,7 +16753,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -16695,7 +16777,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
+                        "value" : ["scalars", "userMetadata._spgw_ipv4_len23"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -16713,7 +16795,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -16732,7 +16814,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -16747,7 +16829,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -16766,7 +16848,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 326,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -16785,7 +16867,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 326,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -16804,7 +16886,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 328,
+            "line" : 327,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -16823,7 +16905,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 329,
+            "line" : 328,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -16842,7 +16924,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 329,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -16861,7 +16943,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -16880,7 +16962,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -16894,12 +16976,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len23"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 332,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -16913,12 +16995,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
+              "value" : ["scalars", "userMetadata._spgw_teid24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -16926,8 +17008,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 147,
+      "name" : "packetio41",
+      "id" : 141,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16943,8 +17025,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 148,
+      "name" : "packetio44",
+      "id" : 142,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16994,8 +17076,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 149,
+      "name" : "next349",
+      "id" : 143,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17016,8 +17098,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 150,
+      "name" : "next365",
+      "id" : 144,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17038,8 +17120,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 151,
+      "name" : "next376",
+      "id" : 145,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17060,8 +17142,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 152,
+      "name" : "next375",
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17109,8 +17191,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 153,
+      "name" : "next380",
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17131,8 +17213,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 154,
+      "name" : "next379",
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17180,8 +17262,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 155,
+      "name" : "next385",
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17202,8 +17284,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 156,
+      "name" : "next384",
+      "id" : 150,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17251,8 +17333,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 157,
+      "name" : "spgw342",
+      "id" : 151,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17264,12 +17346,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 342,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -17277,8 +17359,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 158,
+      "name" : "act",
+      "id" : 152,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17307,8 +17389,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 159,
+      "name" : "int_transit420",
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17343,8 +17425,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 160,
+      "name" : "int_transit428",
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17370,7 +17452,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       }
                     }
                   },
@@ -17392,8 +17474,8 @@
       ]
     },
     {
-      "name" : "act_37",
-      "id" : 161,
+      "name" : "int_transit425",
+      "id" : 155,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17441,8 +17523,8 @@
       ]
     },
     {
-      "name" : "act_38",
-      "id" : 162,
+      "name" : "int_transit431",
+      "id" : 156,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17468,7 +17550,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
                       }
                     }
                   },
@@ -17490,8 +17572,8 @@
       ]
     },
     {
-      "name" : "act_39",
-      "id" : 163,
+      "name" : "int_transit434",
+      "id" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17517,7 +17599,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
                       }
                     }
                   },
@@ -17552,7 +17634,7 @@
       "init_table" : "node_2",
       "tables" : [
         {
-          "name" : "tbl_act",
+          "name" : "tbl_packetio25",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -17568,10 +17650,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [71],
-          "actions" : ["act"],
+          "actions" : ["packetio25"],
           "base_default_next" : "FabricIngress.spgw.interfaces",
           "next_tables" : {
-            "act" : "FabricIngress.spgw.interfaces"
+            "packetio25" : "FabricIngress.spgw.interfaces"
           },
           "default_entry" : {
             "action_id" : 71,
@@ -17585,7 +17667,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 130,
+            "line" : 129,
             "column" : 10,
             "source_fragment" : "interfaces"
           },
@@ -17613,8 +17695,8 @@
           "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_0",
-            "__MISS__" : "tbl_act_1"
+            "__HIT__" : "node_5",
+            "__MISS__" : "node_16"
           },
           "default_entry" : {
             "action_id" : 63,
@@ -17624,54 +17706,8 @@
           }
         },
         {
-          "name" : "tbl_act_0",
-          "id" : 2,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [72],
-          "actions" : ["act_0"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_0" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 72,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_1" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 73,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
-          "id" : 4,
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 75,
@@ -17706,12 +17742,12 @@
           "direct_meters" : null,
           "action_ids" : [54, 55, 56, 57],
           "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown"],
-          "base_default_next" : "node_10",
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_7"
           },
           "default_entry" : {
             "action_id" : 57,
@@ -17805,10 +17841,10 @@
         },
         {
           "name" : "FabricIngress.spgw.uplink_pdrs",
-          "id" : 5,
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 177,
+            "line" : 176,
             "column" : 10,
             "source_fragment" : "uplink_pdrs"
           },
@@ -17834,11 +17870,11 @@
           "direct_meters" : null,
           "action_ids" : [65, 67, 14],
           "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
-          "base_default_next" : "node_13",
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw.load_pdr" : "node_13",
-            "FabricIngress.spgw.load_pdr_qos" : "node_13",
-            "NoAction" : "node_13"
+            "FabricIngress.spgw.load_pdr" : "node_10",
+            "FabricIngress.spgw.load_pdr_qos" : "node_10",
+            "NoAction" : "node_10"
           },
           "default_entry" : {
             "action_id" : 14,
@@ -17849,10 +17885,10 @@
         },
         {
           "name" : "FabricIngress.spgw.downlink_pdrs",
-          "id" : 6,
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 165,
+            "line" : 164,
             "column" : 10,
             "source_fragment" : "downlink_pdrs"
           },
@@ -17872,11 +17908,11 @@
           "direct_meters" : null,
           "action_ids" : [64, 66, 13],
           "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
-          "base_default_next" : "node_13",
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw.load_pdr" : "node_13",
-            "FabricIngress.spgw.load_pdr_qos" : "node_13",
-            "NoAction" : "node_13"
+            "FabricIngress.spgw.load_pdr" : "node_10",
+            "FabricIngress.spgw.load_pdr_qos" : "node_10",
+            "NoAction" : "node_10"
           },
           "default_entry" : {
             "action_id" : 13,
@@ -17886,11 +17922,11 @@
           }
         },
         {
-          "name" : "tbl_act_2",
-          "id" : 7,
+          "name" : "tbl_spgw265",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
+            "line" : 265,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -17901,14 +17937,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_15",
+          "action_ids" : [72],
+          "actions" : ["spgw265"],
+          "base_default_next" : "node_12",
           "next_tables" : {
-            "act_2" : "node_15"
+            "spgw265" : "node_12"
           },
           "default_entry" : {
-            "action_id" : 74,
+            "action_id" : 72,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17916,7 +17952,7 @@
         },
         {
           "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
-          "id" : 8,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 75,
@@ -18050,10 +18086,10 @@
         },
         {
           "name" : "FabricIngress.spgw.fars",
-          "id" : 9,
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 234,
+            "line" : 233,
             "column" : 10,
             "source_fragment" : "fars"
           },
@@ -18061,7 +18097,7 @@
             {
               "match_type" : "exact",
               "name" : "far_id",
-              "target" : ["scalars", "fabric_metadata_t._spgw_far_id29"],
+              "target" : ["scalars", "userMetadata._spgw_far_id29"],
               "mask" : null
             }
           ],
@@ -18073,11 +18109,11 @@
           "direct_meters" : null,
           "action_ids" : [68, 69, 70],
           "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
-          "base_default_next" : "tbl_act_3",
+          "base_default_next" : "tbl_spgw282",
           "next_tables" : {
-            "FabricIngress.spgw.load_normal_far" : "tbl_act_3",
-            "FabricIngress.spgw.load_tunnel_far" : "tbl_act_3",
-            "FabricIngress.spgw.load_dbuf_far" : "tbl_act_3"
+            "FabricIngress.spgw.load_normal_far" : "tbl_spgw282",
+            "FabricIngress.spgw.load_tunnel_far" : "tbl_spgw282",
+            "FabricIngress.spgw.load_dbuf_far" : "tbl_spgw282"
           },
           "default_entry" : {
             "action_id" : 68,
@@ -18087,11 +18123,11 @@
           }
         },
         {
-          "name" : "tbl_act_3",
-          "id" : 10,
+          "name" : "tbl_spgw282",
+          "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 282,
             "column" : 36,
             "source_fragment" : "="
           },
@@ -18102,22 +18138,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["act_3"],
-          "base_default_next" : "node_19",
+          "action_ids" : [73],
+          "actions" : ["spgw282"],
+          "base_default_next" : "node_16",
           "next_tables" : {
-            "act_3" : "node_19"
+            "spgw282" : "node_16"
           },
           "default_entry" : {
-            "action_id" : 75,
+            "action_id" : 73,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_4",
-          "id" : 11,
+          "name" : "tbl_filtering111",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 111,
@@ -18131,22 +18167,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["act_4"],
-          "base_default_next" : "node_21",
+          "action_ids" : [74],
+          "actions" : ["filtering111"],
+          "base_default_next" : "node_18",
           "next_tables" : {
-            "act_4" : "node_21"
+            "filtering111" : "node_18"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 74,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
-          "id" : 12,
+          "name" : "tbl_filtering117",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 117,
@@ -18160,22 +18196,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_23",
+          "action_ids" : [75],
+          "actions" : ["filtering117"],
+          "base_default_next" : "node_20",
           "next_tables" : {
-            "act_5" : "node_23"
+            "filtering117" : "node_20"
           },
           "default_entry" : {
-            "action_id" : 77,
+            "action_id" : 75,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
-          "id" : 13,
+          "name" : "tbl_filtering127",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 127,
@@ -18189,14 +18225,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [78],
-          "actions" : ["act_6"],
+          "action_ids" : [76],
+          "actions" : ["filtering127"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+            "filtering127" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 78,
+            "action_id" : 76,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18204,7 +18240,7 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 14,
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 53,
@@ -18260,7 +18296,7 @@
         },
         {
           "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 15,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 92,
@@ -18289,7 +18325,7 @@
             {
               "match_type" : "exact",
               "name" : "ip_eth_type",
-              "target" : ["scalars", "fabric_metadata_t._ip_eth_type0"],
+              "target" : ["scalars", "userMetadata._ip_eth_type0"],
               "mask" : null
             }
           ],
@@ -18301,9 +18337,9 @@
           "direct_meters" : null,
           "action_ids" : [32],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_27",
+          "base_default_next" : "node_24",
           "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_27"
+            "FabricIngress.filtering.set_forwarding_type" : "node_24"
           },
           "default_entry" : {
             "action_id" : 32,
@@ -18314,7 +18350,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 16,
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 46,
@@ -18325,7 +18361,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -18357,7 +18393,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 17,
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 71,
@@ -18368,7 +18404,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t._mpls_label8"],
+              "target" : ["scalars", "userMetadata._mpls_label8"],
               "mask" : null
             }
           ],
@@ -18394,7 +18430,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 18,
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 108,
@@ -18405,7 +18441,7 @@
             {
               "match_type" : "lpm",
               "name" : "ipv4_dst",
-              "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"],
+              "target" : ["scalars", "userMetadata._ipv4_dst_addr20"],
               "mask" : null
             }
           ],
@@ -18432,7 +18468,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v6",
-          "id" : 19,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 135,
@@ -18469,7 +18505,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 20,
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 60,
@@ -18486,19 +18522,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto16"],
+              "target" : ["scalars", "userMetadata._ip_proto16"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport17"],
+              "target" : ["scalars", "userMetadata._l4_sport17"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport18"],
+              "target" : ["scalars", "userMetadata._l4_dport18"],
               "mask" : null
             },
             {
@@ -18558,13 +18594,13 @@
           "direct_meters" : null,
           "action_ids" : [38, 39, 40, 41, 42],
           "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
-          "base_default_next" : "node_37",
+          "base_default_next" : "node_34",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_37",
-            "FabricIngress.acl.punt_to_cpu" : "node_37",
-            "FabricIngress.acl.set_clone_session_id" : "node_37",
-            "FabricIngress.acl.drop" : "node_37",
-            "FabricIngress.acl.nop_acl" : "node_37"
+            "FabricIngress.acl.set_next_id_acl" : "node_34",
+            "FabricIngress.acl.punt_to_cpu" : "node_34",
+            "FabricIngress.acl.set_clone_session_id" : "node_34",
+            "FabricIngress.acl.drop" : "node_34",
+            "FabricIngress.acl.nop_acl" : "node_34"
           },
           "default_entry" : {
             "action_id" : 42,
@@ -18575,7 +18611,7 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 21,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 119,
@@ -18592,7 +18628,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id13"],
               "mask" : null
             }
           ],
@@ -18619,7 +18655,7 @@
         },
         {
           "name" : "FabricIngress.next.simple",
-          "id" : 22,
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 158,
@@ -18630,7 +18666,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id13"],
               "mask" : null
             }
           ],
@@ -18658,7 +18694,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 23,
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 202,
@@ -18669,7 +18705,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id13"],
               "mask" : null
             }
           ],
@@ -18692,7 +18728,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 24,
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 236,
@@ -18703,7 +18739,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id13"],
               "mask" : null
             }
           ],
@@ -18729,7 +18765,7 @@
         },
         {
           "name" : "FabricIngress.next.next_vlan",
-          "id" : 25,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 86,
@@ -18740,7 +18776,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id13"],
               "mask" : null
             }
           ],
@@ -18752,11 +18788,11 @@
           "direct_meters" : null,
           "action_ids" : [43, 44, 8],
           "actions" : ["FabricIngress.next.set_vlan", "FabricIngress.next.set_double_vlan", "nop"],
-          "base_default_next" : "node_43",
+          "base_default_next" : "node_40",
           "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_43",
-            "FabricIngress.next.set_double_vlan" : "node_43",
-            "nop" : "node_43"
+            "FabricIngress.next.set_vlan" : "node_40",
+            "FabricIngress.next.set_double_vlan" : "node_40",
+            "nop" : "node_40"
           },
           "default_entry" : {
             "action_id" : 8,
@@ -18766,8 +18802,8 @@
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 26,
+          "name" : "tbl_port_counter31",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -18781,22 +18817,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79],
-          "actions" : ["act_7"],
-          "base_default_next" : "node_45",
+          "action_ids" : [77],
+          "actions" : ["port_counter31"],
+          "base_default_next" : "node_42",
           "next_tables" : {
-            "act_7" : "node_45"
+            "port_counter31" : "node_42"
           },
           "default_entry" : {
-            "action_id" : 79,
+            "action_id" : 77,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_8",
-          "id" : 27,
+          "name" : "tbl_port_counter34",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -18810,14 +18846,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [80],
-          "actions" : ["act_8"],
+          "action_ids" : [78],
+          "actions" : ["port_counter34"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_8" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "port_counter34" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 80,
+            "action_id" : 78,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18825,7 +18861,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 28,
+          "id" : 26,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -18862,7 +18898,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 29,
+          "id" : 27,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 67,
@@ -18885,10 +18921,10 @@
           "direct_meters" : null,
           "action_ids" : [16, 1],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
-          "base_default_next" : "node_49",
+          "base_default_next" : "node_46",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_49",
-            "nop" : "node_49"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_46",
+            "nop" : "node_46"
           },
           "default_entry" : {
             "action_id" : 1,
@@ -18898,8 +18934,8 @@
           }
         },
         {
-          "name" : "tbl_act_9",
-          "id" : 30,
+          "name" : "tbl_int_main89",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 89,
@@ -18913,14 +18949,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["act_9"],
+          "action_ids" : [79],
+          "actions" : ["int_main89"],
           "base_default_next" : "FabricIngress.bng_ingress.t_line_map",
           "next_tables" : {
-            "act_9" : "FabricIngress.bng_ingress.t_line_map"
+            "int_main89" : "FabricIngress.bng_ingress.t_line_map"
           },
           "default_entry" : {
-            "action_id" : 81,
+            "action_id" : 79,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18928,7 +18964,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.t_line_map",
-          "id" : 31,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 323,
@@ -18939,13 +18975,13 @@
             {
               "match_type" : "exact",
               "name" : "s_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_s_tag40"],
+              "target" : ["scalars", "userMetadata._bng_s_tag40"],
               "mask" : null
             },
             {
               "match_type" : "exact",
               "name" : "c_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_c_tag41"],
+              "target" : ["scalars", "userMetadata._bng_c_tag41"],
               "mask" : null
             }
           ],
@@ -18957,9 +18993,9 @@
           "direct_meters" : null,
           "action_ids" : [28],
           "actions" : ["FabricIngress.bng_ingress.set_line"],
-          "base_default_next" : "node_52",
+          "base_default_next" : "node_49",
           "next_tables" : {
-            "FabricIngress.bng_ingress.set_line" : "node_52"
+            "FabricIngress.bng_ingress.set_line" : "node_49"
           },
           "default_entry" : {
             "action_id" : 28,
@@ -18969,8 +19005,8 @@
           }
         },
         {
-          "name" : "tbl_act_10",
-          "id" : 32,
+          "name" : "tbl_bng342",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 342,
@@ -18984,14 +19020,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
-          "actions" : ["act_12"],
+          "action_ids" : [81],
+          "actions" : ["bng342"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
           "next_tables" : {
-            "act_12" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+            "bng342" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 81,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18999,7 +19035,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
-          "id" : 33,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 51,
@@ -19030,8 +19066,8 @@
           "actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_11",
-            "__MISS__" : "tbl_act_12"
+            "__HIT__" : "tbl_bng126",
+            "__MISS__" : "node_53"
           },
           "default_entry" : {
             "action_id" : 2,
@@ -19041,54 +19077,8 @@
           }
         },
         {
-          "name" : "tbl_act_11",
-          "id" : 34,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_57",
-          "next_tables" : {
-            "act_10" : "node_57"
-          },
-          "default_entry" : {
-            "action_id" : 82,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_12",
-          "id" : 35,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_57",
-          "next_tables" : {
-            "act_11" : "node_57"
-          },
-          "default_entry" : {
-            "action_id" : 83,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
-          "id" : 36,
+          "name" : "tbl_bng126",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 126,
@@ -19102,14 +19092,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_59",
+          "action_ids" : [80],
+          "actions" : ["bng126"],
+          "base_default_next" : "node_53",
           "next_tables" : {
-            "act_13" : "node_59"
+            "bng126" : "node_53"
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 80,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19117,7 +19107,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "id" : 37,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 87,
@@ -19128,7 +19118,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id37"],
               "mask" : null
             },
             {
@@ -19154,7 +19144,7 @@
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_14",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_bng131",
             "FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
           },
           "default_entry" : {
@@ -19165,8 +19155,8 @@
           }
         },
         {
-          "name" : "tbl_act_14",
-          "id" : 38,
+          "name" : "tbl_bng131",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 131,
@@ -19180,27 +19170,27 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [86],
-          "actions" : ["act_14"],
+          "action_ids" : [82],
+          "actions" : ["bng131"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_14" : null
+            "bng131" : null
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 82,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
-          "id" : 39,
+          "name" : "tbl_bng112",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 112,
             "column" : 12,
-            "source_fragment" : "hdr.ipv6.src_addr[127:64]"
+            "source_fragment" : "            hdr.ipv6.src_addr[127:64] : exact @name(\\\"ipv6_src_net_id\\\");"
           },
           "key" : [],
           "match_type" : "exact",
@@ -19209,14 +19199,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
-          "actions" : ["act_16"],
+          "action_ids" : [84],
+          "actions" : ["bng112"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
           "next_tables" : {
-            "act_16" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
+            "bng112" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 84,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19224,7 +19214,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
-          "id" : 40,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 109,
@@ -19235,7 +19225,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id37"],
               "mask" : null
             },
             {
@@ -19261,7 +19251,7 @@
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v6", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_16",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_bng139",
             "FabricIngress.bng_ingress.upstream.term_enabled_v6" : null
           },
           "default_entry" : {
@@ -19272,8 +19262,8 @@
           }
         },
         {
-          "name" : "tbl_act_16",
-          "id" : 41,
+          "name" : "tbl_bng139",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 139,
@@ -19287,14 +19277,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87],
-          "actions" : ["act_15"],
+          "action_ids" : [83],
+          "actions" : ["bng139"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_15" : null
+            "bng139" : null
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 83,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19302,7 +19292,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_line_session_map",
-          "id" : 42,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 169,
@@ -19313,7 +19303,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id37"],
               "mask" : null
             }
           ],
@@ -19327,8 +19317,8 @@
           "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_17",
-            "__MISS__" : "tbl_act_18"
+            "__MISS__" : null,
+            "__HIT__" : "node_62"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -19338,54 +19328,8 @@
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 43,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [89],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_17" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 89,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_18",
-          "id" : 44,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [90],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_18" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 90,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "id" : 45,
+          "id" : 39,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 194,
@@ -19396,7 +19340,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id37"],
               "mask" : null
             },
             {
@@ -19428,8 +19372,8 @@
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_19",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_20"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_bng238",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_bng241"
           },
           "default_entry" : {
             "action_id" : 26,
@@ -19439,8 +19383,8 @@
           }
         },
         {
-          "name" : "tbl_act_19",
-          "id" : 46,
+          "name" : "tbl_bng238",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 238,
@@ -19454,22 +19398,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
-          "actions" : ["act_19"],
+          "action_ids" : [85],
+          "actions" : ["bng238"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_19" : null
+            "bng238" : null
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
-          "id" : 47,
+          "name" : "tbl_bng241",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 241,
@@ -19483,14 +19427,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
-          "actions" : ["act_20"],
+          "action_ids" : [86],
+          "actions" : ["bng241"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_20" : null
+            "bng241" : null
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19498,7 +19442,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v6",
-          "id" : 48,
+          "id" : 42,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 210,
@@ -19509,7 +19453,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id37"],
               "mask" : null
             },
             {
@@ -19535,8 +19479,8 @@
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_21",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_22"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_bng250",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_bng253"
           },
           "default_entry" : {
             "action_id" : 27,
@@ -19546,8 +19490,8 @@
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 49,
+          "name" : "tbl_bng250",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 250,
@@ -19561,22 +19505,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
-          "actions" : ["act_21"],
+          "action_ids" : [87],
+          "actions" : ["bng250"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_21" : null
+            "bng250" : null
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 50,
+          "name" : "tbl_bng253",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 253,
@@ -19590,14 +19534,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
-          "actions" : ["act_22"],
+          "action_ids" : [88],
+          "actions" : ["bng253"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_22" : null
+            "bng253" : null
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 88,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19620,23 +19564,23 @@
             "input" : [
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+                "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+                "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+                "value" : ["scalars", "userMetadata._ip_proto16"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+                "value" : ["scalars", "userMetadata._l4_sport17"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+                "value" : ["scalars", "userMetadata._l4_dport18"]
               }
             ]
           }
@@ -19663,32 +19607,15 @@
               }
             }
           },
-          "true_next" : "tbl_act",
+          "true_next" : "tbl_packetio25",
           "false_next" : "FabricIngress.spgw.interfaces"
         },
         {
-          "name" : "node_7",
+          "name" : "node_5",
           "id" : 1,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "spgw_tmp"]
-              }
-            }
-          },
-          "true_next" : "node_8",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_8",
-          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 256,
+            "line" : 255,
             "column" : 16,
             "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
@@ -19698,7 +19625,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
+                "value" : ["scalars", "userMetadata._spgw_src_iface30"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -19707,14 +19634,14 @@
             }
           },
           "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
-          "false_next" : "node_10"
+          "false_next" : "node_7"
         },
         {
-          "name" : "node_10",
-          "id" : 3,
+          "name" : "node_7",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 260,
+            "line" : 259,
             "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
@@ -19733,11 +19660,11 @@
           "false_next" : "FabricIngress.spgw.downlink_pdrs"
         },
         {
-          "name" : "node_13",
-          "id" : 4,
+          "name" : "node_10",
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 264,
             "column" : 16,
             "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
           },
@@ -19747,7 +19674,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
+                "value" : ["scalars", "userMetadata._spgw_src_iface30"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -19755,36 +19682,26 @@
               }
             }
           },
-          "true_next" : "tbl_act_2",
-          "false_next" : "node_15"
+          "true_next" : "tbl_spgw265",
+          "false_next" : "node_12"
         },
         {
-          "name" : "node_15",
-          "id" : 5,
+          "name" : "node_12",
+          "id" : 4,
           "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 270,
-            "column" : 16,
-            "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 24,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
               }
             }
           },
@@ -19792,8 +19709,8 @@
           "false_next" : "FabricIngress.spgw.fars"
         },
         {
-          "name" : "node_19",
-          "id" : 6,
+          "name" : "node_16",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 110,
@@ -19811,12 +19728,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_4",
-          "false_next" : "node_21"
+          "true_next" : "tbl_filtering111",
+          "false_next" : "node_18"
         },
         {
-          "name" : "node_21",
-          "id" : 7,
+          "name" : "node_18",
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 116,
@@ -19834,12 +19751,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
-          "false_next" : "node_23"
+          "true_next" : "tbl_filtering117",
+          "false_next" : "node_20"
         },
         {
-          "name" : "node_23",
-          "id" : 8,
+          "name" : "node_20",
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 122,
@@ -19864,45 +19781,42 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_filtering127",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
-          "name" : "node_27",
-          "id" : 9,
+          "name" : "node_24",
+          "id" : 8,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 69,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+            "source_fragment" : "fabric_metadata.skip_forwarding"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+                    "value" : ["scalars", "userMetadata._skip_forwarding10"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "node_28",
+          "true_next" : "node_25",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_28",
-          "id" : 10,
+          "name" : "node_25",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 150,
@@ -19915,7 +19829,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -19924,11 +19838,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_30"
+          "false_next" : "node_27"
         },
         {
-          "name" : "node_30",
-          "id" : 11,
+          "name" : "node_27",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 151,
@@ -19941,7 +19855,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -19950,11 +19864,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_32"
+          "false_next" : "node_29"
         },
         {
-          "name" : "node_32",
-          "id" : 12,
+          "name" : "node_29",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 152,
@@ -19967,7 +19881,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -19976,11 +19890,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "node_34"
+          "false_next" : "node_31"
         },
         {
-          "name" : "node_34",
-          "id" : 13,
+          "name" : "node_31",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 154,
@@ -19993,7 +19907,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -20005,32 +19919,29 @@
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_37",
-          "id" : 14,
+          "name" : "node_34",
+          "id" : 13,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 73,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_next == false"
+            "source_fragment" : "fabric_metadata.skip_next"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+                    "value" : ["scalars", "userMetadata._skip_next11"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -20038,8 +19949,8 @@
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
-          "name" : "node_43",
-          "id" : 15,
+          "name" : "node_40",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -20060,12 +19971,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
-          "false_next" : "node_45"
+          "true_next" : "tbl_port_counter31",
+          "false_next" : "node_42"
         },
         {
-          "name" : "node_45",
-          "id" : 16,
+          "name" : "node_42",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -20086,45 +19997,35 @@
               }
             }
           },
-          "true_next" : "tbl_act_8",
+          "true_next" : "tbl_port_counter34",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_49",
-          "id" : 17,
+          "name" : "node_46",
+          "id" : 16,
           "source_info" : {
-            "filename" : "include/int/int_main.p4",
-            "line" : 86,
-            "column" : 11,
-            "source_fragment" : "fabric_metadata.int_meta.sink == true"
+            "filename" : "fabric.p4",
+            "line" : 81,
+            "column" : 47,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._int_meta_sink44"]
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_int_main89",
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
-          "name" : "node_52",
-          "id" : 18,
+          "name" : "node_49",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 341,
@@ -20142,29 +20043,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_bng342",
           "false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
         },
         {
-          "name" : "node_57",
-          "id" : 19,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "bng_ingress_upstream_tmp"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_13",
-          "false_next" : "node_59"
-        },
-        {
-          "name" : "node_59",
-          "id" : 20,
+          "name" : "node_53",
+          "id" : 18,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -20184,11 +20068,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_60"
+          "true_next" : "node_54"
         },
         {
-          "name" : "node_60",
-          "id" : 21,
+          "name" : "node_54",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 128,
@@ -20207,11 +20091,11 @@
             }
           },
           "true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "false_next" : "node_63"
+          "false_next" : "node_57"
         },
         {
-          "name" : "node_63",
-          "id" : 22,
+          "name" : "node_57",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 136,
@@ -20230,28 +20114,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_15"
+          "true_next" : "tbl_bng112"
         },
         {
-          "name" : "node_70",
-          "id" : 23,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "bng_ingress_downstream_tmp"]
-              }
-            }
-          },
-          "false_next" : null,
-          "true_next" : "node_71"
-        },
-        {
-          "name" : "node_71",
-          "id" : 24,
+          "name" : "node_62",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 235,
@@ -20270,11 +20137,11 @@
             }
           },
           "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "false_next" : "node_75"
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_75",
-          "id" : 25,
+          "name" : "node_66",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 247,
@@ -20306,11 +20173,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_81",
+      "init_table" : "node_72",
       "tables" : [
         {
-          "name" : "tbl_act_23",
-          "id" : 51,
+          "name" : "tbl_packetio41",
+          "id" : 45,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -20324,22 +20191,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [147],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_83",
+          "action_ids" : [141],
+          "actions" : ["packetio41"],
+          "base_default_next" : "node_74",
           "next_tables" : {
-            "act_23" : "node_83"
+            "packetio41" : "node_74"
           },
           "default_entry" : {
-            "action_id" : 147,
+            "action_id" : 141,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 52,
+          "name" : "tbl_packetio44",
+          "id" : 46,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -20353,22 +20220,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [148],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_85",
+          "action_ids" : [142],
+          "actions" : ["packetio44"],
+          "base_default_next" : "node_76",
           "next_tables" : {
-            "act_24" : "node_85"
+            "packetio44" : "node_76"
           },
           "default_entry" : {
-            "action_id" : 148,
+            "action_id" : 142,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 53,
+          "name" : "tbl_next349",
+          "id" : 47,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 349,
@@ -20382,14 +20249,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [149],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_87",
+          "action_ids" : [143],
+          "actions" : ["next349"],
+          "base_default_next" : "node_78",
           "next_tables" : {
-            "act_25" : "node_87"
+            "next349" : "node_78"
           },
           "default_entry" : {
-            "action_id" : 149,
+            "action_id" : 143,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20397,7 +20264,7 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 54,
+          "id" : 48,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -20411,14 +20278,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [139],
+          "action_ids" : [133],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
-          "base_default_next" : "node_91",
+          "base_default_next" : "node_82",
           "next_tables" : {
-            "FabricEgress.egress_next.pop_mpls_if_present" : "node_91"
+            "FabricEgress.egress_next.pop_mpls_if_present" : "node_82"
           },
           "default_entry" : {
-            "action_id" : 139,
+            "action_id" : 133,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20426,7 +20293,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 55,
+          "id" : 49,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 355,
@@ -20440,14 +20307,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [140],
+          "action_ids" : [134],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
-          "base_default_next" : "node_91",
+          "base_default_next" : "node_82",
           "next_tables" : {
-            "FabricEgress.egress_next.set_mpls" : "node_91"
+            "FabricEgress.egress_next.set_mpls" : "node_82"
           },
           "default_entry" : {
-            "action_id" : 140,
+            "action_id" : 134,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20455,7 +20322,7 @@
         },
         {
           "name" : "tbl_egress_next_push_outer_vlan",
-          "id" : 56,
+          "id" : 50,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 361,
@@ -20469,14 +20336,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [141],
+          "action_ids" : [135],
           "actions" : ["FabricEgress.egress_next.push_outer_vlan"],
           "base_default_next" : "tbl_egress_next_push_inner_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.push_outer_vlan" : "tbl_egress_next_push_inner_vlan"
           },
           "default_entry" : {
-            "action_id" : 141,
+            "action_id" : 135,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20484,7 +20351,7 @@
         },
         {
           "name" : "tbl_egress_next_push_inner_vlan",
-          "id" : 57,
+          "id" : 51,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 362,
@@ -20498,22 +20365,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [142],
+          "action_ids" : [136],
           "actions" : ["FabricEgress.egress_next.push_inner_vlan"],
-          "base_default_next" : "node_96",
+          "base_default_next" : "node_87",
           "next_tables" : {
-            "FabricEgress.egress_next.push_inner_vlan" : "node_96"
+            "FabricEgress.egress_next.push_inner_vlan" : "node_87"
           },
           "default_entry" : {
-            "action_id" : 142,
+            "action_id" : 136,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 58,
+          "name" : "tbl_next365",
+          "id" : 52,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 365,
@@ -20527,14 +20394,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [150],
-          "actions" : ["act_26"],
+          "action_ids" : [144],
+          "actions" : ["next365"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
-            "act_26" : "FabricEgress.egress_next.egress_vlan"
+            "next365" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 150,
+            "action_id" : 144,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20542,7 +20409,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 59,
+          "id" : 53,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -20553,7 +20420,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -20569,24 +20436,24 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [143, 144, 145],
+          "action_ids" : [137, 138, 139],
           "actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
-          "base_default_next" : "node_96",
+          "base_default_next" : "node_87",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_96",
-            "FabricEgress.egress_next.pop_vlan" : "node_96",
-            "FabricEgress.egress_next.drop" : "node_96"
+            "FabricEgress.egress_next.push_vlan" : "node_87",
+            "FabricEgress.egress_next.pop_vlan" : "node_87",
+            "FabricEgress.egress_next.drop" : "node_87"
           },
           "default_entry" : {
-            "action_id" : 145,
+            "action_id" : 139,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
-          "id" : 60,
+          "name" : "tbl_next375",
+          "id" : 54,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 375,
@@ -20600,22 +20467,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [152],
-          "actions" : ["act_28"],
-          "base_default_next" : "node_98",
+          "action_ids" : [146],
+          "actions" : ["next375"],
+          "base_default_next" : "node_89",
           "next_tables" : {
-            "act_28" : "node_98"
+            "next375" : "node_89"
           },
           "default_entry" : {
-            "action_id" : 152,
+            "action_id" : 146,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_28",
-          "id" : 61,
+          "name" : "tbl_next376",
+          "id" : 55,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 376,
@@ -20629,22 +20496,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [151],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_108",
+          "action_ids" : [145],
+          "actions" : ["next376"],
+          "base_default_next" : "node_99",
           "next_tables" : {
-            "act_27" : "node_108"
+            "next376" : "node_99"
           },
           "default_entry" : {
-            "action_id" : 151,
+            "action_id" : 145,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_29",
-          "id" : 62,
+          "name" : "tbl_next379",
+          "id" : 56,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 379,
@@ -20658,22 +20525,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [154],
-          "actions" : ["act_30"],
-          "base_default_next" : "node_102",
+          "action_ids" : [148],
+          "actions" : ["next379"],
+          "base_default_next" : "node_93",
           "next_tables" : {
-            "act_30" : "node_102"
+            "next379" : "node_93"
           },
           "default_entry" : {
-            "action_id" : 154,
+            "action_id" : 148,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 63,
+          "name" : "tbl_next380",
+          "id" : 57,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 380,
@@ -20687,22 +20554,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [153],
-          "actions" : ["act_29"],
-          "base_default_next" : "node_108",
+          "action_ids" : [147],
+          "actions" : ["next380"],
+          "base_default_next" : "node_99",
           "next_tables" : {
-            "act_29" : "node_108"
+            "next380" : "node_99"
           },
           "default_entry" : {
-            "action_id" : 153,
+            "action_id" : 147,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
-          "id" : 64,
+          "name" : "tbl_next384",
+          "id" : 58,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 384,
@@ -20716,22 +20583,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [156],
-          "actions" : ["act_32"],
-          "base_default_next" : "node_106",
+          "action_ids" : [150],
+          "actions" : ["next384"],
+          "base_default_next" : "node_97",
           "next_tables" : {
-            "act_32" : "node_106"
+            "next384" : "node_97"
           },
           "default_entry" : {
-            "action_id" : 156,
+            "action_id" : 150,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
-          "id" : 65,
+          "name" : "tbl_next385",
+          "id" : 59,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 385,
@@ -20745,14 +20612,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [155],
-          "actions" : ["act_31"],
-          "base_default_next" : "node_108",
+          "action_ids" : [149],
+          "actions" : ["next385"],
+          "base_default_next" : "node_99",
           "next_tables" : {
-            "act_31" : "node_108"
+            "next385" : "node_99"
           },
           "default_entry" : {
-            "action_id" : 155,
+            "action_id" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20760,10 +20627,10 @@
         },
         {
           "name" : "tbl_spgw_gtpu_encap",
-          "id" : 66,
+          "id" : 60,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 340,
+            "line" : 339,
             "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
@@ -20774,25 +20641,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [146],
+          "action_ids" : [140],
           "actions" : ["FabricEgress.spgw.gtpu_encap"],
-          "base_default_next" : "node_111",
+          "base_default_next" : "node_102",
           "next_tables" : {
-            "FabricEgress.spgw.gtpu_encap" : "node_111"
+            "FabricEgress.spgw.gtpu_encap" : "node_102"
           },
           "default_entry" : {
-            "action_id" : 146,
+            "action_id" : 140,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 67,
+          "name" : "tbl_spgw342",
+          "id" : 61,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 342,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -20803,14 +20670,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [157],
-          "actions" : ["act_33"],
-          "base_default_next" : "node_113",
+          "action_ids" : [151],
+          "actions" : ["spgw342"],
+          "base_default_next" : "node_104",
           "next_tables" : {
-            "act_33" : "node_113"
+            "spgw342" : "node_104"
           },
           "default_entry" : {
-            "action_id" : 157,
+            "action_id" : 151,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20818,7 +20685,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v4",
-          "id" : 68,
+          "id" : 62,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 297,
@@ -20832,14 +20699,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [100],
+          "action_ids" : [94],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
-          "base_default_next" : "node_118",
+          "base_default_next" : "node_109",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v4" : "node_118"
+            "FabricEgress.bng_egress.downstream.encap_v4" : "node_109"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20847,7 +20714,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v6",
-          "id" : 69,
+          "id" : 63,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 302,
@@ -20861,14 +20728,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [101],
+          "action_ids" : [95],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v6"],
-          "base_default_next" : "node_118",
+          "base_default_next" : "node_109",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v6" : "node_118"
+            "FabricEgress.bng_egress.downstream.encap_v6" : "node_109"
           },
           "default_entry" : {
-            "action_id" : 101,
+            "action_id" : 95,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20876,7 +20743,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 70,
+          "id" : 64,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -20899,13 +20766,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport17"],
+              "target" : ["scalars", "userMetadata._l4_sport17"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport18"],
+              "target" : ["scalars", "userMetadata._l4_dport18"],
               "mask" : null
             }
           ],
@@ -20915,23 +20782,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [102, 95],
+          "action_ids" : [96, 89],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_121",
+          "base_default_next" : "node_112",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_121",
-            "nop" : "node_121"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_112",
+            "nop" : "node_112"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 89,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_34",
-          "id" : 71,
+          "name" : "tbl_act",
+          "id" : 65,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -20939,14 +20806,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [158],
-          "actions" : ["act_34"],
+          "action_ids" : [152],
+          "actions" : ["act"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_34" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 158,
+            "action_id" : 152,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20954,7 +20821,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 72,
+          "id" : 66,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -20975,23 +20842,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [103, 96],
+          "action_ids" : [97, 90],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_124",
+          "base_default_next" : "node_115",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_124",
-            "nop" : "node_124"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_115",
+            "nop" : "node_115"
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_35",
-          "id" : 73,
+          "name" : "tbl_int_transit420",
+          "id" : 67,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -21005,14 +20872,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [159],
-          "actions" : ["act_35"],
-          "base_default_next" : "node_126",
+          "action_ids" : [153],
+          "actions" : ["int_transit420"],
+          "base_default_next" : "node_117",
           "next_tables" : {
-            "act_35" : "node_126"
+            "int_transit420" : "node_117"
           },
           "default_entry" : {
-            "action_id" : 159,
+            "action_id" : 153,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21020,7 +20887,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 74,
+          "id" : 68,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -21041,7 +20908,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 98],
+          "action_ids" : [98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 92],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -21064,7 +20931,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 98,
+            "action_id" : 92,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -21084,7 +20951,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 104,
+                "action_id" : 98,
                 "action_data" : []
               },
               "priority" : 1
@@ -21103,7 +20970,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 99,
                 "action_data" : []
               },
               "priority" : 2
@@ -21122,7 +20989,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 100,
                 "action_data" : []
               },
               "priority" : 3
@@ -21141,7 +21008,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 101,
                 "action_data" : []
               },
               "priority" : 4
@@ -21160,7 +21027,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 102,
                 "action_data" : []
               },
               "priority" : 5
@@ -21179,7 +21046,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 103,
                 "action_data" : []
               },
               "priority" : 6
@@ -21198,7 +21065,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 104,
                 "action_data" : []
               },
               "priority" : 7
@@ -21217,7 +21084,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 105,
                 "action_data" : []
               },
               "priority" : 8
@@ -21236,7 +21103,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 106,
                 "action_data" : []
               },
               "priority" : 9
@@ -21255,7 +21122,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 107,
                 "action_data" : []
               },
               "priority" : 10
@@ -21274,7 +21141,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 108,
                 "action_data" : []
               },
               "priority" : 11
@@ -21293,7 +21160,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 109,
                 "action_data" : []
               },
               "priority" : 12
@@ -21312,7 +21179,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 110,
                 "action_data" : []
               },
               "priority" : 13
@@ -21331,7 +21198,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 111,
                 "action_data" : []
               },
               "priority" : 14
@@ -21350,7 +21217,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 118,
+                "action_id" : 112,
                 "action_data" : []
               },
               "priority" : 15
@@ -21369,7 +21236,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 119,
+                "action_id" : 113,
                 "action_data" : []
               },
               "priority" : 16
@@ -21378,7 +21245,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 75,
+          "id" : 69,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -21399,30 +21266,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 99],
+          "action_ids" : [114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 93],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_36",
+          "base_default_next" : "tbl_int_transit425",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_36",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_36",
-            "NoAction" : "tbl_act_36"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_int_transit425",
+            "NoAction" : "tbl_int_transit425"
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 93,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -21442,7 +21309,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 120,
+                "action_id" : 114,
                 "action_data" : []
               },
               "priority" : 1
@@ -21461,7 +21328,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 121,
+                "action_id" : 115,
                 "action_data" : []
               },
               "priority" : 2
@@ -21480,7 +21347,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 122,
+                "action_id" : 116,
                 "action_data" : []
               },
               "priority" : 3
@@ -21499,7 +21366,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 123,
+                "action_id" : 117,
                 "action_data" : []
               },
               "priority" : 4
@@ -21518,7 +21385,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 124,
+                "action_id" : 118,
                 "action_data" : []
               },
               "priority" : 5
@@ -21537,7 +21404,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 125,
+                "action_id" : 119,
                 "action_data" : []
               },
               "priority" : 6
@@ -21556,7 +21423,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 126,
+                "action_id" : 120,
                 "action_data" : []
               },
               "priority" : 7
@@ -21575,7 +21442,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 127,
+                "action_id" : 121,
                 "action_data" : []
               },
               "priority" : 8
@@ -21594,7 +21461,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 128,
+                "action_id" : 122,
                 "action_data" : []
               },
               "priority" : 9
@@ -21613,7 +21480,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 129,
+                "action_id" : 123,
                 "action_data" : []
               },
               "priority" : 10
@@ -21632,7 +21499,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 130,
+                "action_id" : 124,
                 "action_data" : []
               },
               "priority" : 11
@@ -21651,7 +21518,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 131,
+                "action_id" : 125,
                 "action_data" : []
               },
               "priority" : 12
@@ -21670,7 +21537,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 132,
+                "action_id" : 126,
                 "action_data" : []
               },
               "priority" : 13
@@ -21689,7 +21556,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 133,
+                "action_id" : 127,
                 "action_data" : []
               },
               "priority" : 14
@@ -21708,7 +21575,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 134,
+                "action_id" : 128,
                 "action_data" : []
               },
               "priority" : 15
@@ -21727,7 +21594,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 135,
+                "action_id" : 129,
                 "action_data" : []
               },
               "priority" : 16
@@ -21735,8 +21602,8 @@
           ]
         },
         {
-          "name" : "tbl_act_36",
-          "id" : 76,
+          "name" : "tbl_int_transit425",
+          "id" : 70,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -21750,22 +21617,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [161],
-          "actions" : ["act_37"],
-          "base_default_next" : "node_130",
+          "action_ids" : [155],
+          "actions" : ["int_transit425"],
+          "base_default_next" : "node_121",
           "next_tables" : {
-            "act_37" : "node_130"
+            "int_transit425" : "node_121"
           },
           "default_entry" : {
-            "action_id" : 161,
+            "action_id" : 155,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_37",
-          "id" : 77,
+          "name" : "tbl_int_transit428",
+          "id" : 71,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -21779,22 +21646,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [160],
-          "actions" : ["act_36"],
-          "base_default_next" : "node_132",
+          "action_ids" : [154],
+          "actions" : ["int_transit428"],
+          "base_default_next" : "node_123",
           "next_tables" : {
-            "act_36" : "node_132"
+            "int_transit428" : "node_123"
           },
           "default_entry" : {
-            "action_id" : 160,
+            "action_id" : 154,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_38",
-          "id" : 78,
+          "name" : "tbl_int_transit431",
+          "id" : 72,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -21808,22 +21675,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [162],
-          "actions" : ["act_38"],
-          "base_default_next" : "node_134",
+          "action_ids" : [156],
+          "actions" : ["int_transit431"],
+          "base_default_next" : "node_125",
           "next_tables" : {
-            "act_38" : "node_134"
+            "int_transit431" : "node_125"
           },
           "default_entry" : {
-            "action_id" : 162,
+            "action_id" : 156,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_39",
-          "id" : 79,
+          "name" : "tbl_int_transit434",
+          "id" : 73,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -21837,14 +21704,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [163],
-          "actions" : ["act_39"],
-          "base_default_next" : "node_136",
+          "action_ids" : [157],
+          "actions" : ["int_transit434"],
+          "base_default_next" : "node_127",
           "next_tables" : {
-            "act_39" : "node_136"
+            "int_transit434" : "node_127"
           },
           "default_entry" : {
-            "action_id" : 163,
+            "action_id" : 157,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21852,7 +21719,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 80,
+          "id" : 74,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
             "line" : 87,
@@ -21866,15 +21733,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [136, 97],
+          "action_ids" : [130, 91],
           "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
-          "base_default_next" : "node_138",
+          "base_default_next" : "node_129",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_138",
-            "nop" : "node_138"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_129",
+            "nop" : "node_129"
           },
           "default_entry" : {
-            "action_id" : 97,
+            "action_id" : 91,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -21882,7 +21749,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
-          "id" : 81,
+          "id" : 75,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 53,
@@ -21896,14 +21763,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [137],
+          "action_ids" : [131],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.restore_header"],
           "base_default_next" : "tbl_process_int_main_process_int_sink_int_sink",
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.restore_header" : "tbl_process_int_main_process_int_sink_int_sink"
           },
           "default_entry" : {
-            "action_id" : 137,
+            "action_id" : 131,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21911,7 +21778,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 82,
+          "id" : 76,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 54,
@@ -21925,14 +21792,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [138],
+          "action_ids" : [132],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 138,
+            "action_id" : 132,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21942,41 +21809,31 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_81",
-          "id" : 26,
+          "name" : "node_72",
+          "id" : 23,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 39,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
+            "filename" : "fabric.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out15"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._is_controller_packet_out15"]
               }
             }
           },
-          "true_next" : "tbl_act_23",
-          "false_next" : "node_83"
+          "true_next" : "tbl_packetio41",
+          "false_next" : "node_74"
         },
         {
-          "name" : "node_83",
-          "id" : 27,
+          "name" : "node_74",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -21997,12 +21854,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
-          "false_next" : "node_85"
+          "true_next" : "tbl_packetio44",
+          "false_next" : "node_76"
         },
         {
-          "name" : "node_85",
-          "id" : 28,
+          "name" : "node_76",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 347,
@@ -22016,21 +21873,11 @@
               "left" : {
                 "type" : "expression",
                 "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast14"]
-                      }
-                    }
-                  },
+                  "op" : "d2b",
+                  "left" : null,
                   "right" : {
-                    "type" : "bool",
-                    "value" : true
+                    "type" : "field",
+                    "value" : ["scalars", "userMetadata._is_multicast14"]
                   }
                 }
               },
@@ -22050,12 +21897,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_87"
+          "true_next" : "tbl_next349",
+          "false_next" : "node_78"
         },
         {
-          "name" : "node_87",
-          "id" : 29,
+          "name" : "node_78",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 352,
@@ -22068,7 +21915,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
+                "value" : ["scalars", "userMetadata._mpls_label8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -22076,12 +21923,12 @@
               }
             }
           },
-          "true_next" : "node_88",
+          "true_next" : "node_79",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_88",
-          "id" : 30,
+          "name" : "node_79",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -22100,44 +21947,34 @@
             }
           },
           "true_next" : "tbl_egress_next_pop_mpls_if_present",
-          "false_next" : "node_91"
+          "false_next" : "node_82"
         },
         {
-          "name" : "node_91",
-          "id" : 31,
+          "name" : "node_82",
+          "id" : 28,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 359,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.push_double_vlan == true"
+            "filename" : "fabric.p4",
+            "line" : 104,
+            "column" : 31,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._push_double_vlan4"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._push_double_vlan4"]
               }
             }
           },
           "true_next" : "tbl_egress_next_push_outer_vlan",
-          "false_next" : "tbl_act_26"
+          "false_next" : "tbl_next365"
         },
         {
-          "name" : "node_96",
-          "id" : 32,
+          "name" : "node_87",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 374,
@@ -22155,12 +21992,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_100"
+          "true_next" : "tbl_next375",
+          "false_next" : "node_91"
         },
         {
-          "name" : "node_98",
-          "id" : 33,
+          "name" : "node_89",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 376,
@@ -22181,12 +22018,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_28",
-          "false_next" : "node_108"
+          "true_next" : "tbl_next376",
+          "false_next" : "node_99"
         },
         {
-          "name" : "node_100",
-          "id" : 34,
+          "name" : "node_91",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 378,
@@ -22214,7 +22051,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                    "value" : ["scalars", "userMetadata._fwd_type12"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -22224,12 +22061,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_29",
-          "false_next" : "node_104"
+          "true_next" : "tbl_next379",
+          "false_next" : "node_95"
         },
         {
-          "name" : "node_102",
-          "id" : 35,
+          "name" : "node_93",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 380,
@@ -22250,12 +22087,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_30",
-          "false_next" : "node_108"
+          "true_next" : "tbl_next380",
+          "false_next" : "node_99"
         },
         {
-          "name" : "node_104",
-          "id" : 36,
+          "name" : "node_95",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 383,
@@ -22283,7 +22120,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
+                    "value" : ["scalars", "userMetadata._fwd_type12"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -22293,12 +22130,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_31",
-          "false_next" : "node_108"
+          "true_next" : "tbl_next384",
+          "false_next" : "node_99"
         },
         {
-          "name" : "node_106",
-          "id" : 37,
+          "name" : "node_97",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 385,
@@ -22319,111 +22156,95 @@
               }
             }
           },
-          "true_next" : "tbl_act_32",
-          "false_next" : "node_108"
+          "true_next" : "tbl_next385",
+          "false_next" : "node_99"
         },
         {
-          "name" : "node_108",
-          "id" : 38,
+          "name" : "node_99",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 337,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
+            "source_fragment" : "fabric_md.spgw.skip_spgw"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
+                    "value" : ["scalars", "userMetadata._spgw_skip_spgw31"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "node_109",
-          "false_next" : "node_113"
+          "true_next" : "node_100",
+          "false_next" : "node_104"
         },
         {
-          "name" : "node_109",
-          "id" : 39,
+          "name" : "node_100",
+          "id" : 36,
           "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 339,
-            "column" : 16,
-            "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
+            "filename" : "fabric.p4",
+            "line" : 106,
+            "column" : 24,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap33"]
               }
             }
           },
           "true_next" : "tbl_spgw_gtpu_encap",
-          "false_next" : "node_111"
+          "false_next" : "node_102"
         },
         {
-          "name" : "node_111",
-          "id" : 40,
+          "name" : "node_102",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 342,
+            "line" : 341,
             "column" : 16,
-            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr35"]
+                    "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr35"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "node_113"
+          "true_next" : "tbl_spgw342",
+          "false_next" : "node_104"
         },
         {
-          "name" : "node_113",
-          "id" : 41,
+          "name" : "node_104",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 358,
@@ -22436,7 +22257,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._bng_type36"]
+                "value" : ["scalars", "userMetadata._bng_type36"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -22444,12 +22265,12 @@
               }
             }
           },
-          "true_next" : "node_114",
-          "false_next" : "node_118"
+          "true_next" : "node_105",
+          "false_next" : "node_109"
         },
         {
-          "name" : "node_114",
-          "id" : 42,
+          "name" : "node_105",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 296,
@@ -22468,11 +22289,11 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v4",
-          "false_next" : "node_116"
+          "false_next" : "node_107"
         },
         {
-          "name" : "node_116",
-          "id" : 43,
+          "name" : "node_107",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 301,
@@ -22491,11 +22312,11 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v6",
-          "false_next" : "node_118"
+          "false_next" : "node_109"
         },
         {
-          "name" : "node_118",
-          "id" : 44,
+          "name" : "node_109",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -22571,44 +22392,34 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_119"
+          "true_next" : "node_110"
         },
         {
-          "name" : "node_119",
-          "id" : 45,
+          "name" : "node_110",
+          "id" : 42,
           "source_info" : {
-            "filename" : "include/int/int_main.p4",
-            "line" : 106,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.int_meta.source == true"
+            "filename" : "fabric.p4",
+            "line" : 112,
+            "column" : 36,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source42"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._int_meta_source42"]
               }
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_121"
+          "false_next" : "node_112"
         },
         {
-          "name" : "node_121",
-          "id" : 46,
+          "name" : "node_112",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -22627,44 +22438,41 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_34"
+          "true_next" : "tbl_act"
         },
         {
-          "name" : "node_124",
-          "id" : 47,
+          "name" : "node_115",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
             "column" : 12,
-            "source_fragment" : "fmeta.int_meta.transit == false"
+            "source_fragment" : "fmeta.int_meta.transit"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit43"]
+                    "value" : ["scalars", "userMetadata._int_meta_transit43"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_35",
-          "false_next" : "node_126"
+          "true_next" : "tbl_int_transit420",
+          "false_next" : "node_117"
         },
         {
-          "name" : "node_126",
-          "id" : 48,
+          "name" : "node_117",
+          "id" : 45,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -22684,11 +22492,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_136"
+          "false_next" : "node_127"
         },
         {
-          "name" : "node_130",
-          "id" : 49,
+          "name" : "node_121",
+          "id" : 46,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -22706,12 +22514,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_37",
-          "false_next" : "node_132"
+          "true_next" : "tbl_int_transit428",
+          "false_next" : "node_123"
         },
         {
-          "name" : "node_132",
-          "id" : 50,
+          "name" : "node_123",
+          "id" : 47,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -22729,12 +22537,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_38",
-          "false_next" : "node_134"
+          "true_next" : "tbl_int_transit431",
+          "false_next" : "node_125"
         },
         {
-          "name" : "node_134",
-          "id" : 51,
+          "name" : "node_125",
+          "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -22752,12 +22560,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_39",
-          "false_next" : "node_136"
+          "true_next" : "tbl_int_transit434",
+          "false_next" : "node_127"
         },
         {
-          "name" : "node_136",
-          "id" : 52,
+          "name" : "node_127",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 115,
@@ -22779,35 +22587,25 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_138"
+          "false_next" : "node_129"
         },
         {
-          "name" : "node_138",
-          "id" : 53,
+          "name" : "node_129",
+          "id" : 50,
           "source_info" : {
-            "filename" : "include/int/int_main.p4",
-            "line" : 119,
-            "column" : 20,
-            "source_fragment" : "fabric_metadata.int_meta.sink == true"
+            "filename" : "fabric.p4",
+            "line" : 112,
+            "column" : 36,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._int_meta_sink44"]
               }
             }
           },
@@ -22849,7 +22647,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 359,
+        "line" : 358,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -22925,33 +22723,21 @@
       ["standard_metadata", "egress_global_timestamp"]
     ],
     [
-      "intrinsic_metadata.lf_field_list",
-      ["standard_metadata", "lf_field_list"]
-    ],
-    [
       "intrinsic_metadata.mcast_grp",
       ["standard_metadata", "mcast_grp"]
     ],
     [
-      "intrinsic_metadata.resubmit_flag",
-      ["standard_metadata", "resubmit_flag"]
-    ],
-    [
       "intrinsic_metadata.egress_rid",
       ["standard_metadata", "egress_rid"]
     ],
     [
-      "intrinsic_metadata.recirculate_flag",
-      ["standard_metadata", "recirculate_flag"]
-    ],
-    [
       "intrinsic_metadata.priority",
       ["standard_metadata", "priority"]
     ]
   ],
   "program" : "fabric.p4",
   "__meta__" : {
-    "version" : [2, 18],
+    "version" : [2, 23],
     "compiler" : "https://github.com/p4lang/p4c"
   }
 }
\ No newline at end of file
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 7e482b4..7e04957 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
@@ -3,7 +3,7 @@
 }
 tables {
   preamble {
-    id: 33581620
+    id: 44526132
     name: "FabricIngress.process_set_source_sink.tb_set_source"
     alias: "tb_set_source"
   }
@@ -14,20 +14,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16778827
+    id: 21235275
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318787614
+  const_default_action_id: 28485346
+  direct_resource_ids: 318984222
   size: 511
 }
 tables {
   preamble {
-    id: 33561619
+    id: 35265555
     name: "FabricIngress.process_set_source_sink.tb_set_sink"
     alias: "tb_set_sink"
   }
@@ -38,20 +38,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16788951
+    id: 25570775
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318770551
+  const_default_action_id: 28485346
+  direct_resource_ids: 324013431
   size: 511
 }
 tables {
   preamble {
-    id: 33603300
+    id: 34520804
     name: "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
     alias: "t_pppoe_cp"
   }
@@ -68,19 +68,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"
   }
@@ -103,19 +103,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: 33579386
+    id: 38756730
     name: "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
     alias: "t_pppoe_term_v6"
   }
@@ -138,19 +138,19 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16824882
+    id: 25279026
   }
   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"
   }
@@ -161,22 +161,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"
   }
@@ -205,17 +205,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: 33616597
+    id: 48034517
     name: "FabricIngress.bng_ingress.downstream.t_qos_v6"
     alias: "t_qos_v6"
   }
@@ -238,17 +238,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"
   }
@@ -265,14 +265,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"
   }
@@ -301,21 +301,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"
   }
@@ -344,15 +344,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"
   }
@@ -369,20 +369,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"
   }
@@ -393,20 +393,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"
   }
@@ -417,13 +417,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
   }
@@ -431,7 +431,7 @@
 }
 tables {
   preamble {
-    id: 33614081
+    id: 49342721
     name: "FabricIngress.forwarding.routing_v6"
     alias: "routing_v6"
   }
@@ -442,20 +442,20 @@
     match_type: LPM
   }
   action_refs {
-    id: 16809751
+    id: 21856023
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318799210
+  const_default_action_id: 28485346
+  direct_resource_ids: 324042090
   size: 1024
 }
 tables {
   preamble {
-    id: 33618978
+    id: 44104738
     name: "FabricIngress.acl.acl"
     alias: "acl"
   }
@@ -532,27 +532,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"
   }
@@ -563,23 +563,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: 33596977
+    id: 48735793
     name: "FabricIngress.next.xconnect"
     alias: "xconnect"
   }
@@ -596,23 +596,23 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16842190
+    id: 24640974
   }
   action_refs {
-    id: 16837052
+    id: 30599612
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318778156
+  const_default_action_id: 28485346
+  direct_resource_ids: 321989420
   size: 1024
 }
 tables {
   preamble {
-    id: 33571723
+    id: 39142283
     name: "FabricIngress.next.simple"
     alias: "simple"
   }
@@ -623,26 +623,26 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16802668
+    id: 19358572
   }
   action_refs {
-    id: 16814145
+    id: 31887425
   }
   action_refs {
-    id: 16783036
+    id: 26875580
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318769096
+  const_default_action_id: 28485346
+  direct_resource_ids: 326633416
   size: 1024
 }
 tables {
   preamble {
-    id: 33608588
+    id: 47960972
     name: "FabricIngress.next.hashed"
     alias: "hashed"
   }
@@ -653,27 +653,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"
   }
@@ -684,20 +684,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: 33557250
+    id: 36113154
     name: "FabricIngress.spgw.interfaces"
     alias: "interfaces"
   }
@@ -714,19 +714,19 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16810012
+    id: 18186268
   }
   action_refs {
-    id: 16783042
+    id: 29103810
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16783042
+  const_default_action_id: 29103810
   size: 128
 }
 tables {
   preamble {
-    id: 33566601
+    id: 47394697
     name: "FabricIngress.spgw.downlink_pdrs"
     alias: "downlink_pdrs"
   }
@@ -737,13 +737,13 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16800614
+    id: 18504550
   }
   action_refs {
-    id: 16785920
+    id: 25764352
   }
   action_refs {
-    id: 16800567
+    id: 21257015
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
@@ -751,7 +751,7 @@
 }
 tables {
   preamble {
-    id: 33606410
+    id: 46648074
     name: "FabricIngress.spgw.uplink_pdrs"
     alias: "uplink_pdrs"
   }
@@ -768,13 +768,13 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16800614
+    id: 18504550
   }
   action_refs {
-    id: 16785920
+    id: 25764352
   }
   action_refs {
-    id: 16800567
+    id: 21257015
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
@@ -782,7 +782,7 @@
 }
 tables {
   preamble {
-    id: 33599560
+    id: 47558728
     name: "FabricIngress.spgw.fars"
     alias: "fars"
   }
@@ -793,20 +793,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16820307
+    id: 24881235
   }
   action_refs {
-    id: 16814785
+    id: 29659841
   }
   action_refs {
-    id: 16814681
+    id: 30642777
   }
-  const_default_action_id: 16820307
+  const_default_action_id: 24881235
   size: 2048
 }
 tables {
   preamble {
-    id: 33612258
+    id: 44818914
     name: "FabricEgress.process_int_main.process_int_source.tb_int_source"
     alias: "tb_int_source"
   }
@@ -835,20 +835,20 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16785857
+    id: 20062657
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318800047
+  const_default_action_id: 28485346
+  direct_resource_ids: 322470063
   size: 1024
 }
 tables {
   preamble {
-    id: 33599867
+    id: 34910587
     name: "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
     alias: "tb_int_insert"
   }
@@ -859,27 +859,27 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16780783
+    id: 29232623
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
+  const_default_action_id: 28485346
   size: 1
 }
 tables {
   preamble {
-    id: 33618104
+    id: 48232632
     name: "FabricEgress.process_int_main.process_int_report.tb_generate_report"
     alias: "tb_generate_report"
   }
   action_refs {
-    id: 16788620
+    id: 19999884
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
@@ -887,7 +887,7 @@
 }
 tables {
   preamble {
-    id: 33599342
+    id: 49262446
     name: "FabricEgress.egress_next.egress_vlan"
     alias: "egress_vlan"
   }
@@ -904,79 +904,80 @@
     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: 16800567
+    id: 21257015
     name: "NoAction"
     alias: "NoAction"
+    annotations: "@noWarn(\"unused\")"
   }
 }
 actions {
   preamble {
-    id: 16778827
+    id: 21235275
     name: "FabricIngress.process_set_source_sink.int_set_source"
     alias: "int_set_source"
   }
 }
 actions {
   preamble {
-    id: 16788951
+    id: 25570775
     name: "FabricIngress.process_set_source_sink.int_set_sink"
     alias: "int_set_sink"
   }
 }
 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: 16824882
+    id: 25279026
     name: "FabricIngress.bng_ingress.upstream.term_enabled_v6"
     alias: "term_enabled_v6"
   }
 }
 actions {
   preamble {
-    id: 16795395
+    id: 29640451
     name: "FabricIngress.bng_ingress.downstream.set_session"
     alias: "set_session"
   }
@@ -988,28 +989,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"
   }
@@ -1021,21 +1022,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"
   }
@@ -1047,7 +1048,7 @@
 }
 actions {
   preamble {
-    id: 16840921
+    id: 25032921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
   }
@@ -1059,7 +1060,7 @@
 }
 actions {
   preamble {
-    id: 16811012
+    id: 21791748
     name: "FabricIngress.forwarding.set_next_id_bridging"
     alias: "set_next_id_bridging"
   }
@@ -1071,7 +1072,7 @@
 }
 actions {
   preamble {
-    id: 16827758
+    id: 30066030
     name: "FabricIngress.forwarding.pop_mpls_and_next"
     alias: "pop_mpls_and_next"
   }
@@ -1083,7 +1084,7 @@
 }
 actions {
   preamble {
-    id: 16777434
+    id: 19792090
     name: "FabricIngress.forwarding.set_next_id_routing_v4"
     alias: "set_next_id_routing_v4"
   }
@@ -1095,14 +1096,14 @@
 }
 actions {
   preamble {
-    id: 16804187
+    id: 29124955
     name: "FabricIngress.forwarding.nop_routing_v4"
     alias: "nop_routing_v4"
   }
 }
 actions {
   preamble {
-    id: 16809751
+    id: 21856023
     name: "FabricIngress.forwarding.set_next_id_routing_v6"
     alias: "set_next_id_routing_v6"
   }
@@ -1114,7 +1115,7 @@
 }
 actions {
   preamble {
-    id: 16807382
+    id: 23623126
     name: "FabricIngress.acl.set_next_id_acl"
     alias: "set_next_id_acl"
   }
@@ -1126,14 +1127,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"
   }
@@ -1145,21 +1146,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"
   }
@@ -1171,7 +1172,7 @@
 }
 actions {
   preamble {
-    id: 16803337
+    id: 17655305
     name: "FabricIngress.next.set_double_vlan"
     alias: "set_double_vlan"
   }
@@ -1188,7 +1189,7 @@
 }
 actions {
   preamble {
-    id: 16842190
+    id: 24640974
     name: "FabricIngress.next.output_xconnect"
     alias: "output_xconnect"
   }
@@ -1200,7 +1201,7 @@
 }
 actions {
   preamble {
-    id: 16837052
+    id: 30599612
     name: "FabricIngress.next.set_next_id_xconnect"
     alias: "set_next_id_xconnect"
   }
@@ -1212,7 +1213,7 @@
 }
 actions {
   preamble {
-    id: 16802668
+    id: 19358572
     name: "FabricIngress.next.output_simple"
     alias: "output_simple"
   }
@@ -1224,7 +1225,7 @@
 }
 actions {
   preamble {
-    id: 16814145
+    id: 31887425
     name: "FabricIngress.next.routing_simple"
     alias: "routing_simple"
   }
@@ -1246,7 +1247,7 @@
 }
 actions {
   preamble {
-    id: 16783036
+    id: 26875580
     name: "FabricIngress.next.mpls_routing_simple"
     alias: "mpls_routing_simple"
   }
@@ -1273,7 +1274,7 @@
 }
 actions {
   preamble {
-    id: 16815357
+    id: 27301117
     name: "FabricIngress.next.output_hashed"
     alias: "output_hashed"
   }
@@ -1285,7 +1286,7 @@
 }
 actions {
   preamble {
-    id: 16791402
+    id: 20985706
     name: "FabricIngress.next.routing_hashed"
     alias: "routing_hashed"
   }
@@ -1307,7 +1308,7 @@
 }
 actions {
   preamble {
-    id: 16779255
+    id: 27920375
     name: "FabricIngress.next.mpls_routing_hashed"
     alias: "mpls_routing_hashed"
   }
@@ -1334,7 +1335,7 @@
 }
 actions {
   preamble {
-    id: 16779917
+    id: 21629581
     name: "FabricIngress.next.set_mcast_group_id"
     alias: "set_mcast_group_id"
   }
@@ -1346,7 +1347,7 @@
 }
 actions {
   preamble {
-    id: 16810012
+    id: 18186268
     name: "FabricIngress.spgw.load_iface"
     alias: "load_iface"
   }
@@ -1358,14 +1359,14 @@
 }
 actions {
   preamble {
-    id: 16783042
+    id: 29103810
     name: "FabricIngress.spgw.iface_miss"
     alias: "iface_miss"
   }
 }
 actions {
   preamble {
-    id: 16800614
+    id: 18504550
     name: "FabricIngress.spgw.load_pdr"
     alias: "load_pdr"
   }
@@ -1387,7 +1388,7 @@
 }
 actions {
   preamble {
-    id: 16785920
+    id: 25764352
     name: "FabricIngress.spgw.load_pdr_qos"
     alias: "load_pdr_qos"
   }
@@ -1414,7 +1415,7 @@
 }
 actions {
   preamble {
-    id: 16820307
+    id: 24881235
     name: "FabricIngress.spgw.load_normal_far"
     alias: "load_normal_far"
   }
@@ -1431,7 +1432,7 @@
 }
 actions {
   preamble {
-    id: 16814785
+    id: 29659841
     name: "FabricIngress.spgw.load_tunnel_far"
     alias: "load_tunnel_far"
   }
@@ -1468,7 +1469,7 @@
 }
 actions {
   preamble {
-    id: 16814681
+    id: 30642777
     name: "FabricIngress.spgw.load_dbuf_far"
     alias: "load_dbuf_far"
   }
@@ -1505,21 +1506,21 @@
 }
 actions {
   preamble {
-    id: 16784000
+    id: 20781696
     name: "FabricEgress.bng_egress.downstream.encap_v4"
     alias: "encap_v4"
   }
 }
 actions {
   preamble {
-    id: 16801306
+    id: 17456666
     name: "FabricEgress.bng_egress.downstream.encap_v6"
     alias: "encap_v6"
   }
 }
 actions {
   preamble {
-    id: 16785857
+    id: 20062657
     name: "FabricEgress.process_int_main.process_int_source.int_source_dscp"
     alias: "int_source_dscp"
   }
@@ -1546,7 +1547,7 @@
 }
 actions {
   preamble {
-    id: 16780783
+    id: 29232623
     name: "FabricEgress.process_int_main.process_int_transit.init_metadata"
     alias: "init_metadata"
   }
@@ -1558,7 +1559,7 @@
 }
 actions {
   preamble {
-    id: 16788620
+    id: 19999884
     name: "FabricEgress.process_int_main.process_int_report.do_report_encapsulation"
     alias: "do_report_encapsulation"
   }
@@ -1590,39 +1591,39 @@
 }
 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"
   }
@@ -1633,7 +1634,7 @@
 }
 counters {
   preamble {
-    id: 302043418
+    id: 310956314
     name: "FabricIngress.bng_ingress.upstream.c_dropped"
     alias: "c_dropped"
   }
@@ -1644,7 +1645,7 @@
 }
 counters {
   preamble {
-    id: 302008909
+    id: 302467661
     name: "FabricIngress.bng_ingress.upstream.c_control"
     alias: "c_control"
   }
@@ -1655,7 +1656,7 @@
 }
 counters {
   preamble {
-    id: 302004781
+    id: 304364077
     name: "FabricIngress.bng_ingress.downstream.c_line_rx"
     alias: "c_line_rx"
   }
@@ -1666,7 +1667,7 @@
 }
 counters {
   preamble {
-    id: 302011205
+    id: 314528581
     name: "FabricIngress.port_counters_control.egress_port_counter"
     alias: "egress_port_counter"
   }
@@ -1677,7 +1678,7 @@
 }
 counters {
   preamble {
-    id: 302002771
+    id: 312947283
     name: "FabricIngress.port_counters_control.ingress_port_counter"
     alias: "ingress_port_counter"
   }
@@ -1688,7 +1689,7 @@
 }
 counters {
   preamble {
-    id: 302043952
+    id: 308925232
     name: "FabricIngress.spgw.pdr_counter"
     alias: "FabricIngress.spgw.pdr_counter"
   }
@@ -1699,7 +1700,7 @@
 }
 counters {
   preamble {
-    id: 302046535
+    id: 311942471
     name: "FabricEgress.bng_egress.downstream.c_line_tx"
     alias: "c_line_tx"
   }
@@ -1721,172 +1722,172 @@
 }
 direct_counters {
   preamble {
-    id: 318787614
+    id: 318984222
     name: "FabricIngress.process_set_source_sink.counter_set_source"
     alias: "counter_set_source"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33581620
+  direct_table_id: 44526132
 }
 direct_counters {
   preamble {
-    id: 318770551
+    id: 324013431
     name: "FabricIngress.process_set_source_sink.counter_set_sink"
     alias: "counter_set_sink"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33561619
+  direct_table_id: 35265555
 }
 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: 318799210
+    id: 324042090
     name: "FabricIngress.forwarding.routing_v6_counter"
     alias: "routing_v6_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33614081
+  direct_table_id: 49342721
 }
 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: 318778156
+    id: 321989420
     name: "FabricIngress.next.xconnect_counter"
     alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33596977
+  direct_table_id: 48735793
 }
 direct_counters {
   preamble {
-    id: 318769096
+    id: 326633416
     name: "FabricIngress.next.simple_counter"
     alias: "simple_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33571723
+  direct_table_id: 39142283
 }
 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: 318800047
+    id: 322470063
     name: "FabricEgress.process_int_main.process_int_source.counter_int_source"
     alias: "counter_int_source"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33612258
+  direct_table_id: 44818914
 }
 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"
   }
@@ -1897,7 +1898,7 @@
 }
 meters {
   preamble {
-    id: 335568260
+    id: 349920644
     name: "FabricIngress.bng_ingress.downstream.m_prio"
     alias: "m_prio"
   }
@@ -1908,7 +1909,7 @@
 }
 controller_packet_metadata {
   preamble {
-    id: 67146229
+    id: 81826293
     name: "packet_in"
     alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
@@ -1926,7 +1927,7 @@
 }
 controller_packet_metadata {
   preamble {
-    id: 67121543
+    id: 76689799
     name: "packet_out"
     alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
@@ -1938,8 +1939,13 @@
   }
   metadata {
     id: 2
+    name: "do_forwarding"
+    bitwidth: 1
+  }
+  metadata {
+    id: 3
     name: "_pad"
-    bitwidth: 7
+    bitwidth: 6
   }
 }
 type_info {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index f61bb56..6b7a209 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -4,52 +4,60 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
+        ["tmp_0", 1, false],
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp", 16, false],
-        ["tmp_0", 16, false],
-        ["tmp_1", 4, false],
+        ["tmp_1", 16, false],
+        ["tmp_3", 16, false],
+        ["tmp_5", 4, false],
+        ["tmp_6", 16, false],
         ["tmp_2", 32, false],
-        ["tmp_3", 32, false],
+        ["tmp_4", 32, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["fabric_metadata_t._ip_eth_type0", 16, false],
-        ["fabric_metadata_t._vlan_id1", 12, false],
-        ["fabric_metadata_t._vlan_pri2", 3, false],
-        ["fabric_metadata_t._vlan_cfi3", 1, false],
-        ["fabric_metadata_t._mpls_label4", 20, false],
-        ["fabric_metadata_t._mpls_ttl5", 8, false],
-        ["fabric_metadata_t._skip_forwarding6", 1, false],
-        ["fabric_metadata_t._skip_next7", 1, false],
-        ["fabric_metadata_t._fwd_type8", 3, false],
-        ["fabric_metadata_t._next_id9", 32, false],
-        ["fabric_metadata_t._is_multicast10", 1, false],
-        ["fabric_metadata_t._is_controller_packet_out11", 1, false],
-        ["fabric_metadata_t._ip_proto12", 8, false],
-        ["fabric_metadata_t._l4_sport13", 16, false],
-        ["fabric_metadata_t._l4_dport14", 16, false],
-        ["fabric_metadata_t._ipv4_src_addr15", 32, false],
-        ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
-        ["fabric_metadata_t._int_meta_source17", 1, false],
-        ["fabric_metadata_t._int_meta_transit18", 1, false],
-        ["fabric_metadata_t._int_meta_sink19", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id20", 32, false],
-        ["fabric_metadata_t._int_meta_new_words21", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes22", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp23", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp24", 32, false],
-        ["_padding_0", 7, false]
+        ["userMetadata._ip_eth_type0", 16, false],
+        ["userMetadata._vlan_id1", 12, false],
+        ["userMetadata._vlan_pri2", 3, false],
+        ["userMetadata._vlan_cfi3", 1, false],
+        ["userMetadata._mpls_label4", 20, false],
+        ["userMetadata._mpls_ttl5", 8, false],
+        ["userMetadata._skip_forwarding6", 1, false],
+        ["userMetadata._skip_next7", 1, false],
+        ["userMetadata._fwd_type8", 3, false],
+        ["userMetadata._next_id9", 32, false],
+        ["userMetadata._is_multicast10", 1, false],
+        ["userMetadata._is_controller_packet_out11", 1, false],
+        ["userMetadata._ip_proto12", 8, false],
+        ["userMetadata._l4_sport13", 16, false],
+        ["userMetadata._l4_dport14", 16, false],
+        ["userMetadata._ipv4_src_addr15", 32, false],
+        ["userMetadata._ipv4_dst_addr16", 32, false],
+        ["userMetadata._int_meta_source17", 1, false],
+        ["userMetadata._int_meta_transit18", 1, false],
+        ["userMetadata._int_meta_sink19", 1, false],
+        ["userMetadata._int_meta_switch_id20", 32, false],
+        ["userMetadata._int_meta_new_words21", 8, false],
+        ["userMetadata._int_meta_new_bytes22", 16, false],
+        ["userMetadata._int_meta_ig_tstamp23", 32, false],
+        ["userMetadata._int_meta_eg_tstamp24", 32, false],
+        ["_padding_0", 6, false]
+      ]
+    },
+    {
+      "name" : "packet_out_header_t",
+      "id" : 1,
+      "fields" : [
+        ["egress_port", 9, false],
+        ["do_forwarding", 1, false],
+        ["_pad", 6, false]
       ]
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "fields" : [
         ["ingress_port", 9, false],
         ["egress_spec", 9, false],
         ["egress_port", 9, false],
-        ["clone_spec", 32, false],
         ["instance_type", 32, false],
-        ["drop", 1, false],
-        ["recirculate_port", 16, false],
         ["packet_length", 32, false],
         ["enq_timestamp", 32, false],
         ["enq_qdepth", 19, false],
@@ -57,20 +65,17 @@
         ["deq_qdepth", 19, false],
         ["ingress_global_timestamp", 48, false],
         ["egress_global_timestamp", 48, false],
-        ["lf_field_list", 32, false],
         ["mcast_grp", 16, false],
-        ["resubmit_flag", 32, false],
         ["egress_rid", 16, false],
-        ["recirculate_flag", 32, false],
         ["checksum_error", 1, false],
         ["parser_error", 32, false],
         ["priority", 3, false],
-        ["_padding", 2, false]
+        ["_padding", 3, false]
       ]
     },
     {
       "name" : "ethernet_t",
-      "id" : 2,
+      "id" : 3,
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false]
@@ -78,7 +83,7 @@
     },
     {
       "name" : "vlan_tag_t",
-      "id" : 3,
+      "id" : 4,
       "fields" : [
         ["eth_type", 16, false],
         ["pri", 3, false],
@@ -88,14 +93,14 @@
     },
     {
       "name" : "eth_type_t",
-      "id" : 4,
+      "id" : 5,
       "fields" : [
         ["value", 16, false]
       ]
     },
     {
       "name" : "mpls_t",
-      "id" : 5,
+      "id" : 6,
       "fields" : [
         ["label", 20, false],
         ["tc", 3, false],
@@ -105,7 +110,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 6,
+      "id" : 7,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -124,7 +129,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 7,
+      "id" : 8,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -141,7 +146,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -151,7 +156,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -162,14 +167,6 @@
       ]
     },
     {
-      "name" : "packet_out_header_t",
-      "id" : 10,
-      "fields" : [
-        ["egress_port", 9, false],
-        ["_pad", 7, false]
-      ]
-    },
-    {
       "name" : "packet_in_header_t",
       "id" : 11,
       "fields" : [
@@ -278,169 +275,176 @@
   ],
   "headers" : [
     {
-      "name" : "scalars",
+      "name" : "tmp",
       "id" : 0,
+      "header_type" : "packet_out_header_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "scalars",
+      "id" : 1,
       "header_type" : "scalars_0",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "header_type" : "standard_metadata",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "ethernet",
-      "id" : 2,
+      "id" : 3,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "vlan_tag",
-      "id" : 3,
-      "header_type" : "vlan_tag_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "inner_vlan_tag",
       "id" : 4,
       "header_type" : "vlan_tag_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "eth_type",
+      "name" : "inner_vlan_tag",
       "id" : 5,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "eth_type",
+      "id" : 6,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "mpls",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 10,
+      "id" : 11,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 11,
+      "id" : 12,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_shim",
-      "id" : 13,
+      "id" : 14,
       "header_type" : "intl4_shim_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_header",
-      "id" : 14,
+      "id" : 15,
       "header_type" : "int_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_switch_id",
-      "id" : 15,
+      "id" : 16,
       "header_type" : "int_switch_id_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_port_ids",
-      "id" : 16,
+      "id" : 17,
       "header_type" : "int_port_ids_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_hop_latency",
-      "id" : 17,
+      "id" : 18,
       "header_type" : "int_hop_latency_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_occupancy",
-      "id" : 18,
+      "id" : 19,
       "header_type" : "int_q_occupancy_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_ingress_tstamp",
-      "id" : 19,
+      "id" : 20,
       "header_type" : "int_ingress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tstamp",
-      "id" : 20,
+      "id" : 21,
       "header_type" : "int_egress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_congestion",
-      "id" : 21,
+      "id" : 22,
       "header_type" : "int_q_congestion_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tx_util",
-      "id" : 22,
+      "id" : 23,
       "header_type" : "int_egress_port_tx_util_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_tail",
-      "id" : 23,
+      "id" : 24,
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
@@ -493,10 +497,11 @@
               "type" : "hexstr",
               "value" : "0x00ff",
               "mask" : null,
-              "next_state" : "parse_packet_out"
+              "next_state" : "check_packet_out"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -509,12 +514,229 @@
           ]
         },
         {
-          "name" : "parse_packet_out",
+          "name" : "check_packet_out",
           "id" : 1,
           "parser_ops" : [
             {
               "parameters" : [
                 {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_6"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 16]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "parameters" : [
+                    {
+                      "type" : "header",
+                      "value" : "tmp"
+                    }
+                  ],
+                  "op" : "add_header"
+                }
+              ],
+              "op" : "primitive"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "egress_port"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x7"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01ff"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "do_forwarding"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "_pad"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "tmp_6"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x3f"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x00",
+              "mask" : null,
+              "next_state" : "parse_packet_out_and_accept"
+            },
+            {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : "strip_packet_out"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_0"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_packet_out_and_accept",
+          "id" : 2,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
                   "type" : "regular",
                   "value" : "packet_out"
                 }
@@ -524,7 +746,32 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "strip_packet_out",
+          "id" : 3,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "hexstr",
+                  "value" : "0x00000010"
+                }
+              ],
+              "op" : "advance"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -533,7 +780,7 @@
         },
         {
           "name" : "parse_ethernet",
-          "id" : 2,
+          "id" : 4,
           "parser_ops" : [
             {
               "parameters" : [
@@ -548,7 +795,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+                  "value" : ["scalars", "userMetadata._vlan_id1"]
                 },
                 {
                   "type" : "hexstr",
@@ -561,7 +808,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -591,7 +838,8 @@
               "next_state" : "parse_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -599,13 +847,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
         {
           "name" : "parse_vlan_tag",
-          "id" : 3,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -620,7 +868,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -638,7 +886,8 @@
               "next_state" : "parse_inner_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -646,13 +895,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
         {
           "name" : "parse_inner_vlan_tag",
-          "id" : 4,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -666,7 +915,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -675,7 +925,7 @@
         },
         {
           "name" : "parse_eth_type",
-          "id" : 5,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -701,7 +951,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -715,7 +966,7 @@
         },
         {
           "name" : "parse_mpls",
-          "id" : 6,
+          "id" : 8,
           "parser_ops" : [
             {
               "parameters" : [
@@ -730,7 +981,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+                  "value" : ["scalars", "userMetadata._mpls_label4"]
                 },
                 {
                   "type" : "field",
@@ -743,7 +994,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+                  "value" : ["scalars", "userMetadata._mpls_ttl5"]
                 },
                 {
                   "type" : "field",
@@ -756,7 +1007,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_5"]
                 },
                 {
                   "type" : "lookahead",
@@ -774,7 +1025,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -782,13 +1034,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_5"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 7,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -803,7 +1055,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+                  "value" : ["scalars", "userMetadata._ip_proto12"]
                 },
                 {
                   "type" : "field",
@@ -816,7 +1068,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+                  "value" : ["scalars", "userMetadata._ip_eth_type0"]
                 },
                 {
                   "type" : "hexstr",
@@ -829,7 +1081,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+                  "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
                 },
                 {
                   "type" : "field",
@@ -842,7 +1094,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+                  "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
                 },
                 {
                   "type" : "field",
@@ -885,7 +1137,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -899,7 +1152,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 8,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -914,7 +1167,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                  "value" : ["scalars", "userMetadata._l4_sport13"]
                 },
                 {
                   "type" : "field",
@@ -927,7 +1180,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                  "value" : ["scalars", "userMetadata._l4_dport14"]
                 },
                 {
                   "type" : "field",
@@ -939,7 +1192,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int"
             }
@@ -948,7 +1202,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 9,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -963,7 +1217,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                  "value" : ["scalars", "userMetadata._l4_sport13"]
                 },
                 {
                   "type" : "field",
@@ -976,7 +1230,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                  "value" : ["scalars", "userMetadata._l4_dport14"]
                 },
                 {
                   "type" : "field",
@@ -988,7 +1242,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int"
             }
@@ -1002,7 +1257,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 10,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1016,7 +1271,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1025,7 +1281,7 @@
         },
         {
           "name" : "parse_int",
-          "id" : 11,
+          "id" : 13,
           "parser_ops" : [],
           "transitions" : [
             {
@@ -1035,7 +1291,8 @@
               "next_state" : "parse_intl4_shim"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1049,7 +1306,7 @@
         },
         {
           "name" : "parse_intl4_shim",
-          "id" : 12,
+          "id" : 14,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1078,7 +1335,8 @@
               "next_state" : "parse_intl4_tail"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int_data"
             }
@@ -1092,11 +1350,12 @@
         },
         {
           "name" : "parse_int_data",
-          "id" : 13,
+          "id" : 15,
           "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1105,7 +1364,7 @@
         },
         {
           "name" : "parse_intl4_tail",
-          "id" : 14,
+          "id" : 16,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1119,7 +1378,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1136,11 +1396,12 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 268,
+        "line" : 283,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "ipv4", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "ipv4", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"],
+      "primitives" : []
     }
   ],
   "meter_arrays" : [],
@@ -1499,7 +1760,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
+              "value" : ["scalars", "userMetadata._int_meta_source17"]
             },
             {
               "type" : "expression",
@@ -1535,7 +1796,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -1564,7 +1825,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -1611,7 +1872,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -1642,7 +1903,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+              "value" : ["scalars", "userMetadata._fwd_type8"]
             },
             {
               "type" : "runtime_data",
@@ -1673,7 +1934,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -1704,7 +1965,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             },
             {
               "type" : "hexstr",
@@ -1723,7 +1984,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -1754,7 +2015,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -1791,7 +2052,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -1836,7 +2097,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -1918,7 +2179,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -1965,7 +2226,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -2027,7 +2288,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -2178,7 +2439,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             },
             {
               "type" : "runtime_data",
@@ -2285,7 +2546,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_multicast10"]
+              "value" : ["scalars", "userMetadata._is_multicast10"]
             },
             {
               "type" : "expression",
@@ -2312,7 +2573,7 @@
       ]
     },
     {
-      "name" : "act",
+      "name" : "packetio25",
       "id" : 29,
       "runtime_data" : [],
       "primitives" : [
@@ -2355,7 +2616,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out11"]
+              "value" : ["scalars", "userMetadata._is_controller_packet_out11"]
             },
             {
               "type" : "expression",
@@ -2392,7 +2653,7 @@
       ]
     },
     {
-      "name" : "act_0",
+      "name" : "filtering111",
       "id" : 30,
       "runtime_data" : [],
       "primitives" : [
@@ -2401,7 +2662,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "field",
@@ -2420,7 +2681,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             },
             {
               "type" : "field",
@@ -2439,7 +2700,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             },
             {
               "type" : "field",
@@ -2456,7 +2717,7 @@
       ]
     },
     {
-      "name" : "act_1",
+      "name" : "filtering127",
       "id" : 31,
       "runtime_data" : [],
       "primitives" : [
@@ -2465,7 +2726,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+              "value" : ["scalars", "userMetadata._mpls_ttl5"]
             },
             {
               "type" : "hexstr",
@@ -2482,7 +2743,7 @@
       ]
     },
     {
-      "name" : "act_2",
+      "name" : "port_counter31",
       "id" : 32,
       "runtime_data" : [],
       "primitives" : [
@@ -2540,7 +2801,7 @@
       ]
     },
     {
-      "name" : "act_3",
+      "name" : "port_counter34",
       "id" : 33,
       "runtime_data" : [],
       "primitives" : [
@@ -2549,7 +2810,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             },
             {
               "type" : "expression",
@@ -2585,7 +2846,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             }
           ],
           "source_info" : {
@@ -2691,7 +2952,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 157,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -2982,7 +3243,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             }
           ],
           "source_info" : {
@@ -3109,7 +3370,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 152,
+            "line" : 153,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -3131,7 +3392,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
+              "value" : ["scalars", "userMetadata._int_meta_transit18"]
             },
             {
               "type" : "expression",
@@ -3160,7 +3421,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             },
             {
               "type" : "runtime_data",
@@ -3258,7 +3519,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3272,7 +3533,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3300,7 +3561,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3314,7 +3575,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3383,7 +3644,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3397,7 +3658,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3425,7 +3686,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3439,7 +3700,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3574,7 +3835,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3588,7 +3849,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3616,7 +3877,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3630,7 +3891,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3744,7 +4005,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3758,7 +4019,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3786,7 +4047,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3800,7 +4061,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3980,7 +4241,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3994,7 +4255,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4022,7 +4283,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4036,7 +4297,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4184,7 +4445,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4198,7 +4459,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4226,7 +4487,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4240,7 +4501,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4454,7 +4715,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4468,7 +4729,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4496,7 +4757,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4510,7 +4771,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4564,7 +4825,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
@@ -4579,7 +4840,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4593,7 +4854,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4621,7 +4882,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4635,7 +4896,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4755,7 +5016,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
@@ -4770,7 +5031,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4784,7 +5045,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4812,7 +5073,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4826,7 +5087,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4914,7 +5175,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
@@ -4929,7 +5190,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4943,7 +5204,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4971,7 +5232,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4985,7 +5246,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5139,7 +5400,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
@@ -5154,7 +5415,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5168,7 +5429,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5196,7 +5457,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5210,7 +5471,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5343,7 +5604,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
@@ -5358,7 +5619,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5372,7 +5633,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5400,7 +5661,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5414,7 +5675,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5613,7 +5874,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
@@ -5628,7 +5889,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5642,7 +5903,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5670,7 +5931,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5684,7 +5945,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5851,7 +6112,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
@@ -5866,7 +6127,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5880,7 +6141,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5908,7 +6169,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5922,7 +6183,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6155,7 +6416,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id20"]
             }
           ],
           "source_info" : {
@@ -6170,7 +6431,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6184,7 +6445,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6212,7 +6473,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6226,7 +6487,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6301,7 +6562,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6315,7 +6576,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6343,7 +6604,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6357,7 +6618,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6445,7 +6706,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6459,7 +6720,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6487,7 +6748,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6501,7 +6762,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6623,7 +6884,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6637,7 +6898,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6665,7 +6926,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6679,7 +6940,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6771,7 +7032,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6785,7 +7046,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6813,7 +7074,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6827,7 +7088,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6953,7 +7214,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6967,7 +7228,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6995,7 +7256,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7009,7 +7270,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7154,7 +7415,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7168,7 +7429,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7196,7 +7457,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7210,7 +7471,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7389,7 +7650,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7403,7 +7664,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7431,7 +7692,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7445,7 +7706,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7514,7 +7775,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7528,7 +7789,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7556,7 +7817,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7570,7 +7831,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7673,7 +7934,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7687,7 +7948,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7715,7 +7976,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7729,7 +7990,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7851,7 +8112,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7865,7 +8126,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7893,7 +8154,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7907,7 +8168,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8063,7 +8324,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8077,7 +8338,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8105,7 +8366,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8119,7 +8380,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8245,7 +8506,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8259,7 +8520,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8287,7 +8548,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8301,7 +8562,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8461,7 +8722,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8475,7 +8736,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8503,7 +8764,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8517,7 +8778,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8696,7 +8957,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8710,7 +8971,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8738,7 +8999,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8752,7 +9013,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8965,7 +9226,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8979,7 +9240,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9007,7 +9268,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -9021,7 +9282,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9075,7 +9336,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             }
           ],
           "source_info" : {
@@ -9116,7 +9377,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             }
           ],
           "source_info" : {
@@ -9173,7 +9434,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+              "value" : ["scalars", "userMetadata._mpls_ttl5"]
             }
           ],
           "source_info" : {
@@ -9197,7 +9458,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -9233,7 +9494,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             }
           ],
           "source_info" : {
@@ -9252,7 +9513,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             }
           ],
           "source_info" : {
@@ -9276,7 +9537,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -9290,7 +9551,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             }
           ],
           "source_info" : {
@@ -9347,7 +9608,7 @@
       ]
     },
     {
-      "name" : "act_4",
+      "name" : "packetio41",
       "id" : 77,
       "runtime_data" : [],
       "primitives" : [
@@ -9364,7 +9625,7 @@
       ]
     },
     {
-      "name" : "act_5",
+      "name" : "packetio44",
       "id" : 78,
       "runtime_data" : [],
       "primitives" : [
@@ -9415,7 +9676,7 @@
       ]
     },
     {
-      "name" : "act_6",
+      "name" : "next349",
       "id" : 79,
       "runtime_data" : [],
       "primitives" : [
@@ -9437,7 +9698,7 @@
       ]
     },
     {
-      "name" : "act_7",
+      "name" : "next376",
       "id" : 80,
       "runtime_data" : [],
       "primitives" : [
@@ -9459,7 +9720,7 @@
       ]
     },
     {
-      "name" : "act_8",
+      "name" : "next375",
       "id" : 81,
       "runtime_data" : [],
       "primitives" : [
@@ -9508,7 +9769,7 @@
       ]
     },
     {
-      "name" : "act_9",
+      "name" : "next380",
       "id" : 82,
       "runtime_data" : [],
       "primitives" : [
@@ -9530,7 +9791,7 @@
       ]
     },
     {
-      "name" : "act_10",
+      "name" : "next379",
       "id" : 83,
       "runtime_data" : [],
       "primitives" : [
@@ -9579,7 +9840,7 @@
       ]
     },
     {
-      "name" : "act_11",
+      "name" : "act",
       "id" : 84,
       "runtime_data" : [],
       "primitives" : [
@@ -9609,7 +9870,7 @@
       ]
     },
     {
-      "name" : "act_12",
+      "name" : "int_transit420",
       "id" : 85,
       "runtime_data" : [],
       "primitives" : [
@@ -9645,7 +9906,7 @@
       ]
     },
     {
-      "name" : "act_13",
+      "name" : "int_transit428",
       "id" : 86,
       "runtime_data" : [],
       "primitives" : [
@@ -9672,7 +9933,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       }
                     }
                   },
@@ -9694,7 +9955,7 @@
       ]
     },
     {
-      "name" : "act_14",
+      "name" : "int_transit425",
       "id" : 87,
       "runtime_data" : [],
       "primitives" : [
@@ -9743,7 +10004,7 @@
       ]
     },
     {
-      "name" : "act_15",
+      "name" : "int_transit431",
       "id" : 88,
       "runtime_data" : [],
       "primitives" : [
@@ -9770,7 +10031,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes22"]
                       }
                     }
                   },
@@ -9792,7 +10053,7 @@
       ]
     },
     {
-      "name" : "act_16",
+      "name" : "int_transit434",
       "id" : 89,
       "runtime_data" : [],
       "primitives" : [
@@ -9819,7 +10080,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words21"]
                       }
                     }
                   },
@@ -9854,7 +10115,7 @@
       "init_table" : "node_2",
       "tables" : [
         {
-          "name" : "tbl_act",
+          "name" : "tbl_packetio25",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -9870,10 +10131,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [29],
-          "actions" : ["act"],
+          "actions" : ["packetio25"],
           "base_default_next" : "node_4",
           "next_tables" : {
-            "act" : "node_4"
+            "packetio25" : "node_4"
           },
           "default_entry" : {
             "action_id" : 29,
@@ -9883,7 +10144,7 @@
           }
         },
         {
-          "name" : "tbl_act_0",
+          "name" : "tbl_filtering111",
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -9899,10 +10160,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [30],
-          "actions" : ["act_0"],
+          "actions" : ["filtering111"],
           "base_default_next" : "node_6",
           "next_tables" : {
-            "act_0" : "node_6"
+            "filtering111" : "node_6"
           },
           "default_entry" : {
             "action_id" : 30,
@@ -9912,7 +10173,7 @@
           }
         },
         {
-          "name" : "tbl_act_1",
+          "name" : "tbl_filtering127",
           "id" : 2,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -9928,10 +10189,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [31],
-          "actions" : ["act_1"],
+          "actions" : ["filtering127"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_1" : "FabricIngress.filtering.ingress_port_vlan"
+            "filtering127" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
             "action_id" : 31,
@@ -10021,7 +10282,7 @@
             {
               "match_type" : "exact",
               "name" : "ip_eth_type",
-              "target" : ["scalars", "fabric_metadata_t._ip_eth_type0"],
+              "target" : ["scalars", "userMetadata._ip_eth_type0"],
               "mask" : null
             }
           ],
@@ -10057,7 +10318,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -10100,7 +10361,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t._mpls_label4"],
+              "target" : ["scalars", "userMetadata._mpls_label4"],
               "mask" : null
             }
           ],
@@ -10137,7 +10398,7 @@
             {
               "match_type" : "lpm",
               "name" : "ipv4_dst",
-              "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"],
+              "target" : ["scalars", "userMetadata._ipv4_dst_addr16"],
               "mask" : null
             }
           ],
@@ -10181,19 +10442,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto12"],
+              "target" : ["scalars", "userMetadata._ip_proto12"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport13"],
+              "target" : ["scalars", "userMetadata._l4_sport13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport14"],
+              "target" : ["scalars", "userMetadata._l4_dport14"],
               "mask" : null
             },
             {
@@ -10287,7 +10548,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -10325,7 +10586,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -10359,7 +10620,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -10396,7 +10657,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -10421,7 +10682,7 @@
           }
         },
         {
-          "name" : "tbl_act_2",
+          "name" : "tbl_port_counter31",
           "id" : 13,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -10437,10 +10698,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [32],
-          "actions" : ["act_2"],
+          "actions" : ["port_counter31"],
           "base_default_next" : "node_25",
           "next_tables" : {
-            "act_2" : "node_25"
+            "port_counter31" : "node_25"
           },
           "default_entry" : {
             "action_id" : 32,
@@ -10450,7 +10711,7 @@
           }
         },
         {
-          "name" : "tbl_act_3",
+          "name" : "tbl_port_counter34",
           "id" : 14,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -10466,10 +10727,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [33],
-          "actions" : ["act_3"],
+          "actions" : ["port_counter34"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_3" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "port_counter34" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
             "action_id" : 33,
@@ -10532,23 +10793,23 @@
             "input" : [
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+                "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+                "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+                "value" : ["scalars", "userMetadata._ip_proto12"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                "value" : ["scalars", "userMetadata._l4_sport13"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                "value" : ["scalars", "userMetadata._l4_dport14"]
               }
             ]
           }
@@ -10575,7 +10836,7 @@
               }
             }
           },
-          "true_next" : "tbl_act",
+          "true_next" : "tbl_packetio25",
           "false_next" : "node_4"
         },
         {
@@ -10598,7 +10859,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_0",
+          "true_next" : "tbl_filtering111",
           "false_next" : "node_6"
         },
         {
@@ -10628,7 +10889,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_1",
+          "true_next" : "tbl_filtering127",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -10638,26 +10899,23 @@
             "filename" : "fabric.p4",
             "line" : 69,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+            "source_fragment" : "fabric_metadata.skip_forwarding"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+                    "value" : ["scalars", "userMetadata._skip_forwarding6"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -10679,7 +10937,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10705,7 +10963,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10731,7 +10989,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10749,26 +11007,23 @@
             "filename" : "fabric.p4",
             "line" : 73,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_next == false"
+            "source_fragment" : "fabric_metadata.skip_next"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+                    "value" : ["scalars", "userMetadata._skip_next7"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -10798,7 +11053,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_2",
+          "true_next" : "tbl_port_counter31",
           "false_next" : "node_25"
         },
         {
@@ -10824,7 +11079,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_3",
+          "true_next" : "tbl_port_counter34",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -10841,7 +11096,7 @@
       "init_table" : "node_30",
       "tables" : [
         {
-          "name" : "tbl_act_4",
+          "name" : "tbl_packetio41",
           "id" : 16,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -10857,10 +11112,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [77],
-          "actions" : ["act_4"],
+          "actions" : ["packetio41"],
           "base_default_next" : "node_32",
           "next_tables" : {
-            "act_4" : "node_32"
+            "packetio41" : "node_32"
           },
           "default_entry" : {
             "action_id" : 77,
@@ -10870,7 +11125,7 @@
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_packetio44",
           "id" : 17,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -10886,10 +11141,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [78],
-          "actions" : ["act_5"],
+          "actions" : ["packetio44"],
           "base_default_next" : "node_34",
           "next_tables" : {
-            "act_5" : "node_34"
+            "packetio44" : "node_34"
           },
           "default_entry" : {
             "action_id" : 78,
@@ -10899,7 +11154,7 @@
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_next349",
           "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -10915,10 +11170,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [79],
-          "actions" : ["act_6"],
+          "actions" : ["next349"],
           "base_default_next" : "node_36",
           "next_tables" : {
-            "act_6" : "node_36"
+            "next349" : "node_36"
           },
           "default_entry" : {
             "action_id" : 79,
@@ -10998,7 +11253,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -11030,7 +11285,7 @@
           }
         },
         {
-          "name" : "tbl_act_7",
+          "name" : "tbl_next375",
           "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -11046,10 +11301,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [81],
-          "actions" : ["act_8"],
+          "actions" : ["next375"],
           "base_default_next" : "node_43",
           "next_tables" : {
-            "act_8" : "node_43"
+            "next375" : "node_43"
           },
           "default_entry" : {
             "action_id" : 81,
@@ -11059,7 +11314,7 @@
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_next376",
           "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -11075,10 +11330,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [80],
-          "actions" : ["act_7"],
+          "actions" : ["next376"],
           "base_default_next" : "node_49",
           "next_tables" : {
-            "act_7" : "node_49"
+            "next376" : "node_49"
           },
           "default_entry" : {
             "action_id" : 80,
@@ -11088,7 +11343,7 @@
           }
         },
         {
-          "name" : "tbl_act_9",
+          "name" : "tbl_next379",
           "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -11104,10 +11359,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [83],
-          "actions" : ["act_10"],
+          "actions" : ["next379"],
           "base_default_next" : "node_47",
           "next_tables" : {
-            "act_10" : "node_47"
+            "next379" : "node_47"
           },
           "default_entry" : {
             "action_id" : 83,
@@ -11117,7 +11372,7 @@
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_next380",
           "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -11133,10 +11388,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [82],
-          "actions" : ["act_9"],
+          "actions" : ["next380"],
           "base_default_next" : "node_49",
           "next_tables" : {
-            "act_9" : "node_49"
+            "next380" : "node_49"
           },
           "default_entry" : {
             "action_id" : 82,
@@ -11170,13 +11425,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport13"],
+              "target" : ["scalars", "userMetadata._l4_sport13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport14"],
+              "target" : ["scalars", "userMetadata._l4_dport14"],
               "mask" : null
             }
           ],
@@ -11201,7 +11456,7 @@
           }
         },
         {
-          "name" : "tbl_act_11",
+          "name" : "tbl_act",
           "id" : 27,
           "key" : [],
           "match_type" : "exact",
@@ -11211,10 +11466,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [84],
-          "actions" : ["act_11"],
+          "actions" : ["act"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_11" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
             "action_id" : 84,
@@ -11261,7 +11516,7 @@
           }
         },
         {
-          "name" : "tbl_act_12",
+          "name" : "tbl_int_transit420",
           "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -11277,10 +11532,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [85],
-          "actions" : ["act_12"],
+          "actions" : ["int_transit420"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_12" : "node_57"
+            "int_transit420" : "node_57"
           },
           "default_entry" : {
             "action_id" : 85,
@@ -11672,25 +11927,25 @@
           "direct_meters" : null,
           "action_ids" : [56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 37],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_13",
+          "base_default_next" : "tbl_int_transit425",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_13",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_13",
-            "NoAction" : "tbl_act_13"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_int_transit425",
+            "NoAction" : "tbl_int_transit425"
           },
           "default_entry" : {
             "action_id" : 37,
@@ -12006,7 +12261,7 @@
           ]
         },
         {
-          "name" : "tbl_act_13",
+          "name" : "tbl_int_transit425",
           "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -12022,10 +12277,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [87],
-          "actions" : ["act_14"],
+          "actions" : ["int_transit425"],
           "base_default_next" : "node_61",
           "next_tables" : {
-            "act_14" : "node_61"
+            "int_transit425" : "node_61"
           },
           "default_entry" : {
             "action_id" : 87,
@@ -12035,7 +12290,7 @@
           }
         },
         {
-          "name" : "tbl_act_14",
+          "name" : "tbl_int_transit428",
           "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -12051,10 +12306,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [86],
-          "actions" : ["act_13"],
+          "actions" : ["int_transit428"],
           "base_default_next" : "node_63",
           "next_tables" : {
-            "act_13" : "node_63"
+            "int_transit428" : "node_63"
           },
           "default_entry" : {
             "action_id" : 86,
@@ -12064,7 +12319,7 @@
           }
         },
         {
-          "name" : "tbl_act_15",
+          "name" : "tbl_int_transit431",
           "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -12080,10 +12335,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [88],
-          "actions" : ["act_15"],
+          "actions" : ["int_transit431"],
           "base_default_next" : "node_65",
           "next_tables" : {
-            "act_15" : "node_65"
+            "int_transit431" : "node_65"
           },
           "default_entry" : {
             "action_id" : 88,
@@ -12093,7 +12348,7 @@
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "tbl_int_transit434",
           "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -12109,10 +12364,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [89],
-          "actions" : ["act_16"],
+          "actions" : ["int_transit434"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_16" : null
+            "int_transit434" : null
           },
           "default_entry" : {
             "action_id" : 89,
@@ -12128,33 +12383,23 @@
           "name" : "node_30",
           "id" : 10,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 39,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
+            "filename" : "fabric.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out11"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._is_controller_packet_out11"]
               }
             }
           },
-          "true_next" : "tbl_act_4",
+          "true_next" : "tbl_packetio41",
           "false_next" : "node_32"
         },
         {
@@ -12180,7 +12425,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_packetio44",
           "false_next" : "node_34"
         },
         {
@@ -12199,21 +12444,11 @@
               "left" : {
                 "type" : "expression",
                 "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast10"]
-                      }
-                    }
-                  },
+                  "op" : "d2b",
+                  "left" : null,
                   "right" : {
-                    "type" : "bool",
-                    "value" : true
+                    "type" : "field",
+                    "value" : ["scalars", "userMetadata._is_multicast10"]
                   }
                 }
               },
@@ -12233,7 +12468,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_next349",
           "false_next" : "node_36"
         },
         {
@@ -12251,7 +12486,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+                "value" : ["scalars", "userMetadata._mpls_label4"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -12305,7 +12540,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_next375",
           "false_next" : "node_45"
         },
         {
@@ -12331,7 +12566,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_8",
+          "true_next" : "tbl_next376",
           "false_next" : "node_49"
         },
         {
@@ -12364,7 +12599,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                    "value" : ["scalars", "userMetadata._fwd_type8"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -12374,7 +12609,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_next379",
           "false_next" : "node_49"
         },
         {
@@ -12400,7 +12635,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_next380",
           "false_next" : "node_49"
         },
         {
@@ -12487,29 +12722,19 @@
           "name" : "node_50",
           "id" : 20,
           "source_info" : {
-            "filename" : "include/int/int_main.p4",
-            "line" : 106,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.int_meta.source == true"
+            "filename" : "fabric.p4",
+            "line" : 112,
+            "column" : 36,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._int_meta_source17"]
               }
             }
           },
@@ -12537,7 +12762,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_11"
+          "true_next" : "tbl_act"
         },
         {
           "name" : "node_55",
@@ -12546,30 +12771,27 @@
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
             "column" : 12,
-            "source_fragment" : "fmeta.int_meta.transit == false"
+            "source_fragment" : "fmeta.int_meta.transit"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
+                    "value" : ["scalars", "userMetadata._int_meta_transit18"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_12",
+          "true_next" : "tbl_int_transit420",
           "false_next" : "node_57"
         },
         {
@@ -12616,7 +12838,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_int_transit428",
           "false_next" : "node_63"
         },
         {
@@ -12639,7 +12861,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
+          "true_next" : "tbl_int_transit431",
           "false_next" : "node_65"
         },
         {
@@ -12663,7 +12885,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_16"
+          "true_next" : "tbl_int_transit434"
         }
       ]
     }
@@ -12750,33 +12972,21 @@
       ["standard_metadata", "egress_global_timestamp"]
     ],
     [
-      "intrinsic_metadata.lf_field_list",
-      ["standard_metadata", "lf_field_list"]
-    ],
-    [
       "intrinsic_metadata.mcast_grp",
       ["standard_metadata", "mcast_grp"]
     ],
     [
-      "intrinsic_metadata.resubmit_flag",
-      ["standard_metadata", "resubmit_flag"]
-    ],
-    [
       "intrinsic_metadata.egress_rid",
       ["standard_metadata", "egress_rid"]
     ],
     [
-      "intrinsic_metadata.recirculate_flag",
-      ["standard_metadata", "recirculate_flag"]
-    ],
-    [
       "intrinsic_metadata.priority",
       ["standard_metadata", "priority"]
     ]
   ],
   "program" : "fabric.p4",
   "__meta__" : {
-    "version" : [2, 18],
+    "version" : [2, 23],
     "compiler" : "https://github.com/p4lang/p4c"
   }
 }
\ No newline at end of file
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index add34cf..09d2757 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -3,7 +3,7 @@
 }
 tables {
   preamble {
-    id: 33581620
+    id: 44526132
     name: "FabricIngress.process_set_source_sink.tb_set_source"
     alias: "tb_set_source"
   }
@@ -14,20 +14,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16778827
+    id: 21235275
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318787614
+  const_default_action_id: 28485346
+  direct_resource_ids: 318984222
   size: 511
 }
 tables {
   preamble {
-    id: 33611649
+    id: 43310977
     name: "FabricIngress.filtering.ingress_port_vlan"
     alias: "ingress_port_vlan"
   }
@@ -50,21 +50,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: 1024
 }
 tables {
   preamble {
-    id: 33596298
+    id: 49718154
     name: "FabricIngress.filtering.fwd_classifier"
     alias: "fwd_classifier"
   }
@@ -93,15 +93,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"
   }
@@ -118,20 +118,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"
   }
@@ -142,20 +142,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"
   }
@@ -166,13 +166,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
   }
@@ -180,7 +180,7 @@
 }
 tables {
   preamble {
-    id: 33618978
+    id: 44104738
     name: "FabricIngress.acl.acl"
     alias: "acl"
   }
@@ -257,27 +257,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"
   }
@@ -288,20 +288,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16790685
+    id: 22099101
   }
   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: 33596977
+    id: 48735793
     name: "FabricIngress.next.xconnect"
     alias: "xconnect"
   }
@@ -318,23 +318,23 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16842190
+    id: 24640974
   }
   action_refs {
-    id: 16837052
+    id: 30599612
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318778156
+  const_default_action_id: 28485346
+  direct_resource_ids: 321989420
   size: 1024
 }
 tables {
   preamble {
-    id: 33608588
+    id: 47960972
     name: "FabricIngress.next.hashed"
     alias: "hashed"
   }
@@ -345,27 +345,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"
   }
@@ -376,20 +376,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: 33612258
+    id: 44818914
     name: "FabricEgress.process_int_main.process_int_source.tb_int_source"
     alias: "tb_int_source"
   }
@@ -418,20 +418,20 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16785857
+    id: 20062657
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318800047
+  const_default_action_id: 28485346
+  direct_resource_ids: 322470063
   size: 1024
 }
 tables {
   preamble {
-    id: 33599867
+    id: 34910587
     name: "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
     alias: "tb_int_insert"
   }
@@ -442,19 +442,19 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16780783
+    id: 29232623
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
+  const_default_action_id: 28485346
   size: 1
 }
 tables {
   preamble {
-    id: 33599342
+    id: 49262446
     name: "FabricEgress.egress_next.egress_vlan"
     alias: "egress_vlan"
   }
@@ -471,51 +471,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: 16778827
+    id: 21235275
     name: "FabricIngress.process_set_source_sink.int_set_source"
     alias: "int_set_source"
   }
 }
 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"
   }
@@ -527,7 +527,7 @@
 }
 actions {
   preamble {
-    id: 16840921
+    id: 25032921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
   }
@@ -539,7 +539,7 @@
 }
 actions {
   preamble {
-    id: 16811012
+    id: 21791748
     name: "FabricIngress.forwarding.set_next_id_bridging"
     alias: "set_next_id_bridging"
   }
@@ -551,7 +551,7 @@
 }
 actions {
   preamble {
-    id: 16827758
+    id: 30066030
     name: "FabricIngress.forwarding.pop_mpls_and_next"
     alias: "pop_mpls_and_next"
   }
@@ -563,7 +563,7 @@
 }
 actions {
   preamble {
-    id: 16777434
+    id: 19792090
     name: "FabricIngress.forwarding.set_next_id_routing_v4"
     alias: "set_next_id_routing_v4"
   }
@@ -575,14 +575,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"
   }
@@ -594,14 +594,14 @@
 }
 actions {
   preamble {
-    id: 16829684
+    id: 23579892
     name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16781601
+    id: 16912673
     name: "FabricIngress.acl.set_clone_session_id"
     alias: "set_clone_session_id"
   }
@@ -613,21 +613,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"
   }
@@ -639,7 +639,7 @@
 }
 actions {
   preamble {
-    id: 16842190
+    id: 24640974
     name: "FabricIngress.next.output_xconnect"
     alias: "output_xconnect"
   }
@@ -651,7 +651,7 @@
 }
 actions {
   preamble {
-    id: 16837052
+    id: 30599612
     name: "FabricIngress.next.set_next_id_xconnect"
     alias: "set_next_id_xconnect"
   }
@@ -663,7 +663,7 @@
 }
 actions {
   preamble {
-    id: 16815357
+    id: 27301117
     name: "FabricIngress.next.output_hashed"
     alias: "output_hashed"
   }
@@ -675,7 +675,7 @@
 }
 actions {
   preamble {
-    id: 16791402
+    id: 20985706
     name: "FabricIngress.next.routing_hashed"
     alias: "routing_hashed"
   }
@@ -697,7 +697,7 @@
 }
 actions {
   preamble {
-    id: 16779255
+    id: 27920375
     name: "FabricIngress.next.mpls_routing_hashed"
     alias: "mpls_routing_hashed"
   }
@@ -724,7 +724,7 @@
 }
 actions {
   preamble {
-    id: 16779917
+    id: 21629581
     name: "FabricIngress.next.set_mcast_group_id"
     alias: "set_mcast_group_id"
   }
@@ -736,14 +736,15 @@
 }
 actions {
   preamble {
-    id: 16800567
+    id: 21257015
     name: "NoAction"
     alias: "NoAction"
+    annotations: "@noWarn(\"unused\")"
   }
 }
 actions {
   preamble {
-    id: 16785857
+    id: 20062657
     name: "FabricEgress.process_int_main.process_int_source.int_source_dscp"
     alias: "int_source_dscp"
   }
@@ -770,7 +771,7 @@
 }
 actions {
   preamble {
-    id: 16780783
+    id: 29232623
     name: "FabricEgress.process_int_main.process_int_transit.init_metadata"
     alias: "init_metadata"
   }
@@ -782,39 +783,39 @@
 }
 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: 302011205
+    id: 314528581
     name: "FabricIngress.port_counters_control.egress_port_counter"
     alias: "egress_port_counter"
   }
@@ -825,7 +826,7 @@
 }
 counters {
   preamble {
-    id: 302002771
+    id: 312947283
     name: "FabricIngress.port_counters_control.ingress_port_counter"
     alias: "ingress_port_counter"
   }
@@ -836,139 +837,139 @@
 }
 direct_counters {
   preamble {
-    id: 318787614
+    id: 318984222
     name: "FabricIngress.process_set_source_sink.counter_set_source"
     alias: "counter_set_source"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33581620
+  direct_table_id: 44526132
 }
 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: 318778156
+    id: 321989420
     name: "FabricIngress.next.xconnect_counter"
     alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33596977
+  direct_table_id: 48735793
 }
 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: 318800047
+    id: 322470063
     name: "FabricEgress.process_int_main.process_int_source.counter_int_source"
     alias: "counter_int_source"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33612258
+  direct_table_id: 44818914
 }
 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
 }
 controller_packet_metadata {
   preamble {
-    id: 67146229
+    id: 81826293
     name: "packet_in"
     alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
@@ -986,7 +987,7 @@
 }
 controller_packet_metadata {
   preamble {
-    id: 67121543
+    id: 76689799
     name: "packet_out"
     alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
@@ -998,8 +999,13 @@
   }
   metadata {
     id: 2
+    name: "do_forwarding"
+    bitwidth: 1
+  }
+  metadata {
+    id: 3
     name: "_pad"
-    bitwidth: 7
+    bitwidth: 6
   }
 }
 type_info {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index dfe1598..800a3c5 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -4,68 +4,75 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
+        ["tmp_0", 1, false],
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp_0", 16, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
-        ["tmp", 32, false],
-        ["tmp_3", 32, false],
-        ["spgw_tmp", 1, false],
+        ["tmp_3", 16, false],
+        ["tmp_5", 4, false],
+        ["tmp_6", 16, false],
+        ["tmp_2", 32, false],
+        ["tmp_4", 32, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["fabric_metadata_t._ip_eth_type0", 16, false],
-        ["fabric_metadata_t._vlan_id1", 12, false],
-        ["fabric_metadata_t._vlan_pri2", 3, false],
-        ["fabric_metadata_t._vlan_cfi3", 1, false],
-        ["fabric_metadata_t._mpls_label4", 20, false],
-        ["fabric_metadata_t._mpls_ttl5", 8, false],
-        ["fabric_metadata_t._skip_forwarding6", 1, false],
-        ["fabric_metadata_t._skip_next7", 1, false],
-        ["fabric_metadata_t._fwd_type8", 3, false],
-        ["fabric_metadata_t._next_id9", 32, false],
-        ["fabric_metadata_t._is_multicast10", 1, false],
-        ["fabric_metadata_t._is_controller_packet_out11", 1, false],
-        ["fabric_metadata_t._ip_proto12", 8, false],
-        ["fabric_metadata_t._l4_sport13", 16, false],
-        ["fabric_metadata_t._l4_dport14", 16, false],
-        ["fabric_metadata_t._ipv4_src_addr15", 32, false],
-        ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
-        ["fabric_metadata_t._inner_l4_sport17", 16, false],
-        ["fabric_metadata_t._inner_l4_dport18", 16, false],
-        ["fabric_metadata_t._spgw_ipv4_len19", 16, false],
-        ["fabric_metadata_t._spgw_teid20", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_src_port21", 16, false],
-        ["fabric_metadata_t._spgw_tunnel_src_addr22", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_dst_addr23", 32, false],
-        ["fabric_metadata_t._spgw_ctr_id24", 32, false],
-        ["fabric_metadata_t._spgw_far_id25", 32, false],
-        ["fabric_metadata_t._spgw_src_iface26", 8, false],
-        ["fabric_metadata_t._spgw_skip_spgw27", 1, false],
-        ["fabric_metadata_t._spgw_notify_spgwc28", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_encap29", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_decap30", 1, false],
-        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr31", 1, false],
-        ["fabric_metadata_t._int_meta_source32", 1, false],
-        ["fabric_metadata_t._int_meta_transit33", 1, false],
-        ["fabric_metadata_t._int_meta_sink34", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id35", 32, false],
-        ["fabric_metadata_t._int_meta_new_words36", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes37", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp38", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp39", 32, false],
+        ["userMetadata._ip_eth_type0", 16, false],
+        ["userMetadata._vlan_id1", 12, false],
+        ["userMetadata._vlan_pri2", 3, false],
+        ["userMetadata._vlan_cfi3", 1, false],
+        ["userMetadata._mpls_label4", 20, false],
+        ["userMetadata._mpls_ttl5", 8, false],
+        ["userMetadata._skip_forwarding6", 1, false],
+        ["userMetadata._skip_next7", 1, false],
+        ["userMetadata._fwd_type8", 3, false],
+        ["userMetadata._next_id9", 32, false],
+        ["userMetadata._is_multicast10", 1, false],
+        ["userMetadata._is_controller_packet_out11", 1, false],
+        ["userMetadata._ip_proto12", 8, false],
+        ["userMetadata._l4_sport13", 16, false],
+        ["userMetadata._l4_dport14", 16, false],
+        ["userMetadata._ipv4_src_addr15", 32, false],
+        ["userMetadata._ipv4_dst_addr16", 32, false],
+        ["userMetadata._inner_l4_sport17", 16, false],
+        ["userMetadata._inner_l4_dport18", 16, false],
+        ["userMetadata._spgw_ipv4_len19", 16, false],
+        ["userMetadata._spgw_teid20", 32, false],
+        ["userMetadata._spgw_tunnel_src_port21", 16, false],
+        ["userMetadata._spgw_tunnel_src_addr22", 32, false],
+        ["userMetadata._spgw_tunnel_dst_addr23", 32, false],
+        ["userMetadata._spgw_ctr_id24", 32, false],
+        ["userMetadata._spgw_far_id25", 32, false],
+        ["userMetadata._spgw_src_iface26", 8, false],
+        ["userMetadata._spgw_skip_spgw27", 1, false],
+        ["userMetadata._spgw_notify_spgwc28", 1, false],
+        ["userMetadata._spgw_needs_gtpu_encap29", 1, false],
+        ["userMetadata._spgw_needs_gtpu_decap30", 1, false],
+        ["userMetadata._spgw_skip_egress_pdr_ctr31", 1, false],
+        ["userMetadata._int_meta_source32", 1, false],
+        ["userMetadata._int_meta_transit33", 1, false],
+        ["userMetadata._int_meta_sink34", 1, false],
+        ["userMetadata._int_meta_switch_id35", 32, false],
+        ["userMetadata._int_meta_new_words36", 8, false],
+        ["userMetadata._int_meta_new_bytes37", 16, false],
+        ["userMetadata._int_meta_ig_tstamp38", 32, false],
+        ["userMetadata._int_meta_eg_tstamp39", 32, false],
         ["_padding_0", 1, false]
       ]
     },
     {
-      "name" : "standard_metadata",
+      "name" : "packet_out_header_t",
       "id" : 1,
       "fields" : [
+        ["egress_port", 9, false],
+        ["do_forwarding", 1, false],
+        ["_pad", 6, false]
+      ]
+    },
+    {
+      "name" : "standard_metadata",
+      "id" : 2,
+      "fields" : [
         ["ingress_port", 9, false],
         ["egress_spec", 9, false],
         ["egress_port", 9, false],
-        ["clone_spec", 32, false],
         ["instance_type", 32, false],
-        ["drop", 1, false],
-        ["recirculate_port", 16, false],
         ["packet_length", 32, false],
         ["enq_timestamp", 32, false],
         ["enq_qdepth", 19, false],
@@ -73,20 +80,17 @@
         ["deq_qdepth", 19, false],
         ["ingress_global_timestamp", 48, false],
         ["egress_global_timestamp", 48, false],
-        ["lf_field_list", 32, false],
         ["mcast_grp", 16, false],
-        ["resubmit_flag", 32, false],
         ["egress_rid", 16, false],
-        ["recirculate_flag", 32, false],
         ["checksum_error", 1, false],
         ["parser_error", 32, false],
         ["priority", 3, false],
-        ["_padding", 2, false]
+        ["_padding", 3, false]
       ]
     },
     {
       "name" : "ethernet_t",
-      "id" : 2,
+      "id" : 3,
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false]
@@ -94,7 +98,7 @@
     },
     {
       "name" : "vlan_tag_t",
-      "id" : 3,
+      "id" : 4,
       "fields" : [
         ["eth_type", 16, false],
         ["pri", 3, false],
@@ -104,14 +108,14 @@
     },
     {
       "name" : "eth_type_t",
-      "id" : 4,
+      "id" : 5,
       "fields" : [
         ["value", 16, false]
       ]
     },
     {
       "name" : "mpls_t",
-      "id" : 5,
+      "id" : 6,
       "fields" : [
         ["label", 20, false],
         ["tc", 3, false],
@@ -121,7 +125,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 6,
+      "id" : 7,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -140,7 +144,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 7,
+      "id" : 8,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -150,7 +154,7 @@
     },
     {
       "name" : "gtpu_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["version", 3, false],
         ["pt", 1, false],
@@ -165,7 +169,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -182,7 +186,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 10,
+      "id" : 11,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -193,14 +197,6 @@
       ]
     },
     {
-      "name" : "packet_out_header_t",
-      "id" : 11,
-      "fields" : [
-        ["egress_port", 9, false],
-        ["_pad", 7, false]
-      ]
-    },
-    {
       "name" : "packet_in_header_t",
       "id" : 12,
       "fields" : [
@@ -309,225 +305,232 @@
   ],
   "headers" : [
     {
-      "name" : "scalars",
+      "name" : "tmp",
       "id" : 0,
+      "header_type" : "packet_out_header_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "scalars",
+      "id" : 1,
       "header_type" : "scalars_0",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "header_type" : "standard_metadata",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "ethernet",
-      "id" : 2,
+      "id" : 3,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "vlan_tag",
-      "id" : 3,
-      "header_type" : "vlan_tag_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "inner_vlan_tag",
       "id" : 4,
       "header_type" : "vlan_tag_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "eth_type",
+      "name" : "inner_vlan_tag",
       "id" : 5,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "eth_type",
+      "id" : 6,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "mpls",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "outer_gtpu",
-      "id" : 9,
-      "header_type" : "gtpu_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "gtpu",
       "id" : 10,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "inner_ipv4",
+      "name" : "gtpu",
       "id" : 11,
+      "header_type" : "gtpu_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "inner_ipv4",
+      "id" : 12,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_tcp",
-      "id" : 13,
+      "id" : 14,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_icmp",
-      "id" : 14,
+      "id" : 15,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 15,
+      "id" : 16,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 16,
+      "id" : 17,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 17,
+      "id" : 18,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 18,
+      "id" : 19,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 19,
+      "id" : 20,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 20,
+      "id" : 21,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_shim",
-      "id" : 21,
+      "id" : 22,
       "header_type" : "intl4_shim_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_header",
-      "id" : 22,
+      "id" : 23,
       "header_type" : "int_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_switch_id",
-      "id" : 23,
+      "id" : 24,
       "header_type" : "int_switch_id_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_port_ids",
-      "id" : 24,
+      "id" : 25,
       "header_type" : "int_port_ids_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_hop_latency",
-      "id" : 25,
+      "id" : 26,
       "header_type" : "int_hop_latency_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_occupancy",
-      "id" : 26,
+      "id" : 27,
       "header_type" : "int_q_occupancy_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_ingress_tstamp",
-      "id" : 27,
+      "id" : 28,
       "header_type" : "int_ingress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tstamp",
-      "id" : 28,
+      "id" : 29,
       "header_type" : "int_egress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_congestion",
-      "id" : 29,
+      "id" : 30,
       "header_type" : "int_q_congestion_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tx_util",
-      "id" : 30,
+      "id" : 31,
       "header_type" : "int_egress_port_tx_util_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_tail",
-      "id" : 31,
+      "id" : 32,
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
@@ -580,10 +583,11 @@
               "type" : "hexstr",
               "value" : "0x00ff",
               "mask" : null,
-              "next_state" : "parse_packet_out"
+              "next_state" : "check_packet_out"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -596,12 +600,229 @@
           ]
         },
         {
-          "name" : "parse_packet_out",
+          "name" : "check_packet_out",
           "id" : 1,
           "parser_ops" : [
             {
               "parameters" : [
                 {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_6"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 16]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "parameters" : [
+                    {
+                      "type" : "header",
+                      "value" : "tmp"
+                    }
+                  ],
+                  "op" : "add_header"
+                }
+              ],
+              "op" : "primitive"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "egress_port"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x7"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01ff"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "do_forwarding"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "_pad"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "tmp_6"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x3f"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x00",
+              "mask" : null,
+              "next_state" : "parse_packet_out_and_accept"
+            },
+            {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : "strip_packet_out"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_0"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_packet_out_and_accept",
+          "id" : 2,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
                   "type" : "regular",
                   "value" : "packet_out"
                 }
@@ -611,7 +832,32 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "strip_packet_out",
+          "id" : 3,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "hexstr",
+                  "value" : "0x00000010"
+                }
+              ],
+              "op" : "advance"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -620,7 +866,7 @@
         },
         {
           "name" : "parse_ethernet",
-          "id" : 2,
+          "id" : 4,
           "parser_ops" : [
             {
               "parameters" : [
@@ -635,7 +881,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+                  "value" : ["scalars", "userMetadata._vlan_id1"]
                 },
                 {
                   "type" : "hexstr",
@@ -648,7 +894,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -678,7 +924,8 @@
               "next_state" : "parse_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -686,13 +933,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
         {
           "name" : "parse_vlan_tag",
-          "id" : 3,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -707,7 +954,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -725,7 +972,8 @@
               "next_state" : "parse_inner_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -733,13 +981,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
         {
           "name" : "parse_inner_vlan_tag",
-          "id" : 4,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -753,7 +1001,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -762,7 +1011,7 @@
         },
         {
           "name" : "parse_eth_type",
-          "id" : 5,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -788,7 +1037,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -802,7 +1052,7 @@
         },
         {
           "name" : "parse_mpls",
-          "id" : 6,
+          "id" : 8,
           "parser_ops" : [
             {
               "parameters" : [
@@ -817,7 +1067,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+                  "value" : ["scalars", "userMetadata._mpls_label4"]
                 },
                 {
                   "type" : "field",
@@ -830,7 +1080,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+                  "value" : ["scalars", "userMetadata._mpls_ttl5"]
                 },
                 {
                   "type" : "field",
@@ -843,7 +1093,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_5"]
                 },
                 {
                   "type" : "lookahead",
@@ -861,7 +1111,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -869,13 +1120,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_5"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 7,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -890,7 +1141,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+                  "value" : ["scalars", "userMetadata._ip_proto12"]
                 },
                 {
                   "type" : "field",
@@ -903,7 +1154,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+                  "value" : ["scalars", "userMetadata._ip_eth_type0"]
                 },
                 {
                   "type" : "hexstr",
@@ -916,7 +1167,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+                  "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
                 },
                 {
                   "type" : "field",
@@ -929,7 +1180,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+                  "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
                 },
                 {
                   "type" : "field",
@@ -972,7 +1223,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -986,7 +1238,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 8,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1001,7 +1253,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                  "value" : ["scalars", "userMetadata._l4_sport13"]
                 },
                 {
                   "type" : "field",
@@ -1014,7 +1266,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                  "value" : ["scalars", "userMetadata._l4_dport14"]
                 },
                 {
                   "type" : "field",
@@ -1026,7 +1278,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int"
             }
@@ -1035,7 +1288,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 9,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1050,7 +1303,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                  "value" : ["scalars", "userMetadata._l4_sport13"]
                 },
                 {
                   "type" : "field",
@@ -1063,7 +1316,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                  "value" : ["scalars", "userMetadata._l4_dport14"]
                 },
                 {
                   "type" : "field",
@@ -1081,7 +1334,8 @@
               "next_state" : "parse_gtpu"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int"
             }
@@ -1095,7 +1349,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 10,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1109,7 +1363,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1118,7 +1373,7 @@
         },
         {
           "name" : "parse_gtpu",
-          "id" : 11,
+          "id" : 13,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1172,7 +1427,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1186,7 +1442,7 @@
         },
         {
           "name" : "parse_inner_udp",
-          "id" : 12,
+          "id" : 14,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1201,7 +1457,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+                  "value" : ["scalars", "userMetadata._inner_l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -1214,7 +1470,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+                  "value" : ["scalars", "userMetadata._inner_l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -1226,7 +1482,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int"
             }
@@ -1235,7 +1492,7 @@
         },
         {
           "name" : "parse_int",
-          "id" : 13,
+          "id" : 15,
           "parser_ops" : [],
           "transitions" : [
             {
@@ -1245,7 +1502,8 @@
               "next_state" : "parse_intl4_shim"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1259,7 +1517,7 @@
         },
         {
           "name" : "parse_intl4_shim",
-          "id" : 14,
+          "id" : 16,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1288,7 +1546,8 @@
               "next_state" : "parse_intl4_tail"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_int_data"
             }
@@ -1302,11 +1561,12 @@
         },
         {
           "name" : "parse_int_data",
-          "id" : 15,
+          "id" : 17,
           "parser_ops" : [],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1315,7 +1575,7 @@
         },
         {
           "name" : "parse_intl4_tail",
-          "id" : 16,
+          "id" : 18,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1329,7 +1589,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1346,11 +1607,12 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 268,
+        "line" : 283,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "ipv4", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "ipv4", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"],
+      "primitives" : []
     }
   ],
   "meter_arrays" : [],
@@ -1504,7 +1766,7 @@
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 109,
+        "line" : 108,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1540,7 +1802,7 @@
       "id" : 15,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 296,
+        "line" : 295,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1616,7 +1878,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 359,
+        "line" : 358,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1806,7 +2068,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source32"]
+              "value" : ["scalars", "userMetadata._int_meta_source32"]
             },
             {
               "type" : "expression",
@@ -1842,7 +2104,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -1871,7 +2133,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -1918,7 +2180,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -1949,7 +2211,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+              "value" : ["scalars", "userMetadata._fwd_type8"]
             },
             {
               "type" : "runtime_data",
@@ -1980,7 +2242,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -2011,7 +2273,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             },
             {
               "type" : "hexstr",
@@ -2030,7 +2292,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -2061,7 +2323,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -2098,7 +2360,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -2143,7 +2405,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -2225,7 +2487,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -2272,7 +2534,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -2334,7 +2596,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -2485,7 +2747,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             },
             {
               "type" : "runtime_data",
@@ -2592,7 +2854,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_multicast10"]
+              "value" : ["scalars", "userMetadata._is_multicast10"]
             },
             {
               "type" : "expression",
@@ -2628,7 +2890,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -2637,7 +2899,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2647,7 +2909,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -2666,7 +2928,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -2685,7 +2947,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -2704,11 +2966,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -2723,11 +2985,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -2847,7 +3109,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -2856,7 +3118,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2866,7 +3128,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -2885,7 +3147,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -2904,7 +3166,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -2923,11 +3185,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -2942,11 +3204,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3051,7 +3313,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3060,7 +3322,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3070,7 +3332,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3089,7 +3351,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3108,7 +3370,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3127,11 +3389,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3146,11 +3408,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3270,7 +3532,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3279,7 +3541,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3289,7 +3551,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3308,7 +3570,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3327,7 +3589,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3346,11 +3608,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3365,11 +3627,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3455,7 +3717,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3464,7 +3726,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3474,7 +3736,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3493,7 +3755,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3512,7 +3774,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3531,11 +3793,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3550,11 +3812,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3674,7 +3936,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3683,7 +3945,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3693,7 +3955,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3712,7 +3974,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3731,7 +3993,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3750,11 +4012,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3769,11 +4031,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3878,7 +4140,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3887,7 +4149,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3897,7 +4159,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3916,7 +4178,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3935,7 +4197,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3954,11 +4216,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3973,11 +4235,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -4097,7 +4359,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -4106,7 +4368,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4116,7 +4378,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -4135,7 +4397,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -4154,7 +4416,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -4173,11 +4435,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -4192,11 +4454,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -4287,7 +4549,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+              "value" : ["scalars", "userMetadata._spgw_src_iface26"]
             },
             {
               "type" : "runtime_data",
@@ -4296,7 +4558,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 121,
+            "line" : 120,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -4306,7 +4568,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
+              "value" : ["scalars", "userMetadata._spgw_skip_spgw27"]
             },
             {
               "type" : "expression",
@@ -4325,7 +4587,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 122,
+            "line" : 121,
             "column" : 33,
             "source_fragment" : "= false; ..."
           }
@@ -4342,7 +4604,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+              "value" : ["scalars", "userMetadata._spgw_src_iface26"]
             },
             {
               "type" : "hexstr",
@@ -4351,7 +4613,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 109,
+            "line" : 110,
             "column" : 44,
             "source_fragment" : "8w0; ..."
           }
@@ -4361,7 +4623,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
+              "value" : ["scalars", "userMetadata._spgw_skip_spgw27"]
             },
             {
               "type" : "expression",
@@ -4380,7 +4642,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 126,
+            "line" : 125,
             "column" : 33,
             "source_fragment" : "= true; ..."
           }
@@ -4410,7 +4672,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4419,7 +4681,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4429,7 +4691,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4438,7 +4700,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4448,7 +4710,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -4477,7 +4739,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4507,7 +4769,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4516,7 +4778,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4526,7 +4788,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4535,7 +4797,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4545,7 +4807,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -4574,7 +4836,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4608,7 +4870,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4617,7 +4879,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4627,7 +4889,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4636,7 +4898,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4646,7 +4908,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -4675,7 +4937,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4709,7 +4971,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4718,7 +4980,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4728,7 +4990,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4737,7 +4999,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4747,7 +5009,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -4776,7 +5038,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4802,7 +5064,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 195,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -4832,45 +5133,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 196,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 197,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -4880,7 +5142,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -4909,7 +5171,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 198,
+            "line" : 197,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4951,7 +5213,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 206,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -4981,45 +5282,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 207,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 208,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -5029,7 +5291,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -5058,7 +5320,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 209,
+            "line" : 208,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -5068,7 +5330,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap29"]
             },
             {
               "type" : "expression",
@@ -5087,7 +5349,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 211,
+            "line" : 210,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -5097,7 +5359,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
+              "value" : ["scalars", "userMetadata._spgw_teid20"]
             },
             {
               "type" : "runtime_data",
@@ -5106,7 +5368,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 211,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -5116,7 +5378,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port21"]
             },
             {
               "type" : "runtime_data",
@@ -5125,7 +5387,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 212,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -5135,7 +5397,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr22"]
             },
             {
               "type" : "runtime_data",
@@ -5144,27 +5406,27 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
+            "line" : 213,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
             "line" : 214,
             "column" : 39,
-            "source_fragment" : "= tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 4
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 215,
-            "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
@@ -5173,7 +5435,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "runtime_data",
@@ -5182,7 +5444,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 217,
+            "line" : 216,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -5192,7 +5454,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "runtime_data",
@@ -5201,7 +5463,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 217,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -5211,7 +5473,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "runtime_data",
@@ -5220,7 +5482,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 218,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -5230,7 +5492,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "hexstr",
@@ -5239,7 +5501,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 220,
+            "line" : 219,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -5281,7 +5543,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 206,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -5311,45 +5612,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 207,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 208,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -5359,7 +5621,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -5388,7 +5650,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 209,
+            "line" : 208,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -5398,7 +5660,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap29"]
             },
             {
               "type" : "expression",
@@ -5417,7 +5679,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 211,
+            "line" : 210,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -5427,7 +5689,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
+              "value" : ["scalars", "userMetadata._spgw_teid20"]
             },
             {
               "type" : "runtime_data",
@@ -5436,7 +5698,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 211,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -5446,7 +5708,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port21"]
             },
             {
               "type" : "runtime_data",
@@ -5455,7 +5717,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 212,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -5465,7 +5727,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr22"]
             },
             {
               "type" : "runtime_data",
@@ -5474,27 +5736,27 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
+            "line" : 213,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
             "line" : 214,
             "column" : 39,
-            "source_fragment" : "= tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 4
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 215,
-            "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
@@ -5503,7 +5765,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "runtime_data",
@@ -5512,7 +5774,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 217,
+            "line" : 216,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -5522,7 +5784,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "runtime_data",
@@ -5531,7 +5793,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 217,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -5541,7 +5803,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "runtime_data",
@@ -5550,7 +5812,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 218,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -5560,7 +5822,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "hexstr",
@@ -5569,7 +5831,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 220,
+            "line" : 219,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -5579,7 +5841,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
+              "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr31"]
             },
             {
               "type" : "expression",
@@ -5598,7 +5860,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 231,
+            "line" : 230,
             "column" : 43,
             "source_fragment" : "= true; ..."
           }
@@ -5606,7 +5868,7 @@
       ]
     },
     {
-      "name" : "act",
+      "name" : "packetio25",
       "id" : 48,
       "runtime_data" : [],
       "primitives" : [
@@ -5649,7 +5911,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out11"]
+              "value" : ["scalars", "userMetadata._is_controller_packet_out11"]
             },
             {
               "type" : "expression",
@@ -5686,71 +5948,11 @@
       ]
     },
     {
-      "name" : "act_0",
+      "name" : "spgw265",
       "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_1",
-      "id" : 50,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_2",
-      "id" : 51,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "count",
           "parameters" : [
             {
@@ -5759,12 +5961,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
+            "line" : 265,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -5772,8 +5974,8 @@
       ]
     },
     {
-      "name" : "act_3",
-      "id" : 52,
+      "name" : "spgw282",
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5781,7 +5983,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len19"]
             },
             {
               "type" : "field",
@@ -5790,7 +5992,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 282,
             "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
@@ -5798,8 +6000,8 @@
       ]
     },
     {
-      "name" : "act_4",
-      "id" : 53,
+      "name" : "filtering111",
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5807,7 +6009,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "field",
@@ -5826,7 +6028,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             },
             {
               "type" : "field",
@@ -5845,7 +6047,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             },
             {
               "type" : "field",
@@ -5862,8 +6064,8 @@
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 54,
+      "name" : "filtering127",
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5871,7 +6073,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+              "value" : ["scalars", "userMetadata._mpls_ttl5"]
             },
             {
               "type" : "hexstr",
@@ -5888,8 +6090,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 55,
+      "name" : "port_counter31",
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5897,7 +6099,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_2"]
             },
             {
               "type" : "expression",
@@ -5933,7 +6135,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_2"]
             }
           ],
           "source_info" : {
@@ -5946,8 +6148,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 56,
+      "name" : "port_counter34",
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5955,7 +6157,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             },
             {
               "type" : "expression",
@@ -5991,7 +6193,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             }
           ],
           "source_info" : {
@@ -6005,31 +6207,31 @@
     },
     {
       "name" : "nop",
-      "id" : 57,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
+      "id" : 56,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
       "id" : 58,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
-      "id" : 59,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 60,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 61,
+      "id" : 59,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -6097,7 +6299,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 157,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -6388,7 +6590,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             }
           ],
           "source_info" : {
@@ -6515,7 +6717,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 152,
+            "line" : 153,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -6524,7 +6726,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 62,
+      "id" : 60,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -6537,7 +6739,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit33"]
+              "value" : ["scalars", "userMetadata._int_meta_transit33"]
             },
             {
               "type" : "expression",
@@ -6566,7 +6768,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
             },
             {
               "type" : "runtime_data",
@@ -6584,13 +6786,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 63,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 64,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6664,7 +6866,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -6678,7 +6880,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6706,7 +6908,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -6720,7 +6922,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6747,7 +6949,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 65,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6789,7 +6991,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -6803,7 +7005,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6831,7 +7033,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -6845,7 +7047,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6872,6 +7074,367 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
+      "id" : 64,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
+      "id" : 65,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
       "id" : 66,
       "runtime_data" : [],
       "primitives" : [
@@ -6946,6 +7509,176 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
+      "id" : 67,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -6976,97 +7709,6 @@
           }
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 67,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -7150,7 +7792,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -7164,11 +7806,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x01"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -7182,9 +7824,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 97,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7192,7 +7834,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -7206,11 +7848,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0004"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -7224,15 +7866,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
       "id" : 68,
       "runtime_data" : [],
       "primitives" : [
@@ -7307,176 +7949,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 69,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -7590,7 +8062,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -7604,11 +8076,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x03"
                       }
                     }
                   },
@@ -7622,9 +8094,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 109,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7632,7 +8104,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -7646,11 +8118,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x000c"
                       }
                     }
                   },
@@ -7664,15 +8136,140 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 110,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
+      "id" : 69,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
       "id" : 70,
       "runtime_data" : [],
       "primitives" : [
@@ -7747,6 +8344,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
+      "id" : 71,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -7781,176 +8503,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 71,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_switch_id"
             }
           ],
@@ -7970,7 +8522,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -7985,7 +8537,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -7999,11 +8551,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x01"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -8017,9 +8569,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 97,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -8027,7 +8579,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -8041,11 +8593,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0004"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -8059,15 +8611,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
       "id" : 72,
       "runtime_data" : [],
       "primitives" : [
@@ -8142,131 +8694,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 73,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -8320,7 +8747,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -8335,7 +8762,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -8349,7 +8776,211 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
+      "id" : 73,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8377,7 +9008,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -8391,7 +9022,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8417,7 +9048,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
       "id" : 74,
       "runtime_data" : [],
       "primitives" : [
@@ -8492,6 +9123,210 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
+      "id" : 75,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -8526,131 +9361,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 75,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_port_ids"
             }
           ],
@@ -8749,7 +9459,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -8764,7 +9474,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -8778,11 +9488,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x03"
                       }
                     }
                   },
@@ -8796,9 +9506,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 109,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8806,7 +9516,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -8820,11 +9530,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x000c"
                       }
                     }
                   },
@@ -8838,15 +9548,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 110,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
       "id" : 76,
       "runtime_data" : [],
       "primitives" : [
@@ -8921,210 +9631,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 77,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_hop_latency"
             }
           ],
@@ -9257,7 +9763,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -9272,7 +9778,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9286,311 +9792,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 78,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9618,7 +9820,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9632,7 +9834,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9659,13 +9861,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 79,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 80,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9707,7 +9909,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9721,7 +9923,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9749,7 +9951,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9763,7 +9965,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9790,7 +9992,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 81,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9851,7 +10053,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9865,7 +10067,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9893,7 +10095,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9907,7 +10109,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9934,6 +10136,332 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
+      "id" : 80,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
+      "id" : 81,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
       "id" : 82,
       "runtime_data" : [],
       "primitives" : [
@@ -9976,6 +10504,154 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
+      "id" : 83,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -10025,97 +10701,6 @@
           }
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 83,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -10177,7 +10762,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -10191,11 +10776,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x01"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -10209,9 +10794,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 97,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10219,7 +10804,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -10233,11 +10818,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0004"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -10251,15 +10836,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
       "id" : 84,
       "runtime_data" : [],
       "primitives" : [
@@ -10302,154 +10887,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 85,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -10560,7 +10997,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -10574,11 +11011,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x03"
                       }
                     }
                   },
@@ -10592,9 +11029,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 109,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10602,7 +11039,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -10616,11 +11053,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x000c"
                       }
                     }
                   },
@@ -10634,15 +11071,140 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 110,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
+      "id" : 85,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
       "id" : 86,
       "runtime_data" : [],
       "primitives" : [
@@ -10685,6 +11247,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
+      "id" : 87,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -10738,154 +11425,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 87,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_ingress_tstamp"
             }
           ],
@@ -10920,7 +11459,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -10934,11 +11473,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x01"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -10952,9 +11491,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 97,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10962,7 +11501,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -10976,11 +11515,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0004"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -10994,15 +11533,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
       "id" : 88,
       "runtime_data" : [],
       "primitives" : [
@@ -11045,131 +11584,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 89,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -11257,7 +11671,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -11271,7 +11685,189 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
+      "id" : 89,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11299,7 +11895,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -11313,7 +11909,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11339,7 +11935,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
       "id" : 90,
       "runtime_data" : [],
       "primitives" : [
@@ -11382,6 +11978,188 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
+      "id" : 91,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -11435,131 +12213,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 91,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_egress_tstamp"
             }
           ],
@@ -11651,7 +12304,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -11665,11 +12318,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x03"
                       }
                     }
                   },
@@ -11683,9 +12336,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 109,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -11693,7 +12346,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -11707,11 +12360,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x000c"
                       }
                     }
                   },
@@ -11725,15 +12378,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 110,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
       "id" : 92,
       "runtime_data" : [],
       "primitives" : [
@@ -11776,188 +12429,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 93,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_q_congestion"
             }
           ],
@@ -12102,7 +12573,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -12116,276 +12587,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 94,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12413,7 +12615,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -12427,7 +12629,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12454,7 +12656,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 95,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12481,7 +12683,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             }
           ],
           "source_info" : {
@@ -12495,7 +12697,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 96,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12522,7 +12724,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             }
           ],
           "source_info" : {
@@ -12579,7 +12781,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+              "value" : ["scalars", "userMetadata._mpls_ttl5"]
             }
           ],
           "source_info" : {
@@ -12603,7 +12805,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -12612,7 +12814,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 97,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12639,7 +12841,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             }
           ],
           "source_info" : {
@@ -12658,7 +12860,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             }
           ],
           "source_info" : {
@@ -12682,7 +12884,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -12696,7 +12898,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             }
           ],
           "source_info" : {
@@ -12710,7 +12912,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 98,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12732,7 +12934,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.drop",
-      "id" : 99,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12754,7 +12956,7 @@
     },
     {
       "name" : "FabricEgress.spgw.gtpu_encap",
-      "id" : 100,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12767,7 +12969,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 301,
+            "line" : 300,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -12786,7 +12988,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 302,
+            "line" : 301,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -12805,7 +13007,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 134,
+            "line" : 135,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -12824,7 +13026,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 304,
+            "line" : 303,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -12843,7 +13045,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 305,
+            "line" : 304,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -12885,7 +13087,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 305,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -12904,7 +13106,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 308,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -12923,7 +13125,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 308,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -12942,7 +13144,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -12961,7 +13163,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 147,
+            "line" : 148,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -12980,7 +13182,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 131,
+            "line" : 132,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -12994,12 +13196,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr22"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -13013,12 +13215,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr23"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 313,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -13037,7 +13239,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 314,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -13052,7 +13254,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 317,
+            "line" : 316,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -13066,12 +13268,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port21"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -13090,7 +13292,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -13114,7 +13316,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
+                        "value" : ["scalars", "userMetadata._spgw_ipv4_len19"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13132,7 +13334,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -13151,7 +13353,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -13166,7 +13368,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -13185,7 +13387,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 326,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -13204,7 +13406,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 326,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -13223,7 +13425,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 328,
+            "line" : 327,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -13242,7 +13444,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 329,
+            "line" : 328,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -13261,7 +13463,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 329,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -13280,7 +13482,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -13299,7 +13501,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -13313,12 +13515,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len19"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 332,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -13332,12 +13534,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
+              "value" : ["scalars", "userMetadata._spgw_teid20"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -13345,8 +13547,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 101,
+      "name" : "packetio41",
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13362,8 +13564,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 102,
+      "name" : "packetio44",
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13413,8 +13615,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 103,
+      "name" : "next349",
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13435,8 +13637,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 104,
+      "name" : "next376",
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13457,8 +13659,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 105,
+      "name" : "next375",
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13506,8 +13708,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 106,
+      "name" : "next380",
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13528,8 +13730,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 107,
+      "name" : "next379",
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13577,8 +13779,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 108,
+      "name" : "spgw342",
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13590,12 +13792,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 342,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -13603,8 +13805,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 109,
+      "name" : "act",
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13633,8 +13835,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 110,
+      "name" : "int_transit420",
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13669,8 +13871,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 111,
+      "name" : "int_transit428",
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13696,7 +13898,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       }
                     }
                   },
@@ -13718,8 +13920,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 112,
+      "name" : "int_transit425",
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13767,8 +13969,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 113,
+      "name" : "int_transit431",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13794,7 +13996,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes37"]
                       }
                     }
                   },
@@ -13816,8 +14018,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 114,
+      "name" : "int_transit434",
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13843,7 +14045,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words36"]
                       }
                     }
                   },
@@ -13878,7 +14080,7 @@
       "init_table" : "node_2",
       "tables" : [
         {
-          "name" : "tbl_act",
+          "name" : "tbl_packetio25",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -13894,10 +14096,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [48],
-          "actions" : ["act"],
+          "actions" : ["packetio25"],
           "base_default_next" : "FabricIngress.spgw.interfaces",
           "next_tables" : {
-            "act" : "FabricIngress.spgw.interfaces"
+            "packetio25" : "FabricIngress.spgw.interfaces"
           },
           "default_entry" : {
             "action_id" : 48,
@@ -13911,7 +14113,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 130,
+            "line" : 129,
             "column" : 10,
             "source_fragment" : "interfaces"
           },
@@ -13939,8 +14141,8 @@
           "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_0",
-            "__MISS__" : "tbl_act_1"
+            "__HIT__" : "node_5",
+            "__MISS__" : "node_16"
           },
           "default_entry" : {
             "action_id" : 40,
@@ -13950,54 +14152,8 @@
           }
         },
         {
-          "name" : "tbl_act_0",
-          "id" : 2,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_0"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_0" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 49,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [50],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_1" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 50,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
-          "id" : 4,
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 75,
@@ -14032,12 +14188,12 @@
           "direct_meters" : null,
           "action_ids" : [31, 32, 33, 34],
           "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown"],
-          "base_default_next" : "node_10",
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_7"
           },
           "default_entry" : {
             "action_id" : 34,
@@ -14131,10 +14287,10 @@
         },
         {
           "name" : "FabricIngress.spgw.uplink_pdrs",
-          "id" : 5,
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 177,
+            "line" : 176,
             "column" : 10,
             "source_fragment" : "uplink_pdrs"
           },
@@ -14160,11 +14316,11 @@
           "direct_meters" : null,
           "action_ids" : [42, 44, 9],
           "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
-          "base_default_next" : "node_13",
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw.load_pdr" : "node_13",
-            "FabricIngress.spgw.load_pdr_qos" : "node_13",
-            "NoAction" : "node_13"
+            "FabricIngress.spgw.load_pdr" : "node_10",
+            "FabricIngress.spgw.load_pdr_qos" : "node_10",
+            "NoAction" : "node_10"
           },
           "default_entry" : {
             "action_id" : 9,
@@ -14175,10 +14331,10 @@
         },
         {
           "name" : "FabricIngress.spgw.downlink_pdrs",
-          "id" : 6,
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 165,
+            "line" : 164,
             "column" : 10,
             "source_fragment" : "downlink_pdrs"
           },
@@ -14198,11 +14354,11 @@
           "direct_meters" : null,
           "action_ids" : [41, 43, 8],
           "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
-          "base_default_next" : "node_13",
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw.load_pdr" : "node_13",
-            "FabricIngress.spgw.load_pdr_qos" : "node_13",
-            "NoAction" : "node_13"
+            "FabricIngress.spgw.load_pdr" : "node_10",
+            "FabricIngress.spgw.load_pdr_qos" : "node_10",
+            "NoAction" : "node_10"
           },
           "default_entry" : {
             "action_id" : 8,
@@ -14212,11 +14368,11 @@
           }
         },
         {
-          "name" : "tbl_act_2",
-          "id" : 7,
+          "name" : "tbl_spgw265",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
+            "line" : 265,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -14227,14 +14383,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_15",
+          "action_ids" : [49],
+          "actions" : ["spgw265"],
+          "base_default_next" : "node_12",
           "next_tables" : {
-            "act_2" : "node_15"
+            "spgw265" : "node_12"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14242,7 +14398,7 @@
         },
         {
           "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
-          "id" : 8,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 75,
@@ -14376,10 +14532,10 @@
         },
         {
           "name" : "FabricIngress.spgw.fars",
-          "id" : 9,
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 234,
+            "line" : 233,
             "column" : 10,
             "source_fragment" : "fars"
           },
@@ -14387,7 +14543,7 @@
             {
               "match_type" : "exact",
               "name" : "far_id",
-              "target" : ["scalars", "fabric_metadata_t._spgw_far_id25"],
+              "target" : ["scalars", "userMetadata._spgw_far_id25"],
               "mask" : null
             }
           ],
@@ -14399,11 +14555,11 @@
           "direct_meters" : null,
           "action_ids" : [45, 46, 47],
           "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
-          "base_default_next" : "tbl_act_3",
+          "base_default_next" : "tbl_spgw282",
           "next_tables" : {
-            "FabricIngress.spgw.load_normal_far" : "tbl_act_3",
-            "FabricIngress.spgw.load_tunnel_far" : "tbl_act_3",
-            "FabricIngress.spgw.load_dbuf_far" : "tbl_act_3"
+            "FabricIngress.spgw.load_normal_far" : "tbl_spgw282",
+            "FabricIngress.spgw.load_tunnel_far" : "tbl_spgw282",
+            "FabricIngress.spgw.load_dbuf_far" : "tbl_spgw282"
           },
           "default_entry" : {
             "action_id" : 45,
@@ -14413,11 +14569,11 @@
           }
         },
         {
-          "name" : "tbl_act_3",
-          "id" : 10,
+          "name" : "tbl_spgw282",
+          "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 282,
             "column" : 36,
             "source_fragment" : "="
           },
@@ -14428,22 +14584,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_3"],
-          "base_default_next" : "node_19",
+          "action_ids" : [50],
+          "actions" : ["spgw282"],
+          "base_default_next" : "node_16",
           "next_tables" : {
-            "act_3" : "node_19"
+            "spgw282" : "node_16"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_4",
-          "id" : 11,
+          "name" : "tbl_filtering111",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 111,
@@ -14457,22 +14613,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_4"],
-          "base_default_next" : "node_21",
+          "action_ids" : [51],
+          "actions" : ["filtering111"],
+          "base_default_next" : "node_18",
           "next_tables" : {
-            "act_4" : "node_21"
+            "filtering111" : "node_18"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
-          "id" : 12,
+          "name" : "tbl_filtering127",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 127,
@@ -14486,14 +14642,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["act_5"],
+          "action_ids" : [52],
+          "actions" : ["filtering127"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_5" : "FabricIngress.filtering.ingress_port_vlan"
+            "filtering127" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14501,7 +14657,7 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 13,
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 53,
@@ -14551,7 +14707,7 @@
         },
         {
           "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 14,
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 92,
@@ -14580,7 +14736,7 @@
             {
               "match_type" : "exact",
               "name" : "ip_eth_type",
-              "target" : ["scalars", "fabric_metadata_t._ip_eth_type0"],
+              "target" : ["scalars", "userMetadata._ip_eth_type0"],
               "mask" : null
             }
           ],
@@ -14592,9 +14748,9 @@
           "direct_meters" : null,
           "action_ids" : [14],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_25",
+          "base_default_next" : "node_22",
           "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_25"
+            "FabricIngress.filtering.set_forwarding_type" : "node_22"
           },
           "default_entry" : {
             "action_id" : 14,
@@ -14605,7 +14761,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 15,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 46,
@@ -14616,7 +14772,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -14648,7 +14804,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 16,
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 71,
@@ -14659,7 +14815,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t._mpls_label4"],
+              "target" : ["scalars", "userMetadata._mpls_label4"],
               "mask" : null
             }
           ],
@@ -14685,7 +14841,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 17,
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 108,
@@ -14696,7 +14852,7 @@
             {
               "match_type" : "lpm",
               "name" : "ipv4_dst",
-              "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"],
+              "target" : ["scalars", "userMetadata._ipv4_dst_addr16"],
               "mask" : null
             }
           ],
@@ -14723,7 +14879,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 18,
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 60,
@@ -14740,19 +14896,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto12"],
+              "target" : ["scalars", "userMetadata._ip_proto12"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport13"],
+              "target" : ["scalars", "userMetadata._l4_sport13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport14"],
+              "target" : ["scalars", "userMetadata._l4_dport14"],
               "mask" : null
             },
             {
@@ -14812,13 +14968,13 @@
           "direct_meters" : null,
           "action_ids" : [19, 20, 21, 22, 23],
           "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
-          "base_default_next" : "node_33",
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_33",
-            "FabricIngress.acl.punt_to_cpu" : "node_33",
-            "FabricIngress.acl.set_clone_session_id" : "node_33",
-            "FabricIngress.acl.drop" : "node_33",
-            "FabricIngress.acl.nop_acl" : "node_33"
+            "FabricIngress.acl.set_next_id_acl" : "node_30",
+            "FabricIngress.acl.punt_to_cpu" : "node_30",
+            "FabricIngress.acl.set_clone_session_id" : "node_30",
+            "FabricIngress.acl.drop" : "node_30",
+            "FabricIngress.acl.nop_acl" : "node_30"
           },
           "default_entry" : {
             "action_id" : 23,
@@ -14829,7 +14985,7 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 19,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 119,
@@ -14846,7 +15002,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -14873,7 +15029,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 20,
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 202,
@@ -14884,7 +15040,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -14907,7 +15063,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 21,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 236,
@@ -14918,7 +15074,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -14944,7 +15100,7 @@
         },
         {
           "name" : "FabricIngress.next.next_vlan",
-          "id" : 22,
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 86,
@@ -14955,7 +15111,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -14967,10 +15123,10 @@
           "direct_meters" : null,
           "action_ids" : [24, 4],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "node_38",
+          "base_default_next" : "node_35",
           "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_38",
-            "nop" : "node_38"
+            "FabricIngress.next.set_vlan" : "node_35",
+            "nop" : "node_35"
           },
           "default_entry" : {
             "action_id" : 4,
@@ -14980,8 +15136,8 @@
           }
         },
         {
-          "name" : "tbl_act_6",
-          "id" : 23,
+          "name" : "tbl_port_counter31",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -14995,22 +15151,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_40",
+          "action_ids" : [53],
+          "actions" : ["port_counter31"],
+          "base_default_next" : "node_37",
           "next_tables" : {
-            "act_6" : "node_40"
+            "port_counter31" : "node_37"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 24,
+          "name" : "tbl_port_counter34",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -15024,14 +15180,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["act_7"],
+          "action_ids" : [54],
+          "actions" : ["port_counter34"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_7" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "port_counter34" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15039,7 +15195,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 25,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -15091,23 +15247,23 @@
             "input" : [
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+                "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+                "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+                "value" : ["scalars", "userMetadata._ip_proto12"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                "value" : ["scalars", "userMetadata._l4_sport13"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                "value" : ["scalars", "userMetadata._l4_dport14"]
               }
             ]
           }
@@ -15134,32 +15290,15 @@
               }
             }
           },
-          "true_next" : "tbl_act",
+          "true_next" : "tbl_packetio25",
           "false_next" : "FabricIngress.spgw.interfaces"
         },
         {
-          "name" : "node_7",
+          "name" : "node_5",
           "id" : 1,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "spgw_tmp"]
-              }
-            }
-          },
-          "true_next" : "node_8",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_8",
-          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 256,
+            "line" : 255,
             "column" : 16,
             "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
@@ -15169,7 +15308,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+                "value" : ["scalars", "userMetadata._spgw_src_iface26"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -15178,14 +15317,14 @@
             }
           },
           "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
-          "false_next" : "node_10"
+          "false_next" : "node_7"
         },
         {
-          "name" : "node_10",
-          "id" : 3,
+          "name" : "node_7",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 260,
+            "line" : 259,
             "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
@@ -15204,11 +15343,11 @@
           "false_next" : "FabricIngress.spgw.downlink_pdrs"
         },
         {
-          "name" : "node_13",
-          "id" : 4,
+          "name" : "node_10",
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 264,
             "column" : 16,
             "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
           },
@@ -15218,7 +15357,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+                "value" : ["scalars", "userMetadata._spgw_src_iface26"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -15226,36 +15365,26 @@
               }
             }
           },
-          "true_next" : "tbl_act_2",
-          "false_next" : "node_15"
+          "true_next" : "tbl_spgw265",
+          "false_next" : "node_12"
         },
         {
-          "name" : "node_15",
-          "id" : 5,
+          "name" : "node_12",
+          "id" : 4,
           "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 270,
-            "column" : 16,
-            "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 24,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
               }
             }
           },
@@ -15263,8 +15392,8 @@
           "false_next" : "FabricIngress.spgw.fars"
         },
         {
-          "name" : "node_19",
-          "id" : 6,
+          "name" : "node_16",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 110,
@@ -15282,12 +15411,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_4",
-          "false_next" : "node_21"
+          "true_next" : "tbl_filtering111",
+          "false_next" : "node_18"
         },
         {
-          "name" : "node_21",
-          "id" : 7,
+          "name" : "node_18",
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 122,
@@ -15312,45 +15441,42 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_filtering127",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
-          "name" : "node_25",
-          "id" : 8,
+          "name" : "node_22",
+          "id" : 7,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 69,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+            "source_fragment" : "fabric_metadata.skip_forwarding"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+                    "value" : ["scalars", "userMetadata._skip_forwarding6"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "node_26",
+          "true_next" : "node_23",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_26",
-          "id" : 9,
+          "name" : "node_23",
+          "id" : 8,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 150,
@@ -15363,7 +15489,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -15372,11 +15498,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_28"
+          "false_next" : "node_25"
         },
         {
-          "name" : "node_28",
-          "id" : 10,
+          "name" : "node_25",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 151,
@@ -15389,7 +15515,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -15398,11 +15524,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_30"
+          "false_next" : "node_27"
         },
         {
-          "name" : "node_30",
-          "id" : 11,
+          "name" : "node_27",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 152,
@@ -15415,7 +15541,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -15427,32 +15553,29 @@
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_33",
-          "id" : 12,
+          "name" : "node_30",
+          "id" : 11,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 73,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_next == false"
+            "source_fragment" : "fabric_metadata.skip_next"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+                    "value" : ["scalars", "userMetadata._skip_next7"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -15460,8 +15583,8 @@
           "true_next" : "FabricIngress.next.xconnect"
         },
         {
-          "name" : "node_38",
-          "id" : 13,
+          "name" : "node_35",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -15482,12 +15605,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
-          "false_next" : "node_40"
+          "true_next" : "tbl_port_counter31",
+          "false_next" : "node_37"
         },
         {
-          "name" : "node_40",
-          "id" : 14,
+          "name" : "node_37",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -15508,7 +15631,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_port_counter34",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -15522,11 +15645,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_45",
+      "init_table" : "node_42",
       "tables" : [
         {
-          "name" : "tbl_act_8",
-          "id" : 26,
+          "name" : "tbl_packetio41",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -15540,22 +15663,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [101],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_47",
+          "action_ids" : [99],
+          "actions" : ["packetio41"],
+          "base_default_next" : "node_44",
           "next_tables" : {
-            "act_8" : "node_47"
+            "packetio41" : "node_44"
           },
           "default_entry" : {
-            "action_id" : 101,
+            "action_id" : 99,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_9",
-          "id" : 27,
+          "name" : "tbl_packetio44",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -15569,22 +15692,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [102],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_49",
+          "action_ids" : [100],
+          "actions" : ["packetio44"],
+          "base_default_next" : "node_46",
           "next_tables" : {
-            "act_9" : "node_49"
+            "packetio44" : "node_46"
           },
           "default_entry" : {
-            "action_id" : 102,
+            "action_id" : 100,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_10",
-          "id" : 28,
+          "name" : "tbl_next349",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 349,
@@ -15598,14 +15721,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [103],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_51",
+          "action_ids" : [101],
+          "actions" : ["next349"],
+          "base_default_next" : "node_48",
           "next_tables" : {
-            "act_10" : "node_51"
+            "next349" : "node_48"
           },
           "default_entry" : {
-            "action_id" : 103,
+            "action_id" : 101,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15613,7 +15736,7 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 29,
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -15627,14 +15750,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
+          "action_ids" : [93],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 93,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15642,7 +15765,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 30,
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 355,
@@ -15656,14 +15779,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96],
+          "action_ids" : [94],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15671,7 +15794,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 31,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -15682,7 +15805,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -15698,24 +15821,24 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97, 98, 99],
+          "action_ids" : [95, 96, 97],
           "actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
-          "base_default_next" : "node_56",
+          "base_default_next" : "node_53",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_56",
-            "FabricEgress.egress_next.pop_vlan" : "node_56",
-            "FabricEgress.egress_next.drop" : "node_56"
+            "FabricEgress.egress_next.push_vlan" : "node_53",
+            "FabricEgress.egress_next.pop_vlan" : "node_53",
+            "FabricEgress.egress_next.drop" : "node_53"
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 97,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
-          "id" : 32,
+          "name" : "tbl_next375",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 375,
@@ -15729,22 +15852,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_58",
+          "action_ids" : [103],
+          "actions" : ["next375"],
+          "base_default_next" : "node_55",
           "next_tables" : {
-            "act_12" : "node_58"
+            "next375" : "node_55"
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 103,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 33,
+          "name" : "tbl_next376",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 376,
@@ -15758,22 +15881,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_64",
+          "action_ids" : [102],
+          "actions" : ["next376"],
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "act_11" : "node_64"
+            "next376" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 102,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
-          "id" : 34,
+          "name" : "tbl_next379",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 379,
@@ -15787,22 +15910,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_62",
+          "action_ids" : [105],
+          "actions" : ["next379"],
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "act_14" : "node_62"
+            "next379" : "node_59"
           },
           "default_entry" : {
-            "action_id" : 107,
+            "action_id" : 105,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
-          "id" : 35,
+          "name" : "tbl_next380",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 380,
@@ -15816,14 +15939,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_64",
+          "action_ids" : [104],
+          "actions" : ["next380"],
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "act_13" : "node_64"
+            "next380" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 106,
+            "action_id" : 104,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15831,10 +15954,10 @@
         },
         {
           "name" : "tbl_spgw_gtpu_encap",
-          "id" : 36,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 340,
+            "line" : 339,
             "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
@@ -15845,25 +15968,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [100],
+          "action_ids" : [98],
           "actions" : ["FabricEgress.spgw.gtpu_encap"],
-          "base_default_next" : "node_67",
+          "base_default_next" : "node_64",
           "next_tables" : {
-            "FabricEgress.spgw.gtpu_encap" : "node_67"
+            "FabricEgress.spgw.gtpu_encap" : "node_64"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 98,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
-          "id" : 37,
+          "name" : "tbl_spgw342",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 342,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -15874,14 +15997,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_69",
+          "action_ids" : [106],
+          "actions" : ["spgw342"],
+          "base_default_next" : "node_66",
           "next_tables" : {
-            "act_15" : "node_69"
+            "spgw342" : "node_66"
           },
           "default_entry" : {
-            "action_id" : 108,
+            "action_id" : 106,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15889,7 +16012,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 38,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -15912,13 +16035,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport13"],
+              "target" : ["scalars", "userMetadata._l4_sport13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport14"],
+              "target" : ["scalars", "userMetadata._l4_dport14"],
               "mask" : null
             }
           ],
@@ -15928,23 +16051,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61, 57],
+          "action_ids" : [59, 55],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_72",
+          "base_default_next" : "node_69",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_72",
-            "nop" : "node_72"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_69",
+            "nop" : "node_69"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
-          "id" : 39,
+          "name" : "tbl_act",
+          "id" : 37,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15952,14 +16075,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109],
-          "actions" : ["act_16"],
+          "action_ids" : [107],
+          "actions" : ["act"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_16" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 109,
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15967,7 +16090,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 40,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -15988,23 +16111,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62, 58],
+          "action_ids" : [60, 56],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_75",
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_75",
-            "nop" : "node_75"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_72",
+            "nop" : "node_72"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 41,
+          "name" : "tbl_int_transit420",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -16018,14 +16141,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [110],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_77",
+          "action_ids" : [108],
+          "actions" : ["int_transit420"],
+          "base_default_next" : "node_74",
           "next_tables" : {
-            "act_17" : "node_77"
+            "int_transit420" : "node_74"
           },
           "default_entry" : {
-            "action_id" : 110,
+            "action_id" : 108,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16033,7 +16156,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 42,
+          "id" : 40,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -16054,7 +16177,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 59],
+          "action_ids" : [61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 57],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -16077,7 +16200,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 57,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16097,7 +16220,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 63,
+                "action_id" : 61,
                 "action_data" : []
               },
               "priority" : 1
@@ -16116,7 +16239,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 64,
+                "action_id" : 62,
                 "action_data" : []
               },
               "priority" : 2
@@ -16135,7 +16258,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 65,
+                "action_id" : 63,
                 "action_data" : []
               },
               "priority" : 3
@@ -16154,7 +16277,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 66,
+                "action_id" : 64,
                 "action_data" : []
               },
               "priority" : 4
@@ -16173,7 +16296,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 67,
+                "action_id" : 65,
                 "action_data" : []
               },
               "priority" : 5
@@ -16192,7 +16315,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 68,
+                "action_id" : 66,
                 "action_data" : []
               },
               "priority" : 6
@@ -16211,7 +16334,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 69,
+                "action_id" : 67,
                 "action_data" : []
               },
               "priority" : 7
@@ -16230,7 +16353,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 70,
+                "action_id" : 68,
                 "action_data" : []
               },
               "priority" : 8
@@ -16249,7 +16372,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 9
@@ -16268,7 +16391,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 10
@@ -16287,7 +16410,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 11
@@ -16306,7 +16429,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 12
@@ -16325,7 +16448,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 13
@@ -16344,7 +16467,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 14
@@ -16363,7 +16486,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 15
@@ -16382,7 +16505,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 16
@@ -16391,7 +16514,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 43,
+          "id" : 41,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -16412,30 +16535,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 60],
+          "action_ids" : [77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 58],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_18",
+          "base_default_next" : "tbl_int_transit425",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_18",
-            "NoAction" : "tbl_act_18"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_int_transit425",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_int_transit425",
+            "NoAction" : "tbl_int_transit425"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 58,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16455,7 +16578,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 1
@@ -16474,7 +16597,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 2
@@ -16493,7 +16616,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 3
@@ -16512,7 +16635,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 4
@@ -16531,7 +16654,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 5
@@ -16550,7 +16673,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 6
@@ -16569,7 +16692,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 7
@@ -16588,7 +16711,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 8
@@ -16607,7 +16730,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 9
@@ -16626,7 +16749,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 10
@@ -16645,7 +16768,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 11
@@ -16664,7 +16787,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 12
@@ -16683,7 +16806,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 91,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 13
@@ -16702,7 +16825,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 92,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 14
@@ -16721,7 +16844,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 93,
+                "action_id" : 91,
                 "action_data" : []
               },
               "priority" : 15
@@ -16740,7 +16863,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 94,
+                "action_id" : 92,
                 "action_data" : []
               },
               "priority" : 16
@@ -16748,8 +16871,8 @@
           ]
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 44,
+          "name" : "tbl_int_transit425",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -16763,22 +16886,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [112],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_81",
+          "action_ids" : [110],
+          "actions" : ["int_transit425"],
+          "base_default_next" : "node_78",
           "next_tables" : {
-            "act_19" : "node_81"
+            "int_transit425" : "node_78"
           },
           "default_entry" : {
-            "action_id" : 112,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
-          "id" : 45,
+          "name" : "tbl_int_transit428",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -16792,22 +16915,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [111],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_83",
+          "action_ids" : [109],
+          "actions" : ["int_transit428"],
+          "base_default_next" : "node_80",
           "next_tables" : {
-            "act_18" : "node_83"
+            "int_transit428" : "node_80"
           },
           "default_entry" : {
-            "action_id" : 111,
+            "action_id" : 109,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
-          "id" : 46,
+          "name" : "tbl_int_transit431",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -16821,22 +16944,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [113],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_85",
+          "action_ids" : [111],
+          "actions" : ["int_transit431"],
+          "base_default_next" : "node_82",
           "next_tables" : {
-            "act_20" : "node_85"
+            "int_transit431" : "node_82"
           },
           "default_entry" : {
-            "action_id" : 113,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 47,
+          "name" : "tbl_int_transit434",
+          "id" : 45,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -16850,14 +16973,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [114],
-          "actions" : ["act_21"],
+          "action_ids" : [112],
+          "actions" : ["int_transit434"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_21" : null
+            "int_transit434" : null
           },
           "default_entry" : {
-            "action_id" : 114,
+            "action_id" : 112,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16867,41 +16990,31 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_45",
-          "id" : 15,
+          "name" : "node_42",
+          "id" : 14,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 39,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
+            "filename" : "fabric.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out11"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._is_controller_packet_out11"]
               }
             }
           },
-          "true_next" : "tbl_act_8",
-          "false_next" : "node_47"
+          "true_next" : "tbl_packetio41",
+          "false_next" : "node_44"
         },
         {
-          "name" : "node_47",
-          "id" : 16,
+          "name" : "node_44",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -16922,12 +17035,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
-          "false_next" : "node_49"
+          "true_next" : "tbl_packetio44",
+          "false_next" : "node_46"
         },
         {
-          "name" : "node_49",
-          "id" : 17,
+          "name" : "node_46",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 347,
@@ -16941,21 +17054,11 @@
               "left" : {
                 "type" : "expression",
                 "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast10"]
-                      }
-                    }
-                  },
+                  "op" : "d2b",
+                  "left" : null,
                   "right" : {
-                    "type" : "bool",
-                    "value" : true
+                    "type" : "field",
+                    "value" : ["scalars", "userMetadata._is_multicast10"]
                   }
                 }
               },
@@ -16975,12 +17078,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
-          "false_next" : "node_51"
+          "true_next" : "tbl_next349",
+          "false_next" : "node_48"
         },
         {
-          "name" : "node_51",
-          "id" : 18,
+          "name" : "node_48",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 352,
@@ -16993,7 +17096,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+                "value" : ["scalars", "userMetadata._mpls_label4"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -17001,12 +17104,12 @@
               }
             }
           },
-          "true_next" : "node_52",
+          "true_next" : "node_49",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_52",
-          "id" : 19,
+          "name" : "node_49",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -17028,8 +17131,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_56",
-          "id" : 20,
+          "name" : "node_53",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 374,
@@ -17047,12 +17150,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
-          "false_next" : "node_60"
+          "true_next" : "tbl_next375",
+          "false_next" : "node_57"
         },
         {
-          "name" : "node_58",
-          "id" : 21,
+          "name" : "node_55",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 376,
@@ -17073,12 +17176,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_12",
-          "false_next" : "node_64"
+          "true_next" : "tbl_next376",
+          "false_next" : "node_61"
         },
         {
-          "name" : "node_60",
-          "id" : 22,
+          "name" : "node_57",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 378,
@@ -17106,7 +17209,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                    "value" : ["scalars", "userMetadata._fwd_type8"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -17116,12 +17219,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "node_64"
+          "true_next" : "tbl_next379",
+          "false_next" : "node_61"
         },
         {
-          "name" : "node_62",
-          "id" : 23,
+          "name" : "node_59",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 380,
@@ -17142,111 +17245,95 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
-          "false_next" : "node_64"
+          "true_next" : "tbl_next380",
+          "false_next" : "node_61"
         },
         {
-          "name" : "node_64",
-          "id" : 24,
+          "name" : "node_61",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 337,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
+            "source_fragment" : "fabric_md.spgw.skip_spgw"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
+                    "value" : ["scalars", "userMetadata._spgw_skip_spgw27"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "node_65",
-          "false_next" : "node_69"
+          "true_next" : "node_62",
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_65",
-          "id" : 25,
+          "name" : "node_62",
+          "id" : 24,
           "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 339,
-            "column" : 16,
-            "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
+            "filename" : "fabric.p4",
+            "line" : 106,
+            "column" : 24,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap29"]
               }
             }
           },
           "true_next" : "tbl_spgw_gtpu_encap",
-          "false_next" : "node_67"
+          "false_next" : "node_64"
         },
         {
-          "name" : "node_67",
-          "id" : 26,
+          "name" : "node_64",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 342,
+            "line" : 341,
             "column" : 16,
-            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
+                    "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr31"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "node_69"
+          "true_next" : "tbl_spgw342",
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_69",
-          "id" : 27,
+          "name" : "node_66",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -17322,44 +17409,34 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_70"
+          "true_next" : "node_67"
         },
         {
-          "name" : "node_70",
-          "id" : 28,
+          "name" : "node_67",
+          "id" : 27,
           "source_info" : {
-            "filename" : "include/int/int_main.p4",
-            "line" : 106,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.int_meta.source == true"
+            "filename" : "fabric.p4",
+            "line" : 112,
+            "column" : 36,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source32"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._int_meta_source32"]
               }
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_72"
+          "false_next" : "node_69"
         },
         {
-          "name" : "node_72",
-          "id" : 29,
+          "name" : "node_69",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -17378,44 +17455,41 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_16"
+          "true_next" : "tbl_act"
         },
         {
-          "name" : "node_75",
-          "id" : 30,
+          "name" : "node_72",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
             "column" : 12,
-            "source_fragment" : "fmeta.int_meta.transit == false"
+            "source_fragment" : "fmeta.int_meta.transit"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit33"]
+                    "value" : ["scalars", "userMetadata._int_meta_transit33"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "node_77"
+          "true_next" : "tbl_int_transit420",
+          "false_next" : "node_74"
         },
         {
-          "name" : "node_77",
-          "id" : 31,
+          "name" : "node_74",
+          "id" : 30,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -17438,8 +17512,8 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_81",
-          "id" : 32,
+          "name" : "node_78",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -17457,12 +17531,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_83"
+          "true_next" : "tbl_int_transit428",
+          "false_next" : "node_80"
         },
         {
-          "name" : "node_83",
-          "id" : 33,
+          "name" : "node_80",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -17480,12 +17554,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_20",
-          "false_next" : "node_85"
+          "true_next" : "tbl_int_transit431",
+          "false_next" : "node_82"
         },
         {
-          "name" : "node_85",
-          "id" : 34,
+          "name" : "node_82",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -17504,7 +17578,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_21"
+          "true_next" : "tbl_int_transit434"
         }
       ]
     }
@@ -17541,7 +17615,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 359,
+        "line" : 358,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -17617,33 +17691,21 @@
       ["standard_metadata", "egress_global_timestamp"]
     ],
     [
-      "intrinsic_metadata.lf_field_list",
-      ["standard_metadata", "lf_field_list"]
-    ],
-    [
       "intrinsic_metadata.mcast_grp",
       ["standard_metadata", "mcast_grp"]
     ],
     [
-      "intrinsic_metadata.resubmit_flag",
-      ["standard_metadata", "resubmit_flag"]
-    ],
-    [
       "intrinsic_metadata.egress_rid",
       ["standard_metadata", "egress_rid"]
     ],
     [
-      "intrinsic_metadata.recirculate_flag",
-      ["standard_metadata", "recirculate_flag"]
-    ],
-    [
       "intrinsic_metadata.priority",
       ["standard_metadata", "priority"]
     ]
   ],
   "program" : "fabric.p4",
   "__meta__" : {
-    "version" : [2, 18],
+    "version" : [2, 23],
     "compiler" : "https://github.com/p4lang/p4c"
   }
 }
\ No newline at end of file
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index 10b172b..bc8a97f 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -3,7 +3,7 @@
 }
 tables {
   preamble {
-    id: 33581620
+    id: 44526132
     name: "FabricIngress.process_set_source_sink.tb_set_source"
     alias: "tb_set_source"
   }
@@ -14,20 +14,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16778827
+    id: 21235275
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318787614
+  const_default_action_id: 28485346
+  direct_resource_ids: 318984222
   size: 511
 }
 tables {
   preamble {
-    id: 33611649
+    id: 43310977
     name: "FabricIngress.filtering.ingress_port_vlan"
     alias: "ingress_port_vlan"
   }
@@ -50,21 +50,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: 1024
 }
 tables {
   preamble {
-    id: 33596298
+    id: 49718154
     name: "FabricIngress.filtering.fwd_classifier"
     alias: "fwd_classifier"
   }
@@ -93,15 +93,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"
   }
@@ -118,20 +118,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"
   }
@@ -142,20 +142,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"
   }
@@ -166,13 +166,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
   }
@@ -180,7 +180,7 @@
 }
 tables {
   preamble {
-    id: 33618978
+    id: 44104738
     name: "FabricIngress.acl.acl"
     alias: "acl"
   }
@@ -257,27 +257,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"
   }
@@ -288,20 +288,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16790685
+    id: 22099101
   }
   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: 33596977
+    id: 48735793
     name: "FabricIngress.next.xconnect"
     alias: "xconnect"
   }
@@ -318,23 +318,23 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16842190
+    id: 24640974
   }
   action_refs {
-    id: 16837052
+    id: 30599612
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318778156
+  const_default_action_id: 28485346
+  direct_resource_ids: 321989420
   size: 1024
 }
 tables {
   preamble {
-    id: 33608588
+    id: 47960972
     name: "FabricIngress.next.hashed"
     alias: "hashed"
   }
@@ -345,27 +345,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"
   }
@@ -376,20 +376,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: 33557250
+    id: 36113154
     name: "FabricIngress.spgw.interfaces"
     alias: "interfaces"
   }
@@ -406,19 +406,19 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16810012
+    id: 18186268
   }
   action_refs {
-    id: 16783042
+    id: 29103810
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16783042
+  const_default_action_id: 29103810
   size: 128
 }
 tables {
   preamble {
-    id: 33566601
+    id: 47394697
     name: "FabricIngress.spgw.downlink_pdrs"
     alias: "downlink_pdrs"
   }
@@ -429,13 +429,13 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16800614
+    id: 18504550
   }
   action_refs {
-    id: 16785920
+    id: 25764352
   }
   action_refs {
-    id: 16800567
+    id: 21257015
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
@@ -443,7 +443,7 @@
 }
 tables {
   preamble {
-    id: 33606410
+    id: 46648074
     name: "FabricIngress.spgw.uplink_pdrs"
     alias: "uplink_pdrs"
   }
@@ -460,13 +460,13 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16800614
+    id: 18504550
   }
   action_refs {
-    id: 16785920
+    id: 25764352
   }
   action_refs {
-    id: 16800567
+    id: 21257015
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
@@ -474,7 +474,7 @@
 }
 tables {
   preamble {
-    id: 33599560
+    id: 47558728
     name: "FabricIngress.spgw.fars"
     alias: "fars"
   }
@@ -485,20 +485,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16820307
+    id: 24881235
   }
   action_refs {
-    id: 16814785
+    id: 29659841
   }
   action_refs {
-    id: 16814681
+    id: 30642777
   }
-  const_default_action_id: 16820307
+  const_default_action_id: 24881235
   size: 2048
 }
 tables {
   preamble {
-    id: 33612258
+    id: 44818914
     name: "FabricEgress.process_int_main.process_int_source.tb_int_source"
     alias: "tb_int_source"
   }
@@ -527,20 +527,20 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16785857
+    id: 20062657
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318800047
+  const_default_action_id: 28485346
+  direct_resource_ids: 322470063
   size: 1024
 }
 tables {
   preamble {
-    id: 33599867
+    id: 34910587
     name: "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
     alias: "tb_int_insert"
   }
@@ -551,19 +551,19 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16780783
+    id: 29232623
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
+  const_default_action_id: 28485346
   size: 1
 }
 tables {
   preamble {
-    id: 33599342
+    id: 49262446
     name: "FabricEgress.egress_next.egress_vlan"
     alias: "egress_vlan"
   }
@@ -580,58 +580,59 @@
     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: 16800567
+    id: 21257015
     name: "NoAction"
     alias: "NoAction"
+    annotations: "@noWarn(\"unused\")"
   }
 }
 actions {
   preamble {
-    id: 16778827
+    id: 21235275
     name: "FabricIngress.process_set_source_sink.int_set_source"
     alias: "int_set_source"
   }
 }
 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"
   }
@@ -643,7 +644,7 @@
 }
 actions {
   preamble {
-    id: 16840921
+    id: 25032921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
   }
@@ -655,7 +656,7 @@
 }
 actions {
   preamble {
-    id: 16811012
+    id: 21791748
     name: "FabricIngress.forwarding.set_next_id_bridging"
     alias: "set_next_id_bridging"
   }
@@ -667,7 +668,7 @@
 }
 actions {
   preamble {
-    id: 16827758
+    id: 30066030
     name: "FabricIngress.forwarding.pop_mpls_and_next"
     alias: "pop_mpls_and_next"
   }
@@ -679,7 +680,7 @@
 }
 actions {
   preamble {
-    id: 16777434
+    id: 19792090
     name: "FabricIngress.forwarding.set_next_id_routing_v4"
     alias: "set_next_id_routing_v4"
   }
@@ -691,14 +692,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"
   }
@@ -710,14 +711,14 @@
 }
 actions {
   preamble {
-    id: 16829684
+    id: 23579892
     name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16781601
+    id: 16912673
     name: "FabricIngress.acl.set_clone_session_id"
     alias: "set_clone_session_id"
   }
@@ -729,21 +730,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"
   }
@@ -755,7 +756,7 @@
 }
 actions {
   preamble {
-    id: 16842190
+    id: 24640974
     name: "FabricIngress.next.output_xconnect"
     alias: "output_xconnect"
   }
@@ -767,7 +768,7 @@
 }
 actions {
   preamble {
-    id: 16837052
+    id: 30599612
     name: "FabricIngress.next.set_next_id_xconnect"
     alias: "set_next_id_xconnect"
   }
@@ -779,7 +780,7 @@
 }
 actions {
   preamble {
-    id: 16815357
+    id: 27301117
     name: "FabricIngress.next.output_hashed"
     alias: "output_hashed"
   }
@@ -791,7 +792,7 @@
 }
 actions {
   preamble {
-    id: 16791402
+    id: 20985706
     name: "FabricIngress.next.routing_hashed"
     alias: "routing_hashed"
   }
@@ -813,7 +814,7 @@
 }
 actions {
   preamble {
-    id: 16779255
+    id: 27920375
     name: "FabricIngress.next.mpls_routing_hashed"
     alias: "mpls_routing_hashed"
   }
@@ -840,7 +841,7 @@
 }
 actions {
   preamble {
-    id: 16779917
+    id: 21629581
     name: "FabricIngress.next.set_mcast_group_id"
     alias: "set_mcast_group_id"
   }
@@ -852,7 +853,7 @@
 }
 actions {
   preamble {
-    id: 16810012
+    id: 18186268
     name: "FabricIngress.spgw.load_iface"
     alias: "load_iface"
   }
@@ -864,14 +865,14 @@
 }
 actions {
   preamble {
-    id: 16783042
+    id: 29103810
     name: "FabricIngress.spgw.iface_miss"
     alias: "iface_miss"
   }
 }
 actions {
   preamble {
-    id: 16800614
+    id: 18504550
     name: "FabricIngress.spgw.load_pdr"
     alias: "load_pdr"
   }
@@ -893,7 +894,7 @@
 }
 actions {
   preamble {
-    id: 16785920
+    id: 25764352
     name: "FabricIngress.spgw.load_pdr_qos"
     alias: "load_pdr_qos"
   }
@@ -920,7 +921,7 @@
 }
 actions {
   preamble {
-    id: 16820307
+    id: 24881235
     name: "FabricIngress.spgw.load_normal_far"
     alias: "load_normal_far"
   }
@@ -937,7 +938,7 @@
 }
 actions {
   preamble {
-    id: 16814785
+    id: 29659841
     name: "FabricIngress.spgw.load_tunnel_far"
     alias: "load_tunnel_far"
   }
@@ -974,7 +975,7 @@
 }
 actions {
   preamble {
-    id: 16814681
+    id: 30642777
     name: "FabricIngress.spgw.load_dbuf_far"
     alias: "load_dbuf_far"
   }
@@ -1011,7 +1012,7 @@
 }
 actions {
   preamble {
-    id: 16785857
+    id: 20062657
     name: "FabricEgress.process_int_main.process_int_source.int_source_dscp"
     alias: "int_source_dscp"
   }
@@ -1038,7 +1039,7 @@
 }
 actions {
   preamble {
-    id: 16780783
+    id: 29232623
     name: "FabricEgress.process_int_main.process_int_transit.init_metadata"
     alias: "init_metadata"
   }
@@ -1050,39 +1051,39 @@
 }
 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: 302011205
+    id: 314528581
     name: "FabricIngress.port_counters_control.egress_port_counter"
     alias: "egress_port_counter"
   }
@@ -1093,7 +1094,7 @@
 }
 counters {
   preamble {
-    id: 302002771
+    id: 312947283
     name: "FabricIngress.port_counters_control.ingress_port_counter"
     alias: "ingress_port_counter"
   }
@@ -1104,7 +1105,7 @@
 }
 counters {
   preamble {
-    id: 302043952
+    id: 308925232
     name: "FabricIngress.spgw.pdr_counter"
     alias: "FabricIngress.spgw.pdr_counter"
   }
@@ -1126,139 +1127,139 @@
 }
 direct_counters {
   preamble {
-    id: 318787614
+    id: 318984222
     name: "FabricIngress.process_set_source_sink.counter_set_source"
     alias: "counter_set_source"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33581620
+  direct_table_id: 44526132
 }
 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: 318778156
+    id: 321989420
     name: "FabricIngress.next.xconnect_counter"
     alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33596977
+  direct_table_id: 48735793
 }
 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: 318800047
+    id: 322470063
     name: "FabricEgress.process_int_main.process_int_source.counter_int_source"
     alias: "counter_int_source"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33612258
+  direct_table_id: 44818914
 }
 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
 }
 controller_packet_metadata {
   preamble {
-    id: 67146229
+    id: 81826293
     name: "packet_in"
     alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
@@ -1276,7 +1277,7 @@
 }
 controller_packet_metadata {
   preamble {
-    id: 67121543
+    id: 76689799
     name: "packet_out"
     alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
@@ -1288,8 +1289,13 @@
   }
   metadata {
     id: 2
+    name: "do_forwarding"
+    bitwidth: 1
+  }
+  metadata {
+    id: 3
     name: "_pad"
-    bitwidth: 7
+    bitwidth: 6
   }
 }
 type_info {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index a23792d..3150ab0a 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -4,58 +4,65 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp_0", 16, false],
+        ["tmp_0", 1, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
-        ["tmp", 32, false],
-        ["tmp_3", 32, false],
-        ["spgw_tmp", 1, false],
-        ["fabric_metadata_t._ip_eth_type0", 16, false],
-        ["fabric_metadata_t._vlan_id1", 12, false],
-        ["fabric_metadata_t._vlan_pri2", 3, false],
-        ["fabric_metadata_t._vlan_cfi3", 1, false],
-        ["fabric_metadata_t._mpls_label4", 20, false],
-        ["fabric_metadata_t._mpls_ttl5", 8, false],
-        ["fabric_metadata_t._skip_forwarding6", 1, false],
-        ["fabric_metadata_t._skip_next7", 1, false],
-        ["fabric_metadata_t._fwd_type8", 3, false],
-        ["fabric_metadata_t._next_id9", 32, false],
-        ["fabric_metadata_t._is_multicast10", 1, false],
-        ["fabric_metadata_t._is_controller_packet_out11", 1, false],
-        ["fabric_metadata_t._ip_proto12", 8, false],
-        ["fabric_metadata_t._l4_sport13", 16, false],
-        ["fabric_metadata_t._l4_dport14", 16, false],
-        ["fabric_metadata_t._ipv4_src_addr15", 32, false],
-        ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
-        ["fabric_metadata_t._inner_l4_sport17", 16, false],
-        ["fabric_metadata_t._inner_l4_dport18", 16, false],
-        ["fabric_metadata_t._spgw_ipv4_len19", 16, false],
-        ["fabric_metadata_t._spgw_teid20", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_src_port21", 16, false],
-        ["fabric_metadata_t._spgw_tunnel_src_addr22", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_dst_addr23", 32, false],
-        ["fabric_metadata_t._spgw_ctr_id24", 32, false],
-        ["fabric_metadata_t._spgw_far_id25", 32, false],
-        ["fabric_metadata_t._spgw_src_iface26", 8, false],
-        ["fabric_metadata_t._spgw_skip_spgw27", 1, false],
-        ["fabric_metadata_t._spgw_notify_spgwc28", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_encap29", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_decap30", 1, false],
-        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr31", 1, false],
+        ["tmp_3", 16, false],
+        ["tmp_5", 4, false],
+        ["tmp_6", 16, false],
+        ["tmp_2", 32, false],
+        ["tmp_4", 32, false],
+        ["userMetadata._ip_eth_type0", 16, false],
+        ["userMetadata._vlan_id1", 12, false],
+        ["userMetadata._vlan_pri2", 3, false],
+        ["userMetadata._vlan_cfi3", 1, false],
+        ["userMetadata._mpls_label4", 20, false],
+        ["userMetadata._mpls_ttl5", 8, false],
+        ["userMetadata._skip_forwarding6", 1, false],
+        ["userMetadata._skip_next7", 1, false],
+        ["userMetadata._fwd_type8", 3, false],
+        ["userMetadata._next_id9", 32, false],
+        ["userMetadata._is_multicast10", 1, false],
+        ["userMetadata._is_controller_packet_out11", 1, false],
+        ["userMetadata._ip_proto12", 8, false],
+        ["userMetadata._l4_sport13", 16, false],
+        ["userMetadata._l4_dport14", 16, false],
+        ["userMetadata._ipv4_src_addr15", 32, false],
+        ["userMetadata._ipv4_dst_addr16", 32, false],
+        ["userMetadata._inner_l4_sport17", 16, false],
+        ["userMetadata._inner_l4_dport18", 16, false],
+        ["userMetadata._spgw_ipv4_len19", 16, false],
+        ["userMetadata._spgw_teid20", 32, false],
+        ["userMetadata._spgw_tunnel_src_port21", 16, false],
+        ["userMetadata._spgw_tunnel_src_addr22", 32, false],
+        ["userMetadata._spgw_tunnel_dst_addr23", 32, false],
+        ["userMetadata._spgw_ctr_id24", 32, false],
+        ["userMetadata._spgw_far_id25", 32, false],
+        ["userMetadata._spgw_src_iface26", 8, false],
+        ["userMetadata._spgw_skip_spgw27", 1, false],
+        ["userMetadata._spgw_notify_spgwc28", 1, false],
+        ["userMetadata._spgw_needs_gtpu_encap29", 1, false],
+        ["userMetadata._spgw_needs_gtpu_decap30", 1, false],
+        ["userMetadata._spgw_skip_egress_pdr_ctr31", 1, false],
         ["_padding_0", 3, false]
       ]
     },
     {
-      "name" : "standard_metadata",
+      "name" : "packet_out_header_t",
       "id" : 1,
       "fields" : [
+        ["egress_port", 9, false],
+        ["do_forwarding", 1, false],
+        ["_pad", 6, false]
+      ]
+    },
+    {
+      "name" : "standard_metadata",
+      "id" : 2,
+      "fields" : [
         ["ingress_port", 9, false],
         ["egress_spec", 9, false],
         ["egress_port", 9, false],
-        ["clone_spec", 32, false],
         ["instance_type", 32, false],
-        ["drop", 1, false],
-        ["recirculate_port", 16, false],
         ["packet_length", 32, false],
         ["enq_timestamp", 32, false],
         ["enq_qdepth", 19, false],
@@ -63,20 +70,17 @@
         ["deq_qdepth", 19, false],
         ["ingress_global_timestamp", 48, false],
         ["egress_global_timestamp", 48, false],
-        ["lf_field_list", 32, false],
         ["mcast_grp", 16, false],
-        ["resubmit_flag", 32, false],
         ["egress_rid", 16, false],
-        ["recirculate_flag", 32, false],
         ["checksum_error", 1, false],
         ["parser_error", 32, false],
         ["priority", 3, false],
-        ["_padding", 2, false]
+        ["_padding", 3, false]
       ]
     },
     {
       "name" : "ethernet_t",
-      "id" : 2,
+      "id" : 3,
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false]
@@ -84,7 +88,7 @@
     },
     {
       "name" : "vlan_tag_t",
-      "id" : 3,
+      "id" : 4,
       "fields" : [
         ["eth_type", 16, false],
         ["pri", 3, false],
@@ -94,14 +98,14 @@
     },
     {
       "name" : "eth_type_t",
-      "id" : 4,
+      "id" : 5,
       "fields" : [
         ["value", 16, false]
       ]
     },
     {
       "name" : "mpls_t",
-      "id" : 5,
+      "id" : 6,
       "fields" : [
         ["label", 20, false],
         ["tc", 3, false],
@@ -111,7 +115,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 6,
+      "id" : 7,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -130,7 +134,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 7,
+      "id" : 8,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -140,7 +144,7 @@
     },
     {
       "name" : "gtpu_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["version", 3, false],
         ["pt", 1, false],
@@ -155,7 +159,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -172,7 +176,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 10,
+      "id" : 11,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -183,14 +187,6 @@
       ]
     },
     {
-      "name" : "packet_out_header_t",
-      "id" : 11,
-      "fields" : [
-        ["egress_port", 9, false],
-        ["_pad", 7, false]
-      ]
-    },
-    {
       "name" : "packet_in_header_t",
       "id" : 12,
       "fields" : [
@@ -201,148 +197,155 @@
   ],
   "headers" : [
     {
-      "name" : "scalars",
+      "name" : "tmp",
       "id" : 0,
+      "header_type" : "packet_out_header_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "scalars",
+      "id" : 1,
       "header_type" : "scalars_0",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "header_type" : "standard_metadata",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "ethernet",
-      "id" : 2,
+      "id" : 3,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "vlan_tag",
-      "id" : 3,
-      "header_type" : "vlan_tag_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "inner_vlan_tag",
       "id" : 4,
       "header_type" : "vlan_tag_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "eth_type",
+      "name" : "inner_vlan_tag",
       "id" : 5,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "eth_type",
+      "id" : 6,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "mpls",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "outer_gtpu",
-      "id" : 9,
-      "header_type" : "gtpu_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "gtpu",
       "id" : 10,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "inner_ipv4",
+      "name" : "gtpu",
       "id" : 11,
+      "header_type" : "gtpu_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "inner_ipv4",
+      "id" : 12,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_tcp",
-      "id" : 13,
+      "id" : 14,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_icmp",
-      "id" : 14,
+      "id" : 15,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 15,
+      "id" : 16,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 16,
+      "id" : 17,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 17,
+      "id" : 18,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 18,
+      "id" : 19,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 19,
+      "id" : 20,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 20,
+      "id" : 21,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
@@ -395,10 +398,11 @@
               "type" : "hexstr",
               "value" : "0x00ff",
               "mask" : null,
-              "next_state" : "parse_packet_out"
+              "next_state" : "check_packet_out"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -411,12 +415,229 @@
           ]
         },
         {
-          "name" : "parse_packet_out",
+          "name" : "check_packet_out",
           "id" : 1,
           "parser_ops" : [
             {
               "parameters" : [
                 {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_6"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 16]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "parameters" : [
+                    {
+                      "type" : "header",
+                      "value" : "tmp"
+                    }
+                  ],
+                  "op" : "add_header"
+                }
+              ],
+              "op" : "primitive"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "egress_port"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x7"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01ff"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "do_forwarding"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "_pad"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "tmp_6"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x3f"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x00",
+              "mask" : null,
+              "next_state" : "parse_packet_out_and_accept"
+            },
+            {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : "strip_packet_out"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_0"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_packet_out_and_accept",
+          "id" : 2,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
                   "type" : "regular",
                   "value" : "packet_out"
                 }
@@ -426,7 +647,32 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "strip_packet_out",
+          "id" : 3,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "hexstr",
+                  "value" : "0x00000010"
+                }
+              ],
+              "op" : "advance"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -435,7 +681,7 @@
         },
         {
           "name" : "parse_ethernet",
-          "id" : 2,
+          "id" : 4,
           "parser_ops" : [
             {
               "parameters" : [
@@ -450,7 +696,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+                  "value" : ["scalars", "userMetadata._vlan_id1"]
                 },
                 {
                   "type" : "hexstr",
@@ -463,7 +709,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -493,7 +739,8 @@
               "next_state" : "parse_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -501,13 +748,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
         {
           "name" : "parse_vlan_tag",
-          "id" : 3,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -522,7 +769,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -540,7 +787,8 @@
               "next_state" : "parse_inner_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -548,13 +796,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
         {
           "name" : "parse_inner_vlan_tag",
-          "id" : 4,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -568,7 +816,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -577,7 +826,7 @@
         },
         {
           "name" : "parse_eth_type",
-          "id" : 5,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -603,7 +852,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -617,7 +867,7 @@
         },
         {
           "name" : "parse_mpls",
-          "id" : 6,
+          "id" : 8,
           "parser_ops" : [
             {
               "parameters" : [
@@ -632,7 +882,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+                  "value" : ["scalars", "userMetadata._mpls_label4"]
                 },
                 {
                   "type" : "field",
@@ -645,7 +895,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+                  "value" : ["scalars", "userMetadata._mpls_ttl5"]
                 },
                 {
                   "type" : "field",
@@ -658,7 +908,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_5"]
                 },
                 {
                   "type" : "lookahead",
@@ -676,7 +926,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -684,13 +935,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_5"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 7,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -705,7 +956,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+                  "value" : ["scalars", "userMetadata._ip_proto12"]
                 },
                 {
                   "type" : "field",
@@ -718,7 +969,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+                  "value" : ["scalars", "userMetadata._ip_eth_type0"]
                 },
                 {
                   "type" : "hexstr",
@@ -731,7 +982,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+                  "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
                 },
                 {
                   "type" : "field",
@@ -744,7 +995,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+                  "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
                 },
                 {
                   "type" : "field",
@@ -774,7 +1025,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -788,7 +1040,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 8,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -803,7 +1055,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                  "value" : ["scalars", "userMetadata._l4_sport13"]
                 },
                 {
                   "type" : "field",
@@ -816,7 +1068,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                  "value" : ["scalars", "userMetadata._l4_dport14"]
                 },
                 {
                   "type" : "field",
@@ -828,7 +1080,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -837,7 +1090,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 9,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -852,7 +1105,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                  "value" : ["scalars", "userMetadata._l4_sport13"]
                 },
                 {
                   "type" : "field",
@@ -865,7 +1118,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                  "value" : ["scalars", "userMetadata._l4_dport14"]
                 },
                 {
                   "type" : "field",
@@ -883,7 +1136,8 @@
               "next_state" : "parse_gtpu"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -897,7 +1151,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 10,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -911,7 +1165,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -920,7 +1175,7 @@
         },
         {
           "name" : "parse_gtpu",
-          "id" : 11,
+          "id" : 13,
           "parser_ops" : [
             {
               "parameters" : [
@@ -961,7 +1216,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -975,7 +1231,7 @@
         },
         {
           "name" : "parse_inner_udp",
-          "id" : 12,
+          "id" : 14,
           "parser_ops" : [
             {
               "parameters" : [
@@ -990,7 +1246,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+                  "value" : ["scalars", "userMetadata._inner_l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -1003,7 +1259,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+                  "value" : ["scalars", "userMetadata._inner_l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -1015,7 +1271,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -1032,11 +1289,12 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 268,
+        "line" : 283,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "ipv4", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "ipv4", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp"],
+      "primitives" : []
     }
   ],
   "meter_arrays" : [],
@@ -1178,7 +1436,7 @@
       "id" : 11,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 109,
+        "line" : 108,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1202,7 +1460,7 @@
       "id" : 13,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 296,
+        "line" : 295,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1278,7 +1536,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 359,
+        "line" : 358,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1462,7 +1720,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -1491,7 +1749,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -1538,7 +1796,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -1569,7 +1827,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+              "value" : ["scalars", "userMetadata._fwd_type8"]
             },
             {
               "type" : "runtime_data",
@@ -1600,7 +1858,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -1631,7 +1889,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             },
             {
               "type" : "hexstr",
@@ -1650,7 +1908,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -1681,7 +1939,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -1718,7 +1976,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -1763,7 +2021,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -1845,7 +2103,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -1892,7 +2150,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -1954,7 +2212,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
@@ -2105,7 +2363,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             },
             {
               "type" : "runtime_data",
@@ -2212,7 +2470,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_multicast10"]
+              "value" : ["scalars", "userMetadata._is_multicast10"]
             },
             {
               "type" : "expression",
@@ -2248,7 +2506,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -2257,7 +2515,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2267,7 +2525,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -2286,7 +2544,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -2305,7 +2563,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -2324,11 +2582,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -2343,11 +2601,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -2467,7 +2725,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -2476,7 +2734,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2486,7 +2744,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -2505,7 +2763,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -2524,7 +2782,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -2543,11 +2801,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -2562,11 +2820,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -2671,7 +2929,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -2680,7 +2938,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2690,7 +2948,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -2709,7 +2967,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -2728,7 +2986,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -2747,11 +3005,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -2766,11 +3024,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -2890,7 +3148,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -2899,7 +3157,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2909,7 +3167,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -2928,7 +3186,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -2947,7 +3205,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -2966,11 +3224,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -2985,11 +3243,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3075,7 +3333,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3084,7 +3342,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3094,7 +3352,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3113,7 +3371,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3132,7 +3390,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3151,11 +3409,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3170,11 +3428,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3294,7 +3552,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3303,7 +3561,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3313,7 +3571,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3332,7 +3590,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3351,7 +3609,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3370,11 +3628,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3389,11 +3647,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3498,7 +3756,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3507,7 +3765,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3517,7 +3775,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3536,7 +3794,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3555,7 +3813,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3574,11 +3832,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3593,11 +3851,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3717,7 +3975,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3726,7 +3984,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3736,7 +3994,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "userMetadata._ip_proto12"]
             },
             {
               "type" : "field",
@@ -3755,7 +4013,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "field",
@@ -3774,7 +4032,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "field",
@@ -3793,11 +4051,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "value" : ["scalars", "userMetadata._inner_l4_sport17"]
             }
           ],
           "source_info" : {
@@ -3812,11 +4070,11 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+              "value" : ["scalars", "userMetadata._inner_l4_dport18"]
             }
           ],
           "source_info" : {
@@ -3907,7 +4165,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+              "value" : ["scalars", "userMetadata._spgw_src_iface26"]
             },
             {
               "type" : "runtime_data",
@@ -3916,7 +4174,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 121,
+            "line" : 120,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -3926,7 +4184,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
+              "value" : ["scalars", "userMetadata._spgw_skip_spgw27"]
             },
             {
               "type" : "expression",
@@ -3945,7 +4203,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 122,
+            "line" : 121,
             "column" : 33,
             "source_fragment" : "= false; ..."
           }
@@ -3962,7 +4220,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+              "value" : ["scalars", "userMetadata._spgw_src_iface26"]
             },
             {
               "type" : "hexstr",
@@ -3971,7 +4229,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 109,
+            "line" : 110,
             "column" : 44,
             "source_fragment" : "8w0; ..."
           }
@@ -3981,7 +4239,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
+              "value" : ["scalars", "userMetadata._spgw_skip_spgw27"]
             },
             {
               "type" : "expression",
@@ -4000,7 +4258,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 126,
+            "line" : 125,
             "column" : 33,
             "source_fragment" : "= true; ..."
           }
@@ -4030,7 +4288,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4039,7 +4297,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4049,7 +4307,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4058,7 +4316,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4068,7 +4326,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -4097,7 +4355,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4127,7 +4385,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4136,7 +4394,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4146,7 +4404,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4155,7 +4413,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4165,7 +4423,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -4194,7 +4452,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4228,7 +4486,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4237,7 +4495,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4247,7 +4505,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4256,7 +4514,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4266,7 +4524,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -4295,7 +4553,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4329,7 +4587,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4338,7 +4596,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4348,7 +4606,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4357,7 +4615,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4367,7 +4625,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -4396,7 +4654,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 152,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4422,7 +4680,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 195,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -4452,45 +4749,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 196,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 197,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -4500,7 +4758,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -4529,7 +4787,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 198,
+            "line" : 197,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4571,7 +4829,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 206,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -4601,45 +4898,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 207,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 208,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -4649,7 +4907,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -4678,7 +4936,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 209,
+            "line" : 208,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4688,7 +4946,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap29"]
             },
             {
               "type" : "expression",
@@ -4707,7 +4965,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 211,
+            "line" : 210,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -4717,7 +4975,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
+              "value" : ["scalars", "userMetadata._spgw_teid20"]
             },
             {
               "type" : "runtime_data",
@@ -4726,7 +4984,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 211,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -4736,7 +4994,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port21"]
             },
             {
               "type" : "runtime_data",
@@ -4745,7 +5003,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 212,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4755,7 +5013,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr22"]
             },
             {
               "type" : "runtime_data",
@@ -4764,27 +5022,27 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
+            "line" : 213,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
             "line" : 214,
             "column" : 39,
-            "source_fragment" : "= tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 4
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 215,
-            "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
@@ -4793,7 +5051,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "runtime_data",
@@ -4802,7 +5060,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 217,
+            "line" : 216,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4812,7 +5070,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "runtime_data",
@@ -4821,7 +5079,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 217,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4831,7 +5089,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "runtime_data",
@@ -4840,7 +5098,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 218,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4850,7 +5108,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "hexstr",
@@ -4859,7 +5117,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 220,
+            "line" : 219,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -4901,7 +5159,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+              "value" : ["scalars", "userMetadata._skip_forwarding6"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 206,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._skip_next7"]
             },
             {
               "type" : "expression",
@@ -4931,45 +5228,6 @@
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 207,
-            "column" : 34,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 0
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 208,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -4979,7 +5237,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -5008,7 +5266,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 209,
+            "line" : 208,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -5018,7 +5276,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap29"]
             },
             {
               "type" : "expression",
@@ -5037,7 +5295,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 211,
+            "line" : 210,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -5047,7 +5305,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
+              "value" : ["scalars", "userMetadata._spgw_teid20"]
             },
             {
               "type" : "runtime_data",
@@ -5056,7 +5314,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 211,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -5066,7 +5324,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port21"]
             },
             {
               "type" : "runtime_data",
@@ -5075,7 +5333,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 212,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -5085,7 +5343,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr22"]
             },
             {
               "type" : "runtime_data",
@@ -5094,27 +5352,27 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
+            "line" : 213,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
             "line" : 214,
             "column" : 39,
-            "source_fragment" : "= tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 4
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 215,
-            "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
@@ -5123,7 +5381,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
             },
             {
               "type" : "runtime_data",
@@ -5132,7 +5390,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 217,
+            "line" : 216,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -5142,7 +5400,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
             },
             {
               "type" : "runtime_data",
@@ -5151,7 +5409,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 217,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -5161,7 +5419,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "userMetadata._l4_sport13"]
             },
             {
               "type" : "runtime_data",
@@ -5170,7 +5428,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 218,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -5180,7 +5438,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+              "value" : ["scalars", "userMetadata._l4_dport14"]
             },
             {
               "type" : "hexstr",
@@ -5189,7 +5447,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 220,
+            "line" : 219,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -5199,7 +5457,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
+              "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr31"]
             },
             {
               "type" : "expression",
@@ -5218,7 +5476,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 231,
+            "line" : 230,
             "column" : 43,
             "source_fragment" : "= true; ..."
           }
@@ -5226,7 +5484,7 @@
       ]
     },
     {
-      "name" : "act",
+      "name" : "packetio25",
       "id" : 46,
       "runtime_data" : [],
       "primitives" : [
@@ -5269,7 +5527,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out11"]
+              "value" : ["scalars", "userMetadata._is_controller_packet_out11"]
             },
             {
               "type" : "expression",
@@ -5306,71 +5564,11 @@
       ]
     },
     {
-      "name" : "act_0",
+      "name" : "spgw265",
       "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_1",
-      "id" : 48,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_2",
-      "id" : 49,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "count",
           "parameters" : [
             {
@@ -5379,12 +5577,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
+            "line" : 265,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -5392,8 +5590,8 @@
       ]
     },
     {
-      "name" : "act_3",
-      "id" : 50,
+      "name" : "spgw282",
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5401,7 +5599,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len19"]
             },
             {
               "type" : "field",
@@ -5410,7 +5608,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 282,
             "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
@@ -5418,8 +5616,8 @@
       ]
     },
     {
-      "name" : "act_4",
-      "id" : 51,
+      "name" : "filtering111",
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5427,7 +5625,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             },
             {
               "type" : "field",
@@ -5446,7 +5644,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             },
             {
               "type" : "field",
@@ -5465,7 +5663,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             },
             {
               "type" : "field",
@@ -5482,8 +5680,8 @@
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 52,
+      "name" : "filtering127",
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5491,7 +5689,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+              "value" : ["scalars", "userMetadata._mpls_ttl5"]
             },
             {
               "type" : "hexstr",
@@ -5508,8 +5706,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 53,
+      "name" : "port_counter31",
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5517,7 +5715,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_2"]
             },
             {
               "type" : "expression",
@@ -5553,7 +5751,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_2"]
             }
           ],
           "source_info" : {
@@ -5566,8 +5764,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 54,
+      "name" : "port_counter34",
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5575,7 +5773,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             },
             {
               "type" : "expression",
@@ -5611,7 +5809,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             }
           ],
           "source_info" : {
@@ -5625,7 +5823,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 55,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5652,7 +5850,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type0"]
             }
           ],
           "source_info" : {
@@ -5666,7 +5864,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 56,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5693,7 +5891,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+              "value" : ["scalars", "userMetadata._mpls_label4"]
             }
           ],
           "source_info" : {
@@ -5750,7 +5948,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl5"]
+              "value" : ["scalars", "userMetadata._mpls_ttl5"]
             }
           ],
           "source_info" : {
@@ -5774,7 +5972,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -5783,7 +5981,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 57,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5810,7 +6008,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi3"]
             }
           ],
           "source_info" : {
@@ -5829,7 +6027,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri2"]
             }
           ],
           "source_info" : {
@@ -5853,7 +6051,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -5867,7 +6065,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id1"]
             }
           ],
           "source_info" : {
@@ -5881,7 +6079,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 58,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5903,7 +6101,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.drop",
-      "id" : 59,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5925,7 +6123,7 @@
     },
     {
       "name" : "FabricEgress.spgw.gtpu_encap",
-      "id" : 60,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5938,7 +6136,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 301,
+            "line" : 300,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -5957,7 +6155,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 302,
+            "line" : 301,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -5976,7 +6174,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 134,
+            "line" : 135,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -5995,7 +6193,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 304,
+            "line" : 303,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -6014,7 +6212,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 305,
+            "line" : 304,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -6056,7 +6254,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 305,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -6075,7 +6273,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 308,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -6094,7 +6292,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 308,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -6113,7 +6311,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -6132,7 +6330,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 147,
+            "line" : 148,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -6151,7 +6349,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 131,
+            "line" : 132,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -6165,12 +6363,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr22"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -6184,12 +6382,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr23"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 313,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -6208,7 +6406,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 314,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -6223,7 +6421,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 317,
+            "line" : 316,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -6237,12 +6435,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port21"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -6261,7 +6459,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -6285,7 +6483,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
+                        "value" : ["scalars", "userMetadata._spgw_ipv4_len19"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6303,7 +6501,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -6322,7 +6520,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -6337,7 +6535,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -6356,7 +6554,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 326,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -6375,7 +6573,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 326,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -6394,7 +6592,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 328,
+            "line" : 327,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -6413,7 +6611,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 329,
+            "line" : 328,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -6432,7 +6630,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 329,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -6451,7 +6649,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -6470,7 +6668,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -6484,12 +6682,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len19"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 332,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -6503,12 +6701,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
+              "value" : ["scalars", "userMetadata._spgw_teid20"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -6516,8 +6714,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 61,
+      "name" : "packetio41",
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6533,8 +6731,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 62,
+      "name" : "packetio44",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6584,8 +6782,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 63,
+      "name" : "next349",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6606,8 +6804,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 64,
+      "name" : "next376",
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6628,8 +6826,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 65,
+      "name" : "next375",
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6677,8 +6875,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 66,
+      "name" : "next380",
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6699,8 +6897,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 67,
+      "name" : "next379",
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6748,8 +6946,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 68,
+      "name" : "spgw342",
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6761,12 +6959,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 342,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -6787,7 +6985,7 @@
       "init_table" : "node_2",
       "tables" : [
         {
-          "name" : "tbl_act",
+          "name" : "tbl_packetio25",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -6803,10 +7001,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [46],
-          "actions" : ["act"],
+          "actions" : ["packetio25"],
           "base_default_next" : "FabricIngress.spgw.interfaces",
           "next_tables" : {
-            "act" : "FabricIngress.spgw.interfaces"
+            "packetio25" : "FabricIngress.spgw.interfaces"
           },
           "default_entry" : {
             "action_id" : 46,
@@ -6820,7 +7018,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 130,
+            "line" : 129,
             "column" : 10,
             "source_fragment" : "interfaces"
           },
@@ -6848,8 +7046,8 @@
           "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_0",
-            "__MISS__" : "tbl_act_1"
+            "__HIT__" : "node_5",
+            "__MISS__" : "node_16"
           },
           "default_entry" : {
             "action_id" : 38,
@@ -6859,54 +7057,8 @@
           }
         },
         {
-          "name" : "tbl_act_0",
-          "id" : 2,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_0"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_0" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 47,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [48],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_1" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 48,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
-          "id" : 4,
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 75,
@@ -6941,12 +7093,12 @@
           "direct_meters" : null,
           "action_ids" : [29, 30, 31, 32],
           "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown"],
-          "base_default_next" : "node_10",
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_7",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_7"
           },
           "default_entry" : {
             "action_id" : 32,
@@ -7040,10 +7192,10 @@
         },
         {
           "name" : "FabricIngress.spgw.uplink_pdrs",
-          "id" : 5,
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 177,
+            "line" : 176,
             "column" : 10,
             "source_fragment" : "uplink_pdrs"
           },
@@ -7069,11 +7221,11 @@
           "direct_meters" : null,
           "action_ids" : [40, 42, 8],
           "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
-          "base_default_next" : "node_13",
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw.load_pdr" : "node_13",
-            "FabricIngress.spgw.load_pdr_qos" : "node_13",
-            "NoAction" : "node_13"
+            "FabricIngress.spgw.load_pdr" : "node_10",
+            "FabricIngress.spgw.load_pdr_qos" : "node_10",
+            "NoAction" : "node_10"
           },
           "default_entry" : {
             "action_id" : 8,
@@ -7084,10 +7236,10 @@
         },
         {
           "name" : "FabricIngress.spgw.downlink_pdrs",
-          "id" : 6,
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 165,
+            "line" : 164,
             "column" : 10,
             "source_fragment" : "downlink_pdrs"
           },
@@ -7107,11 +7259,11 @@
           "direct_meters" : null,
           "action_ids" : [39, 41, 7],
           "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
-          "base_default_next" : "node_13",
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw.load_pdr" : "node_13",
-            "FabricIngress.spgw.load_pdr_qos" : "node_13",
-            "NoAction" : "node_13"
+            "FabricIngress.spgw.load_pdr" : "node_10",
+            "FabricIngress.spgw.load_pdr_qos" : "node_10",
+            "NoAction" : "node_10"
           },
           "default_entry" : {
             "action_id" : 7,
@@ -7121,11 +7273,11 @@
           }
         },
         {
-          "name" : "tbl_act_2",
-          "id" : 7,
+          "name" : "tbl_spgw265",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
+            "line" : 265,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -7136,14 +7288,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_15",
+          "action_ids" : [47],
+          "actions" : ["spgw265"],
+          "base_default_next" : "node_12",
           "next_tables" : {
-            "act_2" : "node_15"
+            "spgw265" : "node_12"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7151,7 +7303,7 @@
         },
         {
           "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
-          "id" : 8,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 75,
@@ -7285,10 +7437,10 @@
         },
         {
           "name" : "FabricIngress.spgw.fars",
-          "id" : 9,
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 234,
+            "line" : 233,
             "column" : 10,
             "source_fragment" : "fars"
           },
@@ -7296,7 +7448,7 @@
             {
               "match_type" : "exact",
               "name" : "far_id",
-              "target" : ["scalars", "fabric_metadata_t._spgw_far_id25"],
+              "target" : ["scalars", "userMetadata._spgw_far_id25"],
               "mask" : null
             }
           ],
@@ -7308,11 +7460,11 @@
           "direct_meters" : null,
           "action_ids" : [43, 44, 45],
           "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
-          "base_default_next" : "tbl_act_3",
+          "base_default_next" : "tbl_spgw282",
           "next_tables" : {
-            "FabricIngress.spgw.load_normal_far" : "tbl_act_3",
-            "FabricIngress.spgw.load_tunnel_far" : "tbl_act_3",
-            "FabricIngress.spgw.load_dbuf_far" : "tbl_act_3"
+            "FabricIngress.spgw.load_normal_far" : "tbl_spgw282",
+            "FabricIngress.spgw.load_tunnel_far" : "tbl_spgw282",
+            "FabricIngress.spgw.load_dbuf_far" : "tbl_spgw282"
           },
           "default_entry" : {
             "action_id" : 43,
@@ -7322,11 +7474,11 @@
           }
         },
         {
-          "name" : "tbl_act_3",
-          "id" : 10,
+          "name" : "tbl_spgw282",
+          "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 282,
             "column" : 36,
             "source_fragment" : "="
           },
@@ -7337,22 +7489,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
-          "actions" : ["act_3"],
-          "base_default_next" : "node_19",
+          "action_ids" : [48],
+          "actions" : ["spgw282"],
+          "base_default_next" : "node_16",
           "next_tables" : {
-            "act_3" : "node_19"
+            "spgw282" : "node_16"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_4",
-          "id" : 11,
+          "name" : "tbl_filtering111",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 111,
@@ -7366,22 +7518,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["act_4"],
-          "base_default_next" : "node_21",
+          "action_ids" : [49],
+          "actions" : ["filtering111"],
+          "base_default_next" : "node_18",
           "next_tables" : {
-            "act_4" : "node_21"
+            "filtering111" : "node_18"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
-          "id" : 12,
+          "name" : "tbl_filtering127",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 127,
@@ -7395,14 +7547,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_5"],
+          "action_ids" : [50],
+          "actions" : ["filtering127"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_5" : "FabricIngress.filtering.ingress_port_vlan"
+            "filtering127" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7410,7 +7562,7 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 13,
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 53,
@@ -7460,7 +7612,7 @@
         },
         {
           "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 14,
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 92,
@@ -7489,7 +7641,7 @@
             {
               "match_type" : "exact",
               "name" : "ip_eth_type",
-              "target" : ["scalars", "fabric_metadata_t._ip_eth_type0"],
+              "target" : ["scalars", "userMetadata._ip_eth_type0"],
               "mask" : null
             }
           ],
@@ -7501,9 +7653,9 @@
           "direct_meters" : null,
           "action_ids" : [12],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_25",
+          "base_default_next" : "node_22",
           "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_25"
+            "FabricIngress.filtering.set_forwarding_type" : "node_22"
           },
           "default_entry" : {
             "action_id" : 12,
@@ -7514,7 +7666,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 15,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 46,
@@ -7525,7 +7677,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -7557,7 +7709,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 16,
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 71,
@@ -7568,7 +7720,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t._mpls_label4"],
+              "target" : ["scalars", "userMetadata._mpls_label4"],
               "mask" : null
             }
           ],
@@ -7594,7 +7746,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 17,
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 108,
@@ -7605,7 +7757,7 @@
             {
               "match_type" : "lpm",
               "name" : "ipv4_dst",
-              "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"],
+              "target" : ["scalars", "userMetadata._ipv4_dst_addr16"],
               "mask" : null
             }
           ],
@@ -7632,7 +7784,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 18,
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 60,
@@ -7649,19 +7801,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto12"],
+              "target" : ["scalars", "userMetadata._ip_proto12"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport13"],
+              "target" : ["scalars", "userMetadata._l4_sport13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport14"],
+              "target" : ["scalars", "userMetadata._l4_dport14"],
               "mask" : null
             },
             {
@@ -7721,13 +7873,13 @@
           "direct_meters" : null,
           "action_ids" : [17, 18, 19, 20, 21],
           "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
-          "base_default_next" : "node_33",
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_33",
-            "FabricIngress.acl.punt_to_cpu" : "node_33",
-            "FabricIngress.acl.set_clone_session_id" : "node_33",
-            "FabricIngress.acl.drop" : "node_33",
-            "FabricIngress.acl.nop_acl" : "node_33"
+            "FabricIngress.acl.set_next_id_acl" : "node_30",
+            "FabricIngress.acl.punt_to_cpu" : "node_30",
+            "FabricIngress.acl.set_clone_session_id" : "node_30",
+            "FabricIngress.acl.drop" : "node_30",
+            "FabricIngress.acl.nop_acl" : "node_30"
           },
           "default_entry" : {
             "action_id" : 21,
@@ -7738,7 +7890,7 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 19,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 119,
@@ -7755,7 +7907,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -7782,7 +7934,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 20,
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 202,
@@ -7793,7 +7945,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -7816,7 +7968,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 21,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 236,
@@ -7827,7 +7979,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -7853,7 +8005,7 @@
         },
         {
           "name" : "FabricIngress.next.next_vlan",
-          "id" : 22,
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 86,
@@ -7864,7 +8016,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id9"],
+              "target" : ["scalars", "userMetadata._next_id9"],
               "mask" : null
             }
           ],
@@ -7876,10 +8028,10 @@
           "direct_meters" : null,
           "action_ids" : [22, 3],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "node_38",
+          "base_default_next" : "node_35",
           "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_38",
-            "nop" : "node_38"
+            "FabricIngress.next.set_vlan" : "node_35",
+            "nop" : "node_35"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -7889,8 +8041,8 @@
           }
         },
         {
-          "name" : "tbl_act_6",
-          "id" : 23,
+          "name" : "tbl_port_counter31",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -7904,22 +8056,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_40",
+          "action_ids" : [51],
+          "actions" : ["port_counter31"],
+          "base_default_next" : "node_37",
           "next_tables" : {
-            "act_6" : "node_40"
+            "port_counter31" : "node_37"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 24,
+          "name" : "tbl_port_counter34",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -7933,14 +8085,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["act_7"],
+          "action_ids" : [52],
+          "actions" : ["port_counter34"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_7" : null
+            "port_counter34" : null
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7963,23 +8115,23 @@
             "input" : [
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+                "value" : ["scalars", "userMetadata._ipv4_src_addr15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+                "value" : ["scalars", "userMetadata._ipv4_dst_addr16"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+                "value" : ["scalars", "userMetadata._ip_proto12"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+                "value" : ["scalars", "userMetadata._l4_sport13"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+                "value" : ["scalars", "userMetadata._l4_dport14"]
               }
             ]
           }
@@ -8006,32 +8158,15 @@
               }
             }
           },
-          "true_next" : "tbl_act",
+          "true_next" : "tbl_packetio25",
           "false_next" : "FabricIngress.spgw.interfaces"
         },
         {
-          "name" : "node_7",
+          "name" : "node_5",
           "id" : 1,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "spgw_tmp"]
-              }
-            }
-          },
-          "true_next" : "node_8",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_8",
-          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 256,
+            "line" : 255,
             "column" : 16,
             "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
@@ -8041,7 +8176,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+                "value" : ["scalars", "userMetadata._spgw_src_iface26"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -8050,14 +8185,14 @@
             }
           },
           "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
-          "false_next" : "node_10"
+          "false_next" : "node_7"
         },
         {
-          "name" : "node_10",
-          "id" : 3,
+          "name" : "node_7",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 260,
+            "line" : 259,
             "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
@@ -8076,11 +8211,11 @@
           "false_next" : "FabricIngress.spgw.downlink_pdrs"
         },
         {
-          "name" : "node_13",
-          "id" : 4,
+          "name" : "node_10",
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 264,
             "column" : 16,
             "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
           },
@@ -8090,7 +8225,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+                "value" : ["scalars", "userMetadata._spgw_src_iface26"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -8098,36 +8233,26 @@
               }
             }
           },
-          "true_next" : "tbl_act_2",
-          "false_next" : "node_15"
+          "true_next" : "tbl_spgw265",
+          "false_next" : "node_12"
         },
         {
-          "name" : "node_15",
-          "id" : 5,
+          "name" : "node_12",
+          "id" : 4,
           "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 270,
-            "column" : 16,
-            "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 24,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
               }
             }
           },
@@ -8135,8 +8260,8 @@
           "false_next" : "FabricIngress.spgw.fars"
         },
         {
-          "name" : "node_19",
-          "id" : 6,
+          "name" : "node_16",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 110,
@@ -8154,12 +8279,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_4",
-          "false_next" : "node_21"
+          "true_next" : "tbl_filtering111",
+          "false_next" : "node_18"
         },
         {
-          "name" : "node_21",
-          "id" : 7,
+          "name" : "node_18",
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 122,
@@ -8184,45 +8309,42 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_filtering127",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
-          "name" : "node_25",
-          "id" : 8,
+          "name" : "node_22",
+          "id" : 7,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 69,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+            "source_fragment" : "fabric_metadata.skip_forwarding"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+                    "value" : ["scalars", "userMetadata._skip_forwarding6"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
-          "true_next" : "node_26",
+          "true_next" : "node_23",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_26",
-          "id" : 9,
+          "name" : "node_23",
+          "id" : 8,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 150,
@@ -8235,7 +8357,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -8244,11 +8366,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_28"
+          "false_next" : "node_25"
         },
         {
-          "name" : "node_28",
-          "id" : 10,
+          "name" : "node_25",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 151,
@@ -8261,7 +8383,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -8270,11 +8392,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_30"
+          "false_next" : "node_27"
         },
         {
-          "name" : "node_30",
-          "id" : 11,
+          "name" : "node_27",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 152,
@@ -8287,7 +8409,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                "value" : ["scalars", "userMetadata._fwd_type8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -8299,32 +8421,29 @@
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_33",
-          "id" : 12,
+          "name" : "node_30",
+          "id" : 11,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 73,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_next == false"
+            "source_fragment" : "fabric_metadata.skip_next"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+                    "value" : ["scalars", "userMetadata._skip_next7"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -8332,8 +8451,8 @@
           "true_next" : "FabricIngress.next.xconnect"
         },
         {
-          "name" : "node_38",
-          "id" : 13,
+          "name" : "node_35",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -8354,12 +8473,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
-          "false_next" : "node_40"
+          "true_next" : "tbl_port_counter31",
+          "false_next" : "node_37"
         },
         {
-          "name" : "node_40",
-          "id" : 14,
+          "name" : "node_37",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -8381,7 +8500,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_7"
+          "true_next" : "tbl_port_counter34"
         }
       ]
     },
@@ -8394,11 +8513,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_44",
+      "init_table" : "node_41",
       "tables" : [
         {
-          "name" : "tbl_act_8",
-          "id" : 25,
+          "name" : "tbl_packetio41",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -8412,22 +8531,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_46",
+          "action_ids" : [59],
+          "actions" : ["packetio41"],
+          "base_default_next" : "node_43",
           "next_tables" : {
-            "act_8" : "node_46"
+            "packetio41" : "node_43"
           },
           "default_entry" : {
-            "action_id" : 61,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_9",
-          "id" : 26,
+          "name" : "tbl_packetio44",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -8441,22 +8560,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_48",
+          "action_ids" : [60],
+          "actions" : ["packetio44"],
+          "base_default_next" : "node_45",
           "next_tables" : {
-            "act_9" : "node_48"
+            "packetio44" : "node_45"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_10",
-          "id" : 27,
+          "name" : "tbl_next349",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 349,
@@ -8470,14 +8589,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_50",
+          "action_ids" : [61],
+          "actions" : ["next349"],
+          "base_default_next" : "node_47",
           "next_tables" : {
-            "act_10" : "node_50"
+            "next349" : "node_47"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -8485,7 +8604,7 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 28,
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -8499,14 +8618,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
+          "action_ids" : [53],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -8514,7 +8633,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 29,
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 355,
@@ -8528,14 +8647,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
+          "action_ids" : [54],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -8543,7 +8662,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 30,
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -8554,7 +8673,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id1"],
               "mask" : null
             },
             {
@@ -8570,24 +8689,24 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57, 58, 59],
+          "action_ids" : [55, 56, 57],
           "actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
-          "base_default_next" : "node_55",
+          "base_default_next" : "node_52",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_55",
-            "FabricEgress.egress_next.pop_vlan" : "node_55",
-            "FabricEgress.egress_next.drop" : "node_55"
+            "FabricEgress.egress_next.push_vlan" : "node_52",
+            "FabricEgress.egress_next.pop_vlan" : "node_52",
+            "FabricEgress.egress_next.drop" : "node_52"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
-          "id" : 31,
+          "name" : "tbl_next375",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 375,
@@ -8601,22 +8720,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_57",
+          "action_ids" : [63],
+          "actions" : ["next375"],
+          "base_default_next" : "node_54",
           "next_tables" : {
-            "act_12" : "node_57"
+            "next375" : "node_54"
           },
           "default_entry" : {
-            "action_id" : 65,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 32,
+          "name" : "tbl_next376",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 376,
@@ -8630,22 +8749,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_63",
+          "action_ids" : [62],
+          "actions" : ["next376"],
+          "base_default_next" : "node_60",
           "next_tables" : {
-            "act_11" : "node_63"
+            "next376" : "node_60"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
-          "id" : 33,
+          "name" : "tbl_next379",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 379,
@@ -8659,22 +8778,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_61",
+          "action_ids" : [65],
+          "actions" : ["next379"],
+          "base_default_next" : "node_58",
           "next_tables" : {
-            "act_14" : "node_61"
+            "next379" : "node_58"
           },
           "default_entry" : {
-            "action_id" : 67,
+            "action_id" : 65,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
-          "id" : 34,
+          "name" : "tbl_next380",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 380,
@@ -8688,14 +8807,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_63",
+          "action_ids" : [64],
+          "actions" : ["next380"],
+          "base_default_next" : "node_60",
           "next_tables" : {
-            "act_13" : "node_63"
+            "next380" : "node_60"
           },
           "default_entry" : {
-            "action_id" : 66,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -8703,10 +8822,10 @@
         },
         {
           "name" : "tbl_spgw_gtpu_encap",
-          "id" : 35,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 340,
+            "line" : 339,
             "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
@@ -8717,25 +8836,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
+          "action_ids" : [58],
           "actions" : ["FabricEgress.spgw.gtpu_encap"],
-          "base_default_next" : "node_66",
+          "base_default_next" : "node_63",
           "next_tables" : {
-            "FabricEgress.spgw.gtpu_encap" : "node_66"
+            "FabricEgress.spgw.gtpu_encap" : "node_63"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
-          "id" : 36,
+          "name" : "tbl_spgw342",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 342,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -8746,14 +8865,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_15"],
+          "action_ids" : [66],
+          "actions" : ["spgw342"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_15" : null
+            "spgw342" : null
           },
           "default_entry" : {
-            "action_id" : 68,
+            "action_id" : 66,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -8763,41 +8882,31 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_44",
-          "id" : 15,
+          "name" : "node_41",
+          "id" : 14,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 39,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
+            "filename" : "fabric.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out11"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._is_controller_packet_out11"]
               }
             }
           },
-          "true_next" : "tbl_act_8",
-          "false_next" : "node_46"
+          "true_next" : "tbl_packetio41",
+          "false_next" : "node_43"
         },
         {
-          "name" : "node_46",
-          "id" : 16,
+          "name" : "node_43",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -8818,12 +8927,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
-          "false_next" : "node_48"
+          "true_next" : "tbl_packetio44",
+          "false_next" : "node_45"
         },
         {
-          "name" : "node_48",
-          "id" : 17,
+          "name" : "node_45",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 347,
@@ -8837,21 +8946,11 @@
               "left" : {
                 "type" : "expression",
                 "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast10"]
-                      }
-                    }
-                  },
+                  "op" : "d2b",
+                  "left" : null,
                   "right" : {
-                    "type" : "bool",
-                    "value" : true
+                    "type" : "field",
+                    "value" : ["scalars", "userMetadata._is_multicast10"]
                   }
                 }
               },
@@ -8871,12 +8970,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
-          "false_next" : "node_50"
+          "true_next" : "tbl_next349",
+          "false_next" : "node_47"
         },
         {
-          "name" : "node_50",
-          "id" : 18,
+          "name" : "node_47",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 352,
@@ -8889,7 +8988,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._mpls_label4"]
+                "value" : ["scalars", "userMetadata._mpls_label4"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -8897,12 +8996,12 @@
               }
             }
           },
-          "true_next" : "node_51",
+          "true_next" : "node_48",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_51",
-          "id" : 19,
+          "name" : "node_48",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -8924,8 +9023,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_55",
-          "id" : 20,
+          "name" : "node_52",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 374,
@@ -8943,12 +9042,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
-          "false_next" : "node_59"
+          "true_next" : "tbl_next375",
+          "false_next" : "node_56"
         },
         {
-          "name" : "node_57",
-          "id" : 21,
+          "name" : "node_54",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 376,
@@ -8969,12 +9068,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_12",
-          "false_next" : "node_63"
+          "true_next" : "tbl_next376",
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_59",
-          "id" : 22,
+          "name" : "node_56",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 378,
@@ -9002,7 +9101,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._fwd_type8"]
+                    "value" : ["scalars", "userMetadata._fwd_type8"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -9012,12 +9111,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "node_63"
+          "true_next" : "tbl_next379",
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_61",
-          "id" : 23,
+          "name" : "node_58",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 380,
@@ -9038,107 +9137,91 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
-          "false_next" : "node_63"
+          "true_next" : "tbl_next380",
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_63",
-          "id" : 24,
+          "name" : "node_60",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 337,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
+            "source_fragment" : "fabric_md.spgw.skip_spgw"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
+                    "value" : ["scalars", "userMetadata._spgw_skip_spgw27"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
           "false_next" : null,
-          "true_next" : "node_64"
+          "true_next" : "node_61"
         },
         {
-          "name" : "node_64",
-          "id" : 25,
+          "name" : "node_61",
+          "id" : 24,
           "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 339,
-            "column" : 16,
-            "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
+            "filename" : "fabric.p4",
+            "line" : 106,
+            "column" : 24,
+            "source_fragment" : "fabric_metadata"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap29"]
               }
             }
           },
           "true_next" : "tbl_spgw_gtpu_encap",
-          "false_next" : "node_66"
+          "false_next" : "node_63"
         },
         {
-          "name" : "node_66",
-          "id" : 26,
+          "name" : "node_63",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 342,
+            "line" : 341,
             "column" : 16,
-            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
+                    "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr31"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_15"
+          "true_next" : "tbl_spgw342"
         }
       ]
     }
@@ -9175,7 +9258,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 359,
+        "line" : 358,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -9251,33 +9334,21 @@
       ["standard_metadata", "egress_global_timestamp"]
     ],
     [
-      "intrinsic_metadata.lf_field_list",
-      ["standard_metadata", "lf_field_list"]
-    ],
-    [
       "intrinsic_metadata.mcast_grp",
       ["standard_metadata", "mcast_grp"]
     ],
     [
-      "intrinsic_metadata.resubmit_flag",
-      ["standard_metadata", "resubmit_flag"]
-    ],
-    [
       "intrinsic_metadata.egress_rid",
       ["standard_metadata", "egress_rid"]
     ],
     [
-      "intrinsic_metadata.recirculate_flag",
-      ["standard_metadata", "recirculate_flag"]
-    ],
-    [
       "intrinsic_metadata.priority",
       ["standard_metadata", "priority"]
     ]
   ],
   "program" : "fabric.p4",
   "__meta__" : {
-    "version" : [2, 18],
+    "version" : [2, 23],
     "compiler" : "https://github.com/p4lang/p4c"
   }
 }
\ No newline at end of file
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index d8d338d..1cf1c34 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -3,7 +3,7 @@
 }
 tables {
   preamble {
-    id: 33611649
+    id: 43310977
     name: "FabricIngress.filtering.ingress_port_vlan"
     alias: "ingress_port_vlan"
   }
@@ -26,21 +26,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: 1024
 }
 tables {
   preamble {
-    id: 33596298
+    id: 49718154
     name: "FabricIngress.filtering.fwd_classifier"
     alias: "fwd_classifier"
   }
@@ -69,15 +69,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"
   }
@@ -94,20 +94,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"
   }
@@ -118,20 +118,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"
   }
@@ -142,13 +142,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
   }
@@ -156,7 +156,7 @@
 }
 tables {
   preamble {
-    id: 33618978
+    id: 44104738
     name: "FabricIngress.acl.acl"
     alias: "acl"
   }
@@ -233,27 +233,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"
   }
@@ -264,20 +264,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16790685
+    id: 22099101
   }
   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: 33596977
+    id: 48735793
     name: "FabricIngress.next.xconnect"
     alias: "xconnect"
   }
@@ -294,23 +294,23 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16842190
+    id: 24640974
   }
   action_refs {
-    id: 16837052
+    id: 30599612
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318778156
+  const_default_action_id: 28485346
+  direct_resource_ids: 321989420
   size: 1024
 }
 tables {
   preamble {
-    id: 33608588
+    id: 47960972
     name: "FabricIngress.next.hashed"
     alias: "hashed"
   }
@@ -321,27 +321,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"
   }
@@ -352,20 +352,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: 33557250
+    id: 36113154
     name: "FabricIngress.spgw.interfaces"
     alias: "interfaces"
   }
@@ -382,19 +382,19 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16810012
+    id: 18186268
   }
   action_refs {
-    id: 16783042
+    id: 29103810
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16783042
+  const_default_action_id: 29103810
   size: 128
 }
 tables {
   preamble {
-    id: 33566601
+    id: 47394697
     name: "FabricIngress.spgw.downlink_pdrs"
     alias: "downlink_pdrs"
   }
@@ -405,13 +405,13 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16800614
+    id: 18504550
   }
   action_refs {
-    id: 16785920
+    id: 25764352
   }
   action_refs {
-    id: 16800567
+    id: 21257015
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
@@ -419,7 +419,7 @@
 }
 tables {
   preamble {
-    id: 33606410
+    id: 46648074
     name: "FabricIngress.spgw.uplink_pdrs"
     alias: "uplink_pdrs"
   }
@@ -436,13 +436,13 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16800614
+    id: 18504550
   }
   action_refs {
-    id: 16785920
+    id: 25764352
   }
   action_refs {
-    id: 16800567
+    id: 21257015
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
@@ -450,7 +450,7 @@
 }
 tables {
   preamble {
-    id: 33599560
+    id: 47558728
     name: "FabricIngress.spgw.fars"
     alias: "fars"
   }
@@ -461,20 +461,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16820307
+    id: 24881235
   }
   action_refs {
-    id: 16814785
+    id: 29659841
   }
   action_refs {
-    id: 16814681
+    id: 30642777
   }
-  const_default_action_id: 16820307
+  const_default_action_id: 24881235
   size: 2048
 }
 tables {
   preamble {
-    id: 33599342
+    id: 49262446
     name: "FabricEgress.egress_next.egress_vlan"
     alias: "egress_vlan"
   }
@@ -491,51 +491,52 @@
     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: 16800567
+    id: 21257015
     name: "NoAction"
     alias: "NoAction"
+    annotations: "@noWarn(\"unused\")"
   }
 }
 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"
   }
@@ -547,7 +548,7 @@
 }
 actions {
   preamble {
-    id: 16840921
+    id: 25032921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
   }
@@ -559,7 +560,7 @@
 }
 actions {
   preamble {
-    id: 16811012
+    id: 21791748
     name: "FabricIngress.forwarding.set_next_id_bridging"
     alias: "set_next_id_bridging"
   }
@@ -571,7 +572,7 @@
 }
 actions {
   preamble {
-    id: 16827758
+    id: 30066030
     name: "FabricIngress.forwarding.pop_mpls_and_next"
     alias: "pop_mpls_and_next"
   }
@@ -583,7 +584,7 @@
 }
 actions {
   preamble {
-    id: 16777434
+    id: 19792090
     name: "FabricIngress.forwarding.set_next_id_routing_v4"
     alias: "set_next_id_routing_v4"
   }
@@ -595,14 +596,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"
   }
@@ -614,14 +615,14 @@
 }
 actions {
   preamble {
-    id: 16829684
+    id: 23579892
     name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16781601
+    id: 16912673
     name: "FabricIngress.acl.set_clone_session_id"
     alias: "set_clone_session_id"
   }
@@ -633,21 +634,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"
   }
@@ -659,7 +660,7 @@
 }
 actions {
   preamble {
-    id: 16842190
+    id: 24640974
     name: "FabricIngress.next.output_xconnect"
     alias: "output_xconnect"
   }
@@ -671,7 +672,7 @@
 }
 actions {
   preamble {
-    id: 16837052
+    id: 30599612
     name: "FabricIngress.next.set_next_id_xconnect"
     alias: "set_next_id_xconnect"
   }
@@ -683,7 +684,7 @@
 }
 actions {
   preamble {
-    id: 16815357
+    id: 27301117
     name: "FabricIngress.next.output_hashed"
     alias: "output_hashed"
   }
@@ -695,7 +696,7 @@
 }
 actions {
   preamble {
-    id: 16791402
+    id: 20985706
     name: "FabricIngress.next.routing_hashed"
     alias: "routing_hashed"
   }
@@ -717,7 +718,7 @@
 }
 actions {
   preamble {
-    id: 16779255
+    id: 27920375
     name: "FabricIngress.next.mpls_routing_hashed"
     alias: "mpls_routing_hashed"
   }
@@ -744,7 +745,7 @@
 }
 actions {
   preamble {
-    id: 16779917
+    id: 21629581
     name: "FabricIngress.next.set_mcast_group_id"
     alias: "set_mcast_group_id"
   }
@@ -756,7 +757,7 @@
 }
 actions {
   preamble {
-    id: 16810012
+    id: 18186268
     name: "FabricIngress.spgw.load_iface"
     alias: "load_iface"
   }
@@ -768,14 +769,14 @@
 }
 actions {
   preamble {
-    id: 16783042
+    id: 29103810
     name: "FabricIngress.spgw.iface_miss"
     alias: "iface_miss"
   }
 }
 actions {
   preamble {
-    id: 16800614
+    id: 18504550
     name: "FabricIngress.spgw.load_pdr"
     alias: "load_pdr"
   }
@@ -797,7 +798,7 @@
 }
 actions {
   preamble {
-    id: 16785920
+    id: 25764352
     name: "FabricIngress.spgw.load_pdr_qos"
     alias: "load_pdr_qos"
   }
@@ -824,7 +825,7 @@
 }
 actions {
   preamble {
-    id: 16820307
+    id: 24881235
     name: "FabricIngress.spgw.load_normal_far"
     alias: "load_normal_far"
   }
@@ -841,7 +842,7 @@
 }
 actions {
   preamble {
-    id: 16814785
+    id: 29659841
     name: "FabricIngress.spgw.load_tunnel_far"
     alias: "load_tunnel_far"
   }
@@ -878,7 +879,7 @@
 }
 actions {
   preamble {
-    id: 16814681
+    id: 30642777
     name: "FabricIngress.spgw.load_dbuf_far"
     alias: "load_dbuf_far"
   }
@@ -915,39 +916,39 @@
 }
 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: 302011205
+    id: 314528581
     name: "FabricIngress.port_counters_control.egress_port_counter"
     alias: "egress_port_counter"
   }
@@ -958,7 +959,7 @@
 }
 counters {
   preamble {
-    id: 302002771
+    id: 312947283
     name: "FabricIngress.port_counters_control.ingress_port_counter"
     alias: "ingress_port_counter"
   }
@@ -969,7 +970,7 @@
 }
 counters {
   preamble {
-    id: 302043952
+    id: 308925232
     name: "FabricIngress.spgw.pdr_counter"
     alias: "FabricIngress.spgw.pdr_counter"
   }
@@ -991,117 +992,117 @@
 }
 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: 318778156
+    id: 321989420
     name: "FabricIngress.next.xconnect_counter"
     alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33596977
+  direct_table_id: 48735793
 }
 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
 }
 controller_packet_metadata {
   preamble {
-    id: 67146229
+    id: 81826293
     name: "packet_in"
     alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
@@ -1119,7 +1120,7 @@
 }
 controller_packet_metadata {
   preamble {
-    id: 67121543
+    id: 76689799
     name: "packet_out"
     alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
@@ -1131,8 +1132,13 @@
   }
   metadata {
     id: 2
+    name: "do_forwarding"
+    bitwidth: 1
+  }
+  metadata {
+    id: 3
     name: "_pad"
-    bitwidth: 7
+    bitwidth: 6
   }
 }
 type_info {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 3dcb17b..43db30e 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -4,42 +4,49 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp", 16, false],
-        ["tmp_0", 16, false],
-        ["tmp_1", 4, false],
+        ["tmp_0", 1, false],
+        ["tmp_1", 16, false],
+        ["tmp_3", 16, false],
+        ["tmp_5", 4, false],
+        ["tmp_6", 16, false],
         ["tmp_2", 32, false],
-        ["tmp_3", 32, false],
-        ["fabric_metadata_t.ip_eth_type", 16, false],
-        ["fabric_metadata_t.vlan_id", 12, false],
-        ["fabric_metadata_t.vlan_pri", 3, false],
-        ["fabric_metadata_t.vlan_cfi", 1, false],
-        ["fabric_metadata_t.mpls_label", 20, false],
-        ["fabric_metadata_t.mpls_ttl", 8, false],
-        ["fabric_metadata_t.skip_forwarding", 1, false],
-        ["fabric_metadata_t.skip_next", 1, false],
-        ["fabric_metadata_t.fwd_type", 3, false],
-        ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.is_multicast", 1, false],
-        ["fabric_metadata_t.is_controller_packet_out", 1, false],
-        ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_sport", 16, false],
-        ["fabric_metadata_t.l4_dport", 16, false],
-        ["fabric_metadata_t.ipv4_src_addr", 32, false],
-        ["fabric_metadata_t.ipv4_dst_addr", 32, false],
-        ["_padding_0", 1, false]
+        ["tmp_4", 32, false],
+        ["userMetadata.ip_eth_type", 16, false],
+        ["userMetadata.vlan_id", 12, false],
+        ["userMetadata.vlan_pri", 3, false],
+        ["userMetadata.vlan_cfi", 1, false],
+        ["userMetadata.mpls_label", 20, false],
+        ["userMetadata.mpls_ttl", 8, false],
+        ["userMetadata.skip_forwarding", 1, false],
+        ["userMetadata.skip_next", 1, false],
+        ["userMetadata.fwd_type", 3, false],
+        ["userMetadata.next_id", 32, false],
+        ["userMetadata.is_multicast", 1, false],
+        ["userMetadata.is_controller_packet_out", 1, false],
+        ["userMetadata.ip_proto", 8, false],
+        ["userMetadata.l4_sport", 16, false],
+        ["userMetadata.l4_dport", 16, false],
+        ["userMetadata.ipv4_src_addr", 32, false],
+        ["userMetadata.ipv4_dst_addr", 32, false]
+      ]
+    },
+    {
+      "name" : "packet_out_header_t",
+      "id" : 1,
+      "fields" : [
+        ["egress_port", 9, false],
+        ["do_forwarding", 1, false],
+        ["_pad", 6, false]
       ]
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "fields" : [
         ["ingress_port", 9, false],
         ["egress_spec", 9, false],
         ["egress_port", 9, false],
-        ["clone_spec", 32, false],
         ["instance_type", 32, false],
-        ["drop", 1, false],
-        ["recirculate_port", 16, false],
         ["packet_length", 32, false],
         ["enq_timestamp", 32, false],
         ["enq_qdepth", 19, false],
@@ -47,20 +54,17 @@
         ["deq_qdepth", 19, false],
         ["ingress_global_timestamp", 48, false],
         ["egress_global_timestamp", 48, false],
-        ["lf_field_list", 32, false],
         ["mcast_grp", 16, false],
-        ["resubmit_flag", 32, false],
         ["egress_rid", 16, false],
-        ["recirculate_flag", 32, false],
         ["checksum_error", 1, false],
         ["parser_error", 32, false],
         ["priority", 3, false],
-        ["_padding", 2, false]
+        ["_padding", 3, false]
       ]
     },
     {
       "name" : "ethernet_t",
-      "id" : 2,
+      "id" : 3,
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false]
@@ -68,7 +72,7 @@
     },
     {
       "name" : "vlan_tag_t",
-      "id" : 3,
+      "id" : 4,
       "fields" : [
         ["eth_type", 16, false],
         ["pri", 3, false],
@@ -78,14 +82,14 @@
     },
     {
       "name" : "eth_type_t",
-      "id" : 4,
+      "id" : 5,
       "fields" : [
         ["value", 16, false]
       ]
     },
     {
       "name" : "mpls_t",
-      "id" : 5,
+      "id" : 6,
       "fields" : [
         ["label", 20, false],
         ["tc", 3, false],
@@ -95,7 +99,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 6,
+      "id" : 7,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -114,7 +118,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 7,
+      "id" : 8,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -131,7 +135,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -141,7 +145,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -152,14 +156,6 @@
       ]
     },
     {
-      "name" : "packet_out_header_t",
-      "id" : 10,
-      "fields" : [
-        ["egress_port", 9, false],
-        ["_pad", 7, false]
-      ]
-    },
-    {
       "name" : "packet_in_header_t",
       "id" : 11,
       "fields" : [
@@ -170,92 +166,99 @@
   ],
   "headers" : [
     {
-      "name" : "scalars",
+      "name" : "tmp",
       "id" : 0,
+      "header_type" : "packet_out_header_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "scalars",
+      "id" : 1,
       "header_type" : "scalars_0",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "standard_metadata",
-      "id" : 1,
+      "id" : 2,
       "header_type" : "standard_metadata",
       "metadata" : true,
       "pi_omit" : true
     },
     {
       "name" : "ethernet",
-      "id" : 2,
+      "id" : 3,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "vlan_tag",
-      "id" : 3,
-      "header_type" : "vlan_tag_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "inner_vlan_tag",
       "id" : 4,
       "header_type" : "vlan_tag_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "eth_type",
+      "name" : "inner_vlan_tag",
       "id" : 5,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "eth_type",
+      "id" : 6,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "mpls",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 10,
+      "id" : 11,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 11,
+      "id" : 12,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
@@ -308,10 +311,11 @@
               "type" : "hexstr",
               "value" : "0x00ff",
               "mask" : null,
-              "next_state" : "parse_packet_out"
+              "next_state" : "check_packet_out"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -324,12 +328,229 @@
           ]
         },
         {
-          "name" : "parse_packet_out",
+          "name" : "check_packet_out",
           "id" : 1,
           "parser_ops" : [
             {
               "parameters" : [
                 {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_6"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 16]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "parameters" : [
+                    {
+                      "type" : "header",
+                      "value" : "tmp"
+                    }
+                  ],
+                  "op" : "add_header"
+                }
+              ],
+              "op" : "primitive"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "egress_port"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x7"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01ff"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "do_forwarding"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["tmp", "_pad"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "tmp_6"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x3f"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
+                },
+                {
+                  "type" : "expression",
+                  "value" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : ">>",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "tmp_6"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x6"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0xffff"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  }
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x00",
+              "mask" : null,
+              "next_state" : "parse_packet_out_and_accept"
+            },
+            {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : "strip_packet_out"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_0"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_packet_out_and_accept",
+          "id" : 2,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
                   "type" : "regular",
                   "value" : "packet_out"
                 }
@@ -339,7 +560,32 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "strip_packet_out",
+          "id" : 3,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "hexstr",
+                  "value" : "0x00000010"
+                }
+              ],
+              "op" : "advance"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -348,7 +594,7 @@
         },
         {
           "name" : "parse_ethernet",
-          "id" : 2,
+          "id" : 4,
           "parser_ops" : [
             {
               "parameters" : [
@@ -363,7 +609,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                  "value" : ["scalars", "userMetadata.vlan_id"]
                 },
                 {
                   "type" : "hexstr",
@@ -376,7 +622,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -406,7 +652,8 @@
               "next_state" : "parse_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -414,13 +661,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
         {
           "name" : "parse_vlan_tag",
-          "id" : 3,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -435,7 +682,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -453,7 +700,8 @@
               "next_state" : "parse_inner_vlan_tag"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -461,13 +709,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
         {
           "name" : "parse_inner_vlan_tag",
-          "id" : 4,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -481,7 +729,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_eth_type"
             }
@@ -490,7 +739,7 @@
         },
         {
           "name" : "parse_eth_type",
-          "id" : 5,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -516,7 +765,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -530,7 +780,7 @@
         },
         {
           "name" : "parse_mpls",
-          "id" : 6,
+          "id" : 8,
           "parser_ops" : [
             {
               "parameters" : [
@@ -545,7 +795,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                  "value" : ["scalars", "userMetadata.mpls_label"]
                 },
                 {
                   "type" : "field",
@@ -558,7 +808,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                  "value" : ["scalars", "userMetadata.mpls_ttl"]
                 },
                 {
                   "type" : "field",
@@ -571,7 +821,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_5"]
                 },
                 {
                   "type" : "lookahead",
@@ -589,7 +839,8 @@
               "next_state" : "parse_ipv4"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : "parse_ethernet"
             }
@@ -597,13 +848,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_5"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 7,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -618,7 +869,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "userMetadata.ip_proto"]
                 },
                 {
                   "type" : "field",
@@ -631,7 +882,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "userMetadata.ip_eth_type"]
                 },
                 {
                   "type" : "hexstr",
@@ -644,7 +895,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ipv4_src_addr"]
+                  "value" : ["scalars", "userMetadata.ipv4_src_addr"]
                 },
                 {
                   "type" : "field",
@@ -657,7 +908,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ipv4_dst_addr"]
+                  "value" : ["scalars", "userMetadata.ipv4_dst_addr"]
                 },
                 {
                   "type" : "field",
@@ -687,7 +938,8 @@
               "next_state" : "parse_icmp"
             },
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -701,7 +953,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 8,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -716,7 +968,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "userMetadata.l4_sport"]
                 },
                 {
                   "type" : "field",
@@ -729,7 +981,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "userMetadata.l4_dport"]
                 },
                 {
                   "type" : "field",
@@ -741,7 +993,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -750,7 +1003,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 9,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -765,7 +1018,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "userMetadata.l4_sport"]
                 },
                 {
                   "type" : "field",
@@ -778,7 +1031,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "userMetadata.l4_dport"]
                 },
                 {
                   "type" : "field",
@@ -790,7 +1043,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -804,7 +1058,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 10,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -818,7 +1072,8 @@
           ],
           "transitions" : [
             {
-              "value" : "default",
+              "type" : "default",
+              "value" : null,
               "mask" : null,
               "next_state" : null
             }
@@ -835,11 +1090,12 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 268,
+        "line" : 283,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "ipv4", "tcp", "udp", "icmp"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "mpls", "ipv4", "tcp", "udp", "icmp"],
+      "primitives" : []
     }
   ],
   "meter_arrays" : [],
@@ -1168,7 +1424,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+              "value" : ["scalars", "userMetadata.skip_forwarding"]
             },
             {
               "type" : "expression",
@@ -1197,7 +1453,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "userMetadata.skip_next"]
             },
             {
               "type" : "expression",
@@ -1244,7 +1500,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "userMetadata.vlan_id"]
             },
             {
               "type" : "runtime_data",
@@ -1275,7 +1531,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["scalars", "userMetadata.fwd_type"]
             },
             {
               "type" : "runtime_data",
@@ -1306,7 +1562,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "userMetadata.next_id"]
             },
             {
               "type" : "runtime_data",
@@ -1337,7 +1593,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "userMetadata.mpls_label"]
             },
             {
               "type" : "hexstr",
@@ -1356,7 +1612,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "userMetadata.next_id"]
             },
             {
               "type" : "runtime_data",
@@ -1387,7 +1643,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "userMetadata.next_id"]
             },
             {
               "type" : "runtime_data",
@@ -1424,7 +1680,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "userMetadata.next_id"]
             },
             {
               "type" : "runtime_data",
@@ -1469,7 +1725,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "userMetadata.skip_next"]
             },
             {
               "type" : "expression",
@@ -1551,7 +1807,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "userMetadata.skip_next"]
             },
             {
               "type" : "expression",
@@ -1598,7 +1854,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "userMetadata.vlan_id"]
             },
             {
               "type" : "runtime_data",
@@ -1660,7 +1916,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "userMetadata.next_id"]
             },
             {
               "type" : "runtime_data",
@@ -1811,7 +2067,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "userMetadata.mpls_label"]
             },
             {
               "type" : "runtime_data",
@@ -1918,7 +2174,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+              "value" : ["scalars", "userMetadata.is_multicast"]
             },
             {
               "type" : "expression",
@@ -1945,7 +2201,7 @@
       ]
     },
     {
-      "name" : "act",
+      "name" : "packetio25",
       "id" : 27,
       "runtime_data" : [],
       "primitives" : [
@@ -1988,7 +2244,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+              "value" : ["scalars", "userMetadata.is_controller_packet_out"]
             },
             {
               "type" : "expression",
@@ -2025,7 +2281,7 @@
       ]
     },
     {
-      "name" : "act_0",
+      "name" : "filtering111",
       "id" : 28,
       "runtime_data" : [],
       "primitives" : [
@@ -2034,7 +2290,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "userMetadata.vlan_id"]
             },
             {
               "type" : "field",
@@ -2053,7 +2309,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "userMetadata.vlan_pri"]
             },
             {
               "type" : "field",
@@ -2072,7 +2328,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "userMetadata.vlan_cfi"]
             },
             {
               "type" : "field",
@@ -2089,7 +2345,7 @@
       ]
     },
     {
-      "name" : "act_1",
+      "name" : "filtering127",
       "id" : 29,
       "runtime_data" : [],
       "primitives" : [
@@ -2098,7 +2354,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "userMetadata.mpls_ttl"]
             },
             {
               "type" : "hexstr",
@@ -2115,7 +2371,7 @@
       ]
     },
     {
-      "name" : "act_2",
+      "name" : "port_counter31",
       "id" : 30,
       "runtime_data" : [],
       "primitives" : [
@@ -2173,7 +2429,7 @@
       ]
     },
     {
-      "name" : "act_3",
+      "name" : "port_counter34",
       "id" : 31,
       "runtime_data" : [],
       "primitives" : [
@@ -2182,7 +2438,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             },
             {
               "type" : "expression",
@@ -2218,7 +2474,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_4"]
             }
           ],
           "source_info" : {
@@ -2259,7 +2515,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+              "value" : ["scalars", "userMetadata.ip_eth_type"]
             }
           ],
           "source_info" : {
@@ -2300,7 +2556,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "userMetadata.mpls_label"]
             }
           ],
           "source_info" : {
@@ -2357,7 +2613,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "userMetadata.mpls_ttl"]
             }
           ],
           "source_info" : {
@@ -2381,7 +2637,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -2417,7 +2673,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "userMetadata.vlan_cfi"]
             }
           ],
           "source_info" : {
@@ -2436,7 +2692,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "userMetadata.vlan_pri"]
             }
           ],
           "source_info" : {
@@ -2460,7 +2716,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -2474,7 +2730,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "userMetadata.vlan_id"]
             }
           ],
           "source_info" : {
@@ -2531,7 +2787,7 @@
       ]
     },
     {
-      "name" : "act_4",
+      "name" : "packetio41",
       "id" : 37,
       "runtime_data" : [],
       "primitives" : [
@@ -2548,7 +2804,7 @@
       ]
     },
     {
-      "name" : "act_5",
+      "name" : "packetio44",
       "id" : 38,
       "runtime_data" : [],
       "primitives" : [
@@ -2599,7 +2855,7 @@
       ]
     },
     {
-      "name" : "act_6",
+      "name" : "next349",
       "id" : 39,
       "runtime_data" : [],
       "primitives" : [
@@ -2621,7 +2877,7 @@
       ]
     },
     {
-      "name" : "act_7",
+      "name" : "next376",
       "id" : 40,
       "runtime_data" : [],
       "primitives" : [
@@ -2643,7 +2899,7 @@
       ]
     },
     {
-      "name" : "act_8",
+      "name" : "next375",
       "id" : 41,
       "runtime_data" : [],
       "primitives" : [
@@ -2692,7 +2948,7 @@
       ]
     },
     {
-      "name" : "act_9",
+      "name" : "next380",
       "id" : 42,
       "runtime_data" : [],
       "primitives" : [
@@ -2714,7 +2970,7 @@
       ]
     },
     {
-      "name" : "act_10",
+      "name" : "next379",
       "id" : 43,
       "runtime_data" : [],
       "primitives" : [
@@ -2776,7 +3032,7 @@
       "init_table" : "node_2",
       "tables" : [
         {
-          "name" : "tbl_act",
+          "name" : "tbl_packetio25",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -2792,10 +3048,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [27],
-          "actions" : ["act"],
+          "actions" : ["packetio25"],
           "base_default_next" : "node_4",
           "next_tables" : {
-            "act" : "node_4"
+            "packetio25" : "node_4"
           },
           "default_entry" : {
             "action_id" : 27,
@@ -2805,7 +3061,7 @@
           }
         },
         {
-          "name" : "tbl_act_0",
+          "name" : "tbl_filtering111",
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -2821,10 +3077,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [28],
-          "actions" : ["act_0"],
+          "actions" : ["filtering111"],
           "base_default_next" : "node_6",
           "next_tables" : {
-            "act_0" : "node_6"
+            "filtering111" : "node_6"
           },
           "default_entry" : {
             "action_id" : 28,
@@ -2834,7 +3090,7 @@
           }
         },
         {
-          "name" : "tbl_act_1",
+          "name" : "tbl_filtering127",
           "id" : 2,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -2850,10 +3106,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [29],
-          "actions" : ["act_1"],
+          "actions" : ["filtering127"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_1" : "FabricIngress.filtering.ingress_port_vlan"
+            "filtering127" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
             "action_id" : 29,
@@ -2943,7 +3199,7 @@
             {
               "match_type" : "exact",
               "name" : "ip_eth_type",
-              "target" : ["scalars", "fabric_metadata_t.ip_eth_type"],
+              "target" : ["scalars", "userMetadata.ip_eth_type"],
               "mask" : null
             }
           ],
@@ -2979,7 +3235,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "userMetadata.vlan_id"],
               "mask" : null
             },
             {
@@ -3022,7 +3278,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
+              "target" : ["scalars", "userMetadata.mpls_label"],
               "mask" : null
             }
           ],
@@ -3059,7 +3315,7 @@
             {
               "match_type" : "lpm",
               "name" : "ipv4_dst",
-              "target" : ["scalars", "fabric_metadata_t.ipv4_dst_addr"],
+              "target" : ["scalars", "userMetadata.ipv4_dst_addr"],
               "mask" : null
             }
           ],
@@ -3103,19 +3359,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t.ip_proto"],
+              "target" : ["scalars", "userMetadata.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "userMetadata.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "userMetadata.l4_dport"],
               "mask" : null
             },
             {
@@ -3209,7 +3465,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "userMetadata.next_id"],
               "mask" : null
             }
           ],
@@ -3247,7 +3503,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "userMetadata.next_id"],
               "mask" : null
             }
           ],
@@ -3281,7 +3537,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "userMetadata.next_id"],
               "mask" : null
             }
           ],
@@ -3318,7 +3574,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "userMetadata.next_id"],
               "mask" : null
             }
           ],
@@ -3343,7 +3599,7 @@
           }
         },
         {
-          "name" : "tbl_act_2",
+          "name" : "tbl_port_counter31",
           "id" : 13,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -3359,10 +3615,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [30],
-          "actions" : ["act_2"],
+          "actions" : ["port_counter31"],
           "base_default_next" : "node_25",
           "next_tables" : {
-            "act_2" : "node_25"
+            "port_counter31" : "node_25"
           },
           "default_entry" : {
             "action_id" : 30,
@@ -3372,7 +3628,7 @@
           }
         },
         {
-          "name" : "tbl_act_3",
+          "name" : "tbl_port_counter34",
           "id" : 14,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -3388,10 +3644,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [31],
-          "actions" : ["act_3"],
+          "actions" : ["port_counter34"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_3" : null
+            "port_counter34" : null
           },
           "default_entry" : {
             "action_id" : 31,
@@ -3417,23 +3673,23 @@
             "input" : [
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ipv4_src_addr"]
+                "value" : ["scalars", "userMetadata.ipv4_src_addr"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ipv4_dst_addr"]
+                "value" : ["scalars", "userMetadata.ipv4_dst_addr"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                "value" : ["scalars", "userMetadata.ip_proto"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                "value" : ["scalars", "userMetadata.l4_sport"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                "value" : ["scalars", "userMetadata.l4_dport"]
               }
             ]
           }
@@ -3460,7 +3716,7 @@
               }
             }
           },
-          "true_next" : "tbl_act",
+          "true_next" : "tbl_packetio25",
           "false_next" : "node_4"
         },
         {
@@ -3483,7 +3739,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_0",
+          "true_next" : "tbl_filtering111",
           "false_next" : "node_6"
         },
         {
@@ -3513,7 +3769,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_1",
+          "true_next" : "tbl_filtering127",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -3523,26 +3779,23 @@
             "filename" : "fabric.p4",
             "line" : 69,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+            "source_fragment" : "fabric_metadata.skip_forwarding"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                    "value" : ["scalars", "userMetadata.skip_forwarding"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -3564,7 +3817,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "userMetadata.fwd_type"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -3590,7 +3843,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "userMetadata.fwd_type"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -3616,7 +3869,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "userMetadata.fwd_type"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -3634,26 +3887,23 @@
             "filename" : "fabric.p4",
             "line" : 73,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.skip_next == false"
+            "source_fragment" : "fabric_metadata.skip_next"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                    "value" : ["scalars", "userMetadata.skip_next"]
                   }
                 }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
               }
             }
           },
@@ -3683,7 +3933,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_2",
+          "true_next" : "tbl_port_counter31",
           "false_next" : "node_25"
         },
         {
@@ -3710,7 +3960,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_3"
+          "true_next" : "tbl_port_counter34"
         }
       ]
     },
@@ -3726,7 +3976,7 @@
       "init_table" : "node_29",
       "tables" : [
         {
-          "name" : "tbl_act_4",
+          "name" : "tbl_packetio41",
           "id" : 15,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -3742,10 +3992,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [37],
-          "actions" : ["act_4"],
+          "actions" : ["packetio41"],
           "base_default_next" : "node_31",
           "next_tables" : {
-            "act_4" : "node_31"
+            "packetio41" : "node_31"
           },
           "default_entry" : {
             "action_id" : 37,
@@ -3755,7 +4005,7 @@
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_packetio44",
           "id" : 16,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -3771,10 +4021,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [38],
-          "actions" : ["act_5"],
+          "actions" : ["packetio44"],
           "base_default_next" : "node_33",
           "next_tables" : {
-            "act_5" : "node_33"
+            "packetio44" : "node_33"
           },
           "default_entry" : {
             "action_id" : 38,
@@ -3784,7 +4034,7 @@
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_next349",
           "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -3800,10 +4050,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [39],
-          "actions" : ["act_6"],
+          "actions" : ["next349"],
           "base_default_next" : "node_35",
           "next_tables" : {
-            "act_6" : "node_35"
+            "next349" : "node_35"
           },
           "default_entry" : {
             "action_id" : 39,
@@ -3883,7 +4133,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "userMetadata.vlan_id"],
               "mask" : null
             },
             {
@@ -3915,7 +4165,7 @@
           }
         },
         {
-          "name" : "tbl_act_7",
+          "name" : "tbl_next375",
           "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -3931,10 +4181,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [41],
-          "actions" : ["act_8"],
+          "actions" : ["next375"],
           "base_default_next" : "node_42",
           "next_tables" : {
-            "act_8" : "node_42"
+            "next375" : "node_42"
           },
           "default_entry" : {
             "action_id" : 41,
@@ -3944,7 +4194,7 @@
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_next376",
           "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -3960,10 +4210,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [40],
-          "actions" : ["act_7"],
+          "actions" : ["next376"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_7" : null
+            "next376" : null
           },
           "default_entry" : {
             "action_id" : 40,
@@ -3973,7 +4223,7 @@
           }
         },
         {
-          "name" : "tbl_act_9",
+          "name" : "tbl_next379",
           "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -3989,10 +4239,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [43],
-          "actions" : ["act_10"],
+          "actions" : ["next379"],
           "base_default_next" : "node_46",
           "next_tables" : {
-            "act_10" : "node_46"
+            "next379" : "node_46"
           },
           "default_entry" : {
             "action_id" : 43,
@@ -4002,7 +4252,7 @@
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_next380",
           "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -4018,10 +4268,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [42],
-          "actions" : ["act_9"],
+          "actions" : ["next380"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_9" : null
+            "next380" : null
           },
           "default_entry" : {
             "action_id" : 42,
@@ -4040,30 +4290,20 @@
             "filename" : "include/control/packetio.p4",
             "line" : 39,
             "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
+            "source_fragment" : "fabric_metadata.is_controller_packet_out"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
-                  }
-                }
-              },
+              "op" : "d2b",
+              "left" : null,
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "field",
+                "value" : ["scalars", "userMetadata.is_controller_packet_out"]
               }
             }
           },
-          "true_next" : "tbl_act_4",
+          "true_next" : "tbl_packetio41",
           "false_next" : "node_31"
         },
         {
@@ -4089,7 +4329,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_packetio44",
           "false_next" : "node_33"
         },
         {
@@ -4108,21 +4348,11 @@
               "left" : {
                 "type" : "expression",
                 "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
-                      }
-                    }
-                  },
+                  "op" : "d2b",
+                  "left" : null,
                   "right" : {
-                    "type" : "bool",
-                    "value" : true
+                    "type" : "field",
+                    "value" : ["scalars", "userMetadata.is_multicast"]
                   }
                 }
               },
@@ -4142,7 +4372,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_next349",
           "false_next" : "node_35"
         },
         {
@@ -4160,7 +4390,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                "value" : ["scalars", "userMetadata.mpls_label"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -4214,7 +4444,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_next375",
           "false_next" : "node_44"
         },
         {
@@ -4241,7 +4471,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_8"
+          "true_next" : "tbl_next376"
         },
         {
           "name" : "node_44",
@@ -4273,7 +4503,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                    "value" : ["scalars", "userMetadata.fwd_type"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -4284,7 +4514,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_9"
+          "true_next" : "tbl_next379"
         },
         {
           "name" : "node_46",
@@ -4310,7 +4540,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_10"
+          "true_next" : "tbl_next380"
         }
       ]
     }
@@ -4397,33 +4627,21 @@
       ["standard_metadata", "egress_global_timestamp"]
     ],
     [
-      "intrinsic_metadata.lf_field_list",
-      ["standard_metadata", "lf_field_list"]
-    ],
-    [
       "intrinsic_metadata.mcast_grp",
       ["standard_metadata", "mcast_grp"]
     ],
     [
-      "intrinsic_metadata.resubmit_flag",
-      ["standard_metadata", "resubmit_flag"]
-    ],
-    [
       "intrinsic_metadata.egress_rid",
       ["standard_metadata", "egress_rid"]
     ],
     [
-      "intrinsic_metadata.recirculate_flag",
-      ["standard_metadata", "recirculate_flag"]
-    ],
-    [
       "intrinsic_metadata.priority",
       ["standard_metadata", "priority"]
     ]
   ],
   "program" : "fabric.p4",
   "__meta__" : {
-    "version" : [2, 18],
+    "version" : [2, 23],
     "compiler" : "https://github.com/p4lang/p4c"
   }
 }
\ No newline at end of file
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index 122ff9d..8bf7d01 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -3,7 +3,7 @@
 }
 tables {
   preamble {
-    id: 33611649
+    id: 43310977
     name: "FabricIngress.filtering.ingress_port_vlan"
     alias: "ingress_port_vlan"
   }
@@ -26,21 +26,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: 1024
 }
 tables {
   preamble {
-    id: 33596298
+    id: 49718154
     name: "FabricIngress.filtering.fwd_classifier"
     alias: "fwd_classifier"
   }
@@ -69,15 +69,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"
   }
@@ -94,20 +94,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"
   }
@@ -118,20 +118,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"
   }
@@ -142,13 +142,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
   }
@@ -156,7 +156,7 @@
 }
 tables {
   preamble {
-    id: 33618978
+    id: 44104738
     name: "FabricIngress.acl.acl"
     alias: "acl"
   }
@@ -233,27 +233,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"
   }
@@ -264,20 +264,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16790685
+    id: 22099101
   }
   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: 33596977
+    id: 48735793
     name: "FabricIngress.next.xconnect"
     alias: "xconnect"
   }
@@ -294,23 +294,23 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16842190
+    id: 24640974
   }
   action_refs {
-    id: 16837052
+    id: 30599612
   }
   action_refs {
-    id: 16819938
+    id: 28485346
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  const_default_action_id: 16819938
-  direct_resource_ids: 318778156
+  const_default_action_id: 28485346
+  direct_resource_ids: 321989420
   size: 1024
 }
 tables {
   preamble {
-    id: 33608588
+    id: 47960972
     name: "FabricIngress.next.hashed"
     alias: "hashed"
   }
@@ -321,27 +321,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"
   }
@@ -352,20 +352,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"
   }
@@ -382,44 +382,44 @@
     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: 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"
   }
@@ -431,7 +431,7 @@
 }
 actions {
   preamble {
-    id: 16840921
+    id: 25032921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
   }
@@ -443,7 +443,7 @@
 }
 actions {
   preamble {
-    id: 16811012
+    id: 21791748
     name: "FabricIngress.forwarding.set_next_id_bridging"
     alias: "set_next_id_bridging"
   }
@@ -455,7 +455,7 @@
 }
 actions {
   preamble {
-    id: 16827758
+    id: 30066030
     name: "FabricIngress.forwarding.pop_mpls_and_next"
     alias: "pop_mpls_and_next"
   }
@@ -467,7 +467,7 @@
 }
 actions {
   preamble {
-    id: 16777434
+    id: 19792090
     name: "FabricIngress.forwarding.set_next_id_routing_v4"
     alias: "set_next_id_routing_v4"
   }
@@ -479,14 +479,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"
   }
@@ -498,14 +498,14 @@
 }
 actions {
   preamble {
-    id: 16829684
+    id: 23579892
     name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16781601
+    id: 16912673
     name: "FabricIngress.acl.set_clone_session_id"
     alias: "set_clone_session_id"
   }
@@ -517,21 +517,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"
   }
@@ -543,7 +543,7 @@
 }
 actions {
   preamble {
-    id: 16842190
+    id: 24640974
     name: "FabricIngress.next.output_xconnect"
     alias: "output_xconnect"
   }
@@ -555,7 +555,7 @@
 }
 actions {
   preamble {
-    id: 16837052
+    id: 30599612
     name: "FabricIngress.next.set_next_id_xconnect"
     alias: "set_next_id_xconnect"
   }
@@ -567,7 +567,7 @@
 }
 actions {
   preamble {
-    id: 16815357
+    id: 27301117
     name: "FabricIngress.next.output_hashed"
     alias: "output_hashed"
   }
@@ -579,7 +579,7 @@
 }
 actions {
   preamble {
-    id: 16791402
+    id: 20985706
     name: "FabricIngress.next.routing_hashed"
     alias: "routing_hashed"
   }
@@ -601,7 +601,7 @@
 }
 actions {
   preamble {
-    id: 16779255
+    id: 27920375
     name: "FabricIngress.next.mpls_routing_hashed"
     alias: "mpls_routing_hashed"
   }
@@ -628,7 +628,7 @@
 }
 actions {
   preamble {
-    id: 16779917
+    id: 21629581
     name: "FabricIngress.next.set_mcast_group_id"
     alias: "set_mcast_group_id"
   }
@@ -640,39 +640,39 @@
 }
 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: 302011205
+    id: 314528581
     name: "FabricIngress.port_counters_control.egress_port_counter"
     alias: "egress_port_counter"
   }
@@ -683,7 +683,7 @@
 }
 counters {
   preamble {
-    id: 302002771
+    id: 312947283
     name: "FabricIngress.port_counters_control.ingress_port_counter"
     alias: "ingress_port_counter"
   }
@@ -694,117 +694,117 @@
 }
 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: 318778156
+    id: 321989420
     name: "FabricIngress.next.xconnect_counter"
     alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33596977
+  direct_table_id: 48735793
 }
 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
 }
 controller_packet_metadata {
   preamble {
-    id: 67146229
+    id: 81826293
     name: "packet_in"
     alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
@@ -822,7 +822,7 @@
 }
 controller_packet_metadata {
   preamble {
-    id: 67121543
+    id: 76689799
     name: "packet_out"
     alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
@@ -834,8 +834,13 @@
   }
   metadata {
     id: 2
+    name: "do_forwarding"
+    bitwidth: 1
+  }
+  metadata {
+    id: 3
     name: "_pad"
-    bitwidth: 7
+    bitwidth: 6
   }
 }
 type_info {
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java
index 7ee9c88..ccec055 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java
@@ -23,13 +23,22 @@
 import org.onlab.packet.MplsLabel;
 import org.onlab.packet.VlanId;
 import org.onlab.util.ImmutableByteSequence;
+import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
 import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.packet.DefaultOutboundPacket;
+import org.onosproject.net.packet.OutboundPacket;
+import org.onosproject.net.pi.model.PiPacketOperationType;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.net.pi.runtime.PiPacketMetadata;
+import org.onosproject.net.pi.runtime.PiPacketOperation;
 import org.onosproject.pipelines.fabric.FabricConstants;
 
+import java.nio.ByteBuffer;
+import java.util.Collection;
+
 import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
@@ -44,6 +53,8 @@
     private static final MacAddress SRC_MAC = MacAddress.valueOf("00:00:00:00:00:01");
     private static final MacAddress DST_MAC = MacAddress.valueOf("00:00:00:00:00:02");
     private static final MplsLabel MPLS_10 = MplsLabel.mplsLabel(10);
+    private static final DeviceId DEVICE_ID = DeviceId.deviceId("device:1");
+    private static final int PORT_BITWIDTH = 9;
 
     private FabricInterpreter interpreter;
 
@@ -211,4 +222,69 @@
                 .build();
         assertEquals(expectedAction, mappedAction);
     }
+
+    @Test
+    public void testMapOutboundPacketWithoutForwarding()
+            throws Exception {
+        PortNumber outputPort = PortNumber.portNumber(1);
+        TrafficTreatment outputTreatment = DefaultTrafficTreatment.builder()
+                .setOutput(outputPort)
+                .build();
+        ByteBuffer data = ByteBuffer.allocate(64);
+        OutboundPacket outPkt = new DefaultOutboundPacket(DEVICE_ID, outputTreatment, data);
+        Collection<PiPacketOperation> result = interpreter.mapOutboundPacket(outPkt);
+        assertEquals(result.size(), 1);
+
+        ImmutableList.Builder<PiPacketMetadata> builder = ImmutableList.builder();
+        builder.add(PiPacketMetadata.builder()
+                .withId(FabricConstants.EGRESS_PORT)
+                .withValue(ImmutableByteSequence.copyFrom(outputPort.toLong())
+                        .fit(PORT_BITWIDTH))
+                .build());
+        builder.add(PiPacketMetadata.builder()
+                .withId(FabricConstants.DO_FORWARDING)
+                .withValue(ImmutableByteSequence.copyFrom(0).fit(1))
+                .build());
+
+        PiPacketOperation expectedPktOp = PiPacketOperation.builder()
+                .withType(PiPacketOperationType.PACKET_OUT)
+                .withData(ImmutableByteSequence.copyFrom(data))
+                .withMetadatas(builder.build())
+                .build();
+
+        assertEquals(expectedPktOp, result.iterator().next());
+    }
+
+    @Test
+    public void testMapOutboundPacketWithForwarding()
+            throws Exception {
+        PortNumber outputPort = PortNumber.TABLE;
+        TrafficTreatment outputTreatment = DefaultTrafficTreatment.builder()
+                .setOutput(outputPort)
+                .build();
+        ByteBuffer data = ByteBuffer.allocate(64);
+        OutboundPacket outPkt = new DefaultOutboundPacket(DEVICE_ID, outputTreatment, data);
+        Collection<PiPacketOperation> result = interpreter.mapOutboundPacket(outPkt);
+        assertEquals(result.size(), 1);
+
+        ImmutableList.Builder<PiPacketMetadata> builder = ImmutableList.builder();
+        builder.add(PiPacketMetadata.builder()
+                .withId(FabricConstants.EGRESS_PORT)
+                .withValue(ImmutableByteSequence.copyFrom(0)
+                        .fit(PORT_BITWIDTH))
+                .build());
+        builder.add(PiPacketMetadata.builder()
+                .withId(FabricConstants.DO_FORWARDING)
+                .withValue(ImmutableByteSequence.copyFrom(1)
+                        .fit(1))
+                .build());
+
+        PiPacketOperation expectedPktOp = PiPacketOperation.builder()
+                .withType(PiPacketOperationType.PACKET_OUT)
+                .withData(ImmutableByteSequence.copyFrom(data))
+                .withMetadatas(builder.build())
+                .build();
+
+        assertEquals(expectedPktOp, result.iterator().next());
+    }
 }
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/BaseObjectiveTranslatorTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/BaseObjectiveTranslatorTest.java
new file mode 100644
index 0000000..72f49be
--- /dev/null
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/BaseObjectiveTranslatorTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric.impl.behaviour.pipeliner;
+
+import org.junit.Test;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.MacAddress;
+import org.onlab.packet.MplsLabel;
+import org.onlab.packet.VlanId;
+import org.onosproject.TestApplicationId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.pipelines.fabric.impl.behaviour.FabricCapabilities;
+
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
+public class BaseObjectiveTranslatorTest {
+    static final ApplicationId APP_ID = TestApplicationId.create("FabricPipelinerTest");
+    static final ApplicationId XCONNECT_APP_ID = TestApplicationId.create("FabricPipelinerTest.xconnect");
+    static final DeviceId DEVICE_ID = DeviceId.deviceId("device:bmv2:11");
+    static final int PRIORITY = 100;
+    static final PortNumber PORT_1 = PortNumber.portNumber(1);
+    static final PortNumber PORT_2 = PortNumber.portNumber(2);
+    static final VlanId VLAN_100 = VlanId.vlanId("100");
+    static final VlanId VLAN_200 = VlanId.vlanId("200");
+    static final MacAddress HOST_MAC = MacAddress.valueOf("00:00:00:00:00:01");
+    static final MacAddress ROUTER_MAC = MacAddress.valueOf("00:00:00:00:02:01");
+    static final IpPrefix IPV4_UNICAST_ADDR = IpPrefix.valueOf("10.0.0.1/32");
+    static final IpPrefix IPV4_MCAST_ADDR = IpPrefix.valueOf("224.0.0.1/32");
+    static final IpPrefix IPV6_UNICAST_ADDR = IpPrefix.valueOf("2000::1/32");
+    static final IpPrefix IPV6_MCAST_ADDR = IpPrefix.valueOf("ff00::1/32");
+    static final MplsLabel MPLS_10 = MplsLabel.mplsLabel(10);
+    static final Integer NEXT_ID_1 = 1;
+    static final TrafficSelector VLAN_META = DefaultTrafficSelector.builder()
+            .matchVlanId(VLAN_100)
+            .build();
+
+    FabricCapabilities capabilitiesHashed;
+    FabricCapabilities capabilitiesSimple;
+
+    void doSetup() {
+        this.capabilitiesHashed = createNiceMock(FabricCapabilities.class);
+        this.capabilitiesSimple = createNiceMock(FabricCapabilities.class);
+        expect(capabilitiesHashed.hasHashedTable()).andReturn(true).anyTimes();
+        expect(capabilitiesHashed.supportDoubleVlanTerm()).andReturn(true).anyTimes();
+        expect(capabilitiesSimple.hasHashedTable()).andReturn(false).anyTimes();
+        expect(capabilitiesSimple.supportDoubleVlanTerm()).andReturn(true).anyTimes();
+        replay(capabilitiesHashed);
+        replay(capabilitiesSimple);
+    }
+
+    @Test
+    public void fakeTest() {
+        // Needed otherwise Bazel complains about a test class without test cases.
+        assert true;
+    }
+}
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipelinerTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipelinerTest.java
index 31db010..a2fa47b 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipelinerTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipelinerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-present Open Networking Foundation
+ * Copyright 2021-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,64 +13,132 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.onosproject.pipelines.fabric.impl.behaviour.pipeliner;
 
+import org.easymock.Capture;
+import org.easymock.CaptureType;
+import org.junit.Before;
 import org.junit.Test;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.MplsLabel;
-import org.onlab.packet.VlanId;
+import org.onlab.packet.Ethernet;
 import org.onosproject.TestApplicationId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.DefaultFlowRule;
 import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleService;
 import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criteria;
+import org.onosproject.net.flow.criteria.PiCriterion;
+import org.onosproject.net.pi.runtime.PiAction;
+import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.pipelines.fabric.FabricConstants;
 import org.onosproject.pipelines.fabric.impl.behaviour.FabricCapabilities;
 
-import static org.easymock.EasyMock.createNiceMock;
+import java.io.IOException;
+import java.util.Optional;
+
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.newCapture;
 import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertTrue;
 
 public class FabricPipelinerTest {
-    static final ApplicationId APP_ID = TestApplicationId.create("FabricPipelinerTest");
-    static final ApplicationId XCONNECT_APP_ID = TestApplicationId.create("FabricPipelinerTest.xconnect");
-    static final DeviceId DEVICE_ID = DeviceId.deviceId("device:bmv2:11");
-    static final int PRIORITY = 100;
-    static final PortNumber PORT_1 = PortNumber.portNumber(1);
-    static final PortNumber PORT_2 = PortNumber.portNumber(2);
-    static final VlanId VLAN_100 = VlanId.vlanId("100");
-    static final VlanId VLAN_200 = VlanId.vlanId("200");
-    static final MacAddress HOST_MAC = MacAddress.valueOf("00:00:00:00:00:01");
-    static final MacAddress ROUTER_MAC = MacAddress.valueOf("00:00:00:00:02:01");
-    static final IpPrefix IPV4_UNICAST_ADDR = IpPrefix.valueOf("10.0.0.1/32");
-    static final IpPrefix IPV4_MCAST_ADDR = IpPrefix.valueOf("224.0.0.1/32");
-    static final IpPrefix IPV6_UNICAST_ADDR = IpPrefix.valueOf("2000::1/32");
-    static final IpPrefix IPV6_MCAST_ADDR = IpPrefix.valueOf("ff00::1/32");
-    static final MplsLabel MPLS_10 = MplsLabel.mplsLabel(10);
-    static final Integer NEXT_ID_1 = 1;
-    static final TrafficSelector VLAN_META = DefaultTrafficSelector.builder()
-            .matchVlanId(VLAN_100)
-            .build();
 
-    FabricCapabilities capabilitiesHashed;
-    FabricCapabilities capabilitiesSimple;
+    private static final ApplicationId APP_ID = TestApplicationId.create("FabricPipelinerTest");
+    private static final DeviceId DEVICE_ID = DeviceId.deviceId("device:1");
+    private static final int DEFAULT_FLOW_PRIORITY = 100;
+    private static final int CPU_PORT = 320;
+    private static final byte FWD_IPV4_ROUTING = 2;
+    private static final int DEFAULT_VLAN = 4094;
+    public static final byte[] ONE = new byte[]{1};
+    public static final byte[] ZERO = new byte[]{0};
 
-    void doSetup() {
-        this.capabilitiesHashed = createNiceMock(FabricCapabilities.class);
-        this.capabilitiesSimple = createNiceMock(FabricCapabilities.class);
-        expect(capabilitiesHashed.hasHashedTable()).andReturn(true).anyTimes();
-        expect(capabilitiesHashed.supportDoubleVlanTerm()).andReturn(true).anyTimes();
-        expect(capabilitiesSimple.hasHashedTable()).andReturn(false).anyTimes();
-        expect(capabilitiesSimple.supportDoubleVlanTerm()).andReturn(true).anyTimes();
-        replay(capabilitiesHashed);
-        replay(capabilitiesSimple);
+    private FabricPipeliner pipeliner;
+    private FlowRuleService flowRuleService;
+
+    @Before
+    public void setup() throws IOException {
+        FabricCapabilities capabilities = createMock(FabricCapabilities.class);
+        expect(capabilities.cpuPort()).andReturn(Optional.of(CPU_PORT)).anyTimes();
+        replay(capabilities);
+
+        // Services mock
+        flowRuleService = createMock(FlowRuleService.class);
+
+        pipeliner = new FabricPipeliner(capabilities);
+        pipeliner.flowRuleService = flowRuleService;
+        pipeliner.appId = APP_ID;
+        pipeliner.deviceId = DEVICE_ID;
     }
 
     @Test
-    public void fakeTest() {
-        // Needed otherwise Bazel complains about a test class without test cases.
-        assert true;
+    public void testInitializePipeline() {
+        final Capture<FlowRule> capturedCpuIgVlanRule = newCapture(CaptureType.ALL);
+        final Capture<FlowRule> capturedCpuFwdClsRule = newCapture(CaptureType.ALL);
+
+        // ingress_port_vlan table for cpu port
+        final TrafficSelector cpuIgVlanSelector = DefaultTrafficSelector.builder()
+                .add(Criteria.matchInPort(PortNumber.portNumber(CPU_PORT)))
+                .add(PiCriterion.builder()
+                        .matchExact(FabricConstants.HDR_VLAN_IS_VALID, ZERO)
+                        .build())
+                .build();
+        final TrafficTreatment cpuIgVlanTreatment = DefaultTrafficTreatment.builder()
+                .piTableAction(PiAction.builder()
+                        .withId(FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT_WITH_INTERNAL_VLAN)
+                        .withParameter(new PiActionParam(FabricConstants.VLAN_ID, DEFAULT_VLAN))
+                        .build())
+                .build();
+        final FlowRule expectedCpuIgVlanRule = DefaultFlowRule.builder()
+                .withSelector(cpuIgVlanSelector)
+                .withTreatment(cpuIgVlanTreatment)
+                .forTable(FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN)
+                .makePermanent()
+                .withPriority(DEFAULT_FLOW_PRIORITY)
+                .forDevice(DEVICE_ID)
+                .fromApp(APP_ID)
+                .build();
+
+        final TrafficSelector cpuFwdClsSelector = DefaultTrafficSelector.builder()
+                .matchInPort(PortNumber.portNumber(CPU_PORT))
+                .matchPi(PiCriterion.builder()
+                        .matchExact(FabricConstants.HDR_IP_ETH_TYPE, Ethernet.TYPE_IPV4)
+                        .build())
+                .build();
+        final TrafficTreatment cpuFwdClsTreatment = DefaultTrafficTreatment.builder()
+                .piTableAction(PiAction.builder()
+                        .withId(FabricConstants.FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE)
+                        .withParameter(new PiActionParam(FabricConstants.FWD_TYPE, FWD_IPV4_ROUTING))
+                        .build())
+                .build();
+        final FlowRule expectedCpuFwdClsRule = DefaultFlowRule.builder()
+                .withSelector(cpuFwdClsSelector)
+                .withTreatment(cpuFwdClsTreatment)
+                .forTable(FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER)
+                .makePermanent()
+                .withPriority(DEFAULT_FLOW_PRIORITY)
+                .forDevice(DEVICE_ID)
+                .fromApp(APP_ID)
+                .build();
+        flowRuleService.applyFlowRules(
+                capture(capturedCpuIgVlanRule),
+                capture(capturedCpuFwdClsRule));
+
+        replay(flowRuleService);
+        pipeliner.initializePipeline();
+
+        assertTrue(expectedCpuIgVlanRule.exactMatch(capturedCpuIgVlanRule.getValue()));
+        assertTrue(expectedCpuFwdClsRule.exactMatch(capturedCpuFwdClsRule.getValue()));
+
+        verify(flowRuleService);
+        reset(flowRuleService);
     }
 }
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FilteringObjectiveTranslatorTest.java
similarity index 99%
rename from pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java
rename to pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FilteringObjectiveTranslatorTest.java
index 98dce1f..24300ea 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FilteringObjectiveTranslatorTest.java
@@ -48,7 +48,7 @@
 /**
  * Test cases for fabric.p4 pipeline filtering control block.
  */
-public class FabricFilteringPipelinerTest extends FabricPipelinerTest {
+public class FilteringObjectiveTranslatorTest extends BaseObjectiveTranslatorTest {
 
     public static final byte[] ONE = {1};
     public static final byte[] ZERO = {0};
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/ForwardingObjectiveTranslatorTest.java
similarity index 99%
rename from pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java
rename to pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/ForwardingObjectiveTranslatorTest.java
index 4c554a9..e005cfd 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/ForwardingObjectiveTranslatorTest.java
@@ -56,7 +56,7 @@
 /**
  * Test cases for fabric.p4 pipeline forwarding control block.
  */
-public class FabricForwardingPipelineTest extends FabricPipelinerTest {
+public class ForwardingObjectiveTranslatorTest extends BaseObjectiveTranslatorTest {
 
     private ForwardingObjectiveTranslator translator;
 
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslatorTest.java
similarity index 99%
rename from pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java
rename to pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslatorTest.java
index 8dfe887..393ba45 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslatorTest.java
@@ -51,7 +51,7 @@
 /**
  * Test cases for fabric.p4 pipeline next control block.
  */
-public class FabricNextPipelinerTest extends FabricPipelinerTest {
+public class NextObjectiveTranslatorTest extends BaseObjectiveTranslatorTest {
 
     private NextObjectiveTranslator translatorHashed;
     private NextObjectiveTranslator translatorSimple;