Update install-p4-tools.sh to use P4Runtime v1.0

Includes also various improvements to the p4vm scripts, such as:
- Choose to build VM with Ubuntu 16.04 or 18.04 (experimental)
- Allow users to specify version of protobuf and grpc to use
- Avoid building protobuf and grpc if already installed in the system
- Install Bazel 0.22

Also:
- Remove check for invalid group member weights (now PI always returns
members with weight 1)
- Re-compiled all P4 programs and fixed missing padding in controller
packet headers

Change-Id: I0e672fcebbaba63354c749f0c774af251f3cbc6c
diff --git a/pipelines/basic/src/main/java/org/onosproject/pipelines/basic/PipeconfLoader.java b/pipelines/basic/src/main/java/org/onosproject/pipelines/basic/PipeconfLoader.java
index feb7359..bcffabb 100644
--- a/pipelines/basic/src/main/java/org/onosproject/pipelines/basic/PipeconfLoader.java
+++ b/pipelines/basic/src/main/java/org/onosproject/pipelines/basic/PipeconfLoader.java
@@ -17,11 +17,6 @@
 package org.onosproject.pipelines.basic;
 
 import com.google.common.collect.ImmutableList;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.onosproject.core.CoreService;
 import org.onosproject.inbandtelemetry.api.IntProgrammable;
 import org.onosproject.net.behaviour.Pipeliner;
@@ -34,6 +29,11 @@
 import org.onosproject.net.pi.service.PiPipeconfService;
 import org.onosproject.p4runtime.model.P4InfoParser;
 import org.onosproject.p4runtime.model.P4InfoParserException;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
 
 import java.net.URL;
 import java.util.Collection;
@@ -50,13 +50,13 @@
     private static final String APP_NAME = "org.onosproject.pipelines.basic";
     private static final PiPipeconfId BASIC_PIPECONF_ID = new PiPipeconfId("org.onosproject.pipelines.basic");
     private static final String BASIC_JSON_PATH = "/p4c-out/bmv2/basic.json";
-    private static final String BASIC_P4INFO = "/p4c-out/bmv2/basic.p4info";
+    private static final String BASIC_P4INFO = "/p4c-out/bmv2/basic_p4info.txt";
 
     public static final PiPipeconf BASIC_PIPECONF = buildBasicPipeconf();
 
     private static final PiPipeconfId INT_PIPECONF_ID = new PiPipeconfId("org.onosproject.pipelines.int");
     private static final String INT_JSON_PATH = "/p4c-out/bmv2/int.json";
-    private static final String INT_P4INFO = "/p4c-out/bmv2/int.p4info";
+    private static final String INT_P4INFO = "/p4c-out/bmv2/int_p4info.txt";
 
     public static final PiPipeconf INT_PIPECONF = buildIntPipeconf();
 
diff --git a/pipelines/basic/src/main/resources/Makefile b/pipelines/basic/src/main/resources/Makefile
index 67b9355..64b3ea2 100644
--- a/pipelines/basic/src/main/resources/Makefile
+++ b/pipelines/basic/src/main/resources/Makefile
@@ -2,18 +2,18 @@
 
 basic: basic.p4
 	p4c-bm2-ss --arch v1model -o p4c-out/bmv2/basic.json \
-		--p4runtime-file p4c-out/bmv2/basic.p4info \
-		--p4runtime-format text basic.p4
+		--p4runtime-files p4c-out/bmv2/basic_p4info.txt \
+		basic.p4
 
 int: int.p4
 	p4c-bm2-ss --arch v1model -o p4c-out/bmv2/int.json "-DTARGET_BMV2" \
-		--p4runtime-file p4c-out/bmv2/int.p4info \
-		--p4runtime-format text int.p4
+		--p4runtime-files p4c-out/bmv2/int_p4info.txt \
+		int.p4
 
 constants:
 	onos-gen-p4-constants \
 		-o $(ONOS_ROOT)/pipelines/basic/src/main/java/org/onosproject/pipelines/basic/BasicConstants.java \
-		basic p4c-out/bmv2/basic.p4info
+		basic p4c-out/bmv2/basic_p4info.txt
 
 clean:
 	rm -rf p4c-out/bmv2/*
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
index 9d68d47..548612a 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
@@ -180,12 +180,12 @@
   "header_union_stacks" : [],
   "field_lists" : [],
   "errors" : [
-    ["NoError", 0],
-    ["PacketTooShort", 1],
-    ["NoMatch", 2],
-    ["StackOutOfBounds", 3],
-    ["HeaderTooShort", 4],
-    ["ParserTimeout", 5]
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6]
   ],
   "enums" : [],
   "parsers" : [
@@ -671,7 +671,7 @@
           ],
           "source_info" : {
             "filename" : "include/defines.p4",
-            "line" : 34,
+            "line" : 43,
             "column" : 24,
             "source_fragment" : "255; ..."
           }
@@ -936,7 +936,7 @@
           ],
           "source_info" : {
             "filename" : "include/defines.p4",
-            "line" : 37,
+            "line" : 46,
             "column" : 36,
             "source_fragment" : "8w0; ..."
           }
@@ -1712,6 +1712,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -1778,4 +1780,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.p4info b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic_p4info.txt
similarity index 96%
rename from pipelines/basic/src/main/resources/p4c-out/bmv2/basic.p4info
rename to pipelines/basic/src/main/resources/p4c-out/bmv2/basic_p4info.txt
index a017ca2..353f0ab 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.p4info
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic_p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+  arch: "v1model"
+}
 tables {
   preamble {
     id: 33561568
@@ -112,7 +115,8 @@
   }
   action_refs {
     id: 16800567
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   implementation_id: 285253634
   direct_resource_ids: 318811794
@@ -273,6 +277,7 @@
   preamble {
     id: 67146229
     name: "packet_in"
+    alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
   }
   metadata {
@@ -290,6 +295,7 @@
   preamble {
     id: 67121543
     name: "packet_out"
+    alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json b/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
index 70c184a..b426273 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
@@ -8,13 +8,20 @@
         ["tmp_0", 32, false],
         ["tmp_1", 32, false],
         ["tmp_2", 32, false],
-        ["process_int_transit_hasReturned_0", 1, false],
-        ["local_metadata_t.l4_src_port", 16, false],
-        ["local_metadata_t.l4_dst_port", 16, false],
-        ["local_metadata_t.next_hop_id", 16, false],
-        ["local_metadata_t.selector", 16, false],
-        ["local_metadata_t.compute_checksum", 1, false],
-        ["_padding_2", 6, false]
+        ["process_int_transit_hasReturned", 1, false],
+        ["local_metadata_t._l4_src_port0", 16, false],
+        ["local_metadata_t._l4_dst_port1", 16, false],
+        ["local_metadata_t._next_hop_id2", 16, false],
+        ["local_metadata_t._selector3", 16, false],
+        ["local_metadata_t._int_meta_switch_id4", 32, false],
+        ["local_metadata_t._int_meta_new_bytes5", 16, false],
+        ["local_metadata_t._int_meta_new_words6", 8, false],
+        ["local_metadata_t._int_meta_source7", 1, false],
+        ["local_metadata_t._int_meta_sink8", 1, false],
+        ["local_metadata_t._int_meta_transit9", 1, false],
+        ["local_metadata_t._int_meta_intl4_shim_len10", 8, false],
+        ["local_metadata_t._compute_checksum11", 1, false],
+        ["_padding_1", 3, false]
       ]
     },
     {
@@ -255,20 +262,6 @@
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
-    },
-    {
-      "name" : "int_metadata_t",
-      "id" : 22,
-      "fields" : [
-        ["switch_id", 32, false],
-        ["new_bytes", 16, false],
-        ["new_words", 8, false],
-        ["source", 1, 0],
-        ["sink", 1, 0],
-        ["transit", 1, 0],
-        ["intl4_shim_len", 8, false],
-        ["_padding_1", 5, false]
-      ]
     }
   ],
   "headers" : [
@@ -446,13 +439,6 @@
       "header_type" : "int_egress_port_tx_util_t",
       "metadata" : false,
       "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.int_meta",
-      "id" : 25,
-      "header_type" : "int_metadata_t",
-      "metadata" : true,
-      "pi_omit" : true
     }
   ],
   "header_stacks" : [],
@@ -575,12 +561,12 @@
     }
   ],
   "errors" : [
-    ["NoError", 0],
-    ["PacketTooShort", 1],
-    ["NoMatch", 2],
-    ["StackOutOfBounds", 3],
-    ["HeaderTooShort", 4],
-    ["ParserTimeout", 5]
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6]
   ],
   "enums" : [],
   "parsers" : [
@@ -727,7 +713,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "local_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "local_metadata_t._l4_src_port0"]
                 },
                 {
                   "type" : "field",
@@ -740,7 +726,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "local_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "local_metadata_t._l4_dst_port1"]
                 },
                 {
                   "type" : "field",
@@ -787,7 +773,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "local_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "local_metadata_t._l4_src_port0"]
                 },
                 {
                   "type" : "field",
@@ -800,7 +786,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "local_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "local_metadata_t._l4_dst_port1"]
                 },
                 {
                   "type" : "field",
@@ -847,7 +833,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["userMetadata.int_meta", "intl4_shim_len"]
+                  "value" : ["scalars", "local_metadata_t._int_meta_intl4_shim_len10"]
                 },
                 {
                   "type" : "field",
@@ -895,7 +881,7 @@
                                       "op" : "+",
                                       "left" : {
                                         "type" : "field",
-                                        "value" : ["userMetadata.int_meta", "intl4_shim_len"]
+                                        "value" : ["intl4_shim", "len"]
                                       },
                                       "right" : {
                                         "type" : "hexstr",
@@ -1226,7 +1212,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "local_metadata_t.next_hop_id"]
+              "value" : ["scalars", "local_metadata_t._next_hop_id2"]
             },
             {
               "type" : "runtime_data",
@@ -1236,8 +1222,8 @@
           "source_info" : {
             "filename" : "include/table0.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "local_metadata.next_hop_id = next_hop_id"
+            "column" : 35,
+            "source_fragment" : "= next_hop_id; ..."
           }
         }
       ]
@@ -1309,7 +1295,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "source"]
+              "value" : ["scalars", "local_metadata_t._int_meta_source7"]
             },
             {
               "type" : "expression",
@@ -1329,8 +1315,8 @@
           "source_info" : {
             "filename" : "include/int_source.p4",
             "line" : 92,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.source = true"
+            "column" : 39,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1345,7 +1331,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "sink"]
+              "value" : ["scalars", "local_metadata_t._int_meta_sink8"]
             },
             {
               "type" : "expression",
@@ -1365,8 +1351,8 @@
           "source_info" : {
             "filename" : "include/int_source.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.sink = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2036,7 +2022,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "transit"]
+              "value" : ["scalars", "local_metadata_t._int_meta_transit9"]
             },
             {
               "type" : "expression",
@@ -2056,8 +2042,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 26,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.transit = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -2065,7 +2051,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             },
             {
               "type" : "runtime_data",
@@ -2075,8 +2061,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 27,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.switch_id = switch_id"
+            "column" : 42,
+            "source_fragment" : "= switch_id; ..."
           }
         }
       ]
@@ -2163,7 +2149,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -2177,7 +2163,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -2196,8 +2182,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 87,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 1"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -2205,7 +2191,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -2219,7 +2205,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -2238,8 +2224,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 88,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -2331,7 +2317,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -2345,7 +2331,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -2364,8 +2350,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 87,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 1"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -2373,7 +2359,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -2387,7 +2373,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -2406,8 +2392,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 88,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -2565,7 +2551,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -2579,7 +2565,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -2598,8 +2584,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -2607,7 +2593,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -2621,7 +2607,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -2640,8 +2626,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -2735,7 +2721,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -2749,7 +2735,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -2768,8 +2754,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 87,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 1"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -2777,7 +2763,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -2791,7 +2777,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -2810,8 +2796,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 88,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -2971,7 +2957,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -2985,7 +2971,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3004,8 +2990,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -3013,7 +2999,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -3027,7 +3013,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3046,8 +3032,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -3218,7 +3204,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -3232,7 +3218,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3251,8 +3237,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -3260,7 +3246,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -3274,7 +3260,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3293,8 +3279,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -3531,7 +3517,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -3545,7 +3531,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3564,8 +3550,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 3"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -3573,7 +3559,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -3587,7 +3573,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3606,8 +3592,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 100,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 12"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -3641,14 +3627,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 33,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -3656,7 +3642,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -3670,7 +3656,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3689,8 +3675,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 87,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 1"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -3698,7 +3684,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -3712,7 +3698,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3731,8 +3717,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 88,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -3832,14 +3818,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 33,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -3847,7 +3833,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -3861,7 +3847,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3880,8 +3866,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -3889,7 +3875,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -3903,7 +3889,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3922,8 +3908,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4034,14 +4020,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 33,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -4049,7 +4035,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -4063,7 +4049,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4082,8 +4068,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -4091,7 +4077,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -4105,7 +4091,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4124,8 +4110,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4302,14 +4288,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 33,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -4317,7 +4303,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -4331,7 +4317,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4350,8 +4336,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 3"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -4359,7 +4345,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -4373,7 +4359,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4392,8 +4378,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 100,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 12"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -4506,14 +4492,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 33,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -4521,7 +4507,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -4535,7 +4521,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4554,8 +4540,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -4563,7 +4549,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -4577,7 +4563,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4596,8 +4582,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4776,14 +4762,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 33,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -4791,7 +4777,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -4805,7 +4791,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4824,8 +4810,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 3"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -4833,7 +4819,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -4847,7 +4833,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4866,8 +4852,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 100,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 12"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -5057,14 +5043,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 33,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -5072,7 +5058,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -5086,7 +5072,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5105,8 +5091,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 3"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -5114,7 +5100,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -5128,7 +5114,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5147,8 +5133,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 100,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 12"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -5404,14 +5390,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 33,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -5419,7 +5405,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -5433,7 +5419,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5452,8 +5438,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 105,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -5461,7 +5447,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -5475,7 +5461,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5494,8 +5480,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 106,
-            "column" : 7,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 16"
+            "column" : 41,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -5550,7 +5536,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -5564,7 +5550,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5583,8 +5569,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 87,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 1"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -5592,7 +5578,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -5606,7 +5592,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5625,8 +5611,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 88,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -5720,7 +5706,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -5734,7 +5720,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5753,8 +5739,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -5762,7 +5748,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -5776,7 +5762,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5795,8 +5781,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5924,7 +5910,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -5938,7 +5924,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5957,8 +5943,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 3"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -5966,7 +5952,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -5980,7 +5966,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5999,8 +5985,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 100,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 12"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -6062,7 +6048,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -6076,7 +6062,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6095,8 +6081,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 87,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 1"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6104,7 +6090,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -6118,7 +6104,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6137,8 +6123,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 88,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6234,7 +6220,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -6248,7 +6234,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6267,8 +6253,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6276,7 +6262,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -6290,7 +6276,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6309,8 +6295,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6451,7 +6437,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -6465,7 +6451,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6484,8 +6470,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 3"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -6493,7 +6479,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -6507,7 +6493,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6526,8 +6512,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 100,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 12"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -6702,7 +6688,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -6716,7 +6702,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6735,8 +6721,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 105,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -6744,7 +6730,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -6758,7 +6744,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6777,8 +6763,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 106,
-            "column" : 7,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 16"
+            "column" : 41,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -6840,7 +6826,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -6854,7 +6840,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6873,8 +6859,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 87,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 1"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6882,7 +6868,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -6896,7 +6882,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6915,8 +6901,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 88,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -7012,7 +6998,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -7026,7 +7012,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7045,8 +7031,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7054,7 +7040,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -7068,7 +7054,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7087,8 +7073,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7229,7 +7215,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -7243,7 +7229,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7262,8 +7248,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 3"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7271,7 +7257,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -7285,7 +7271,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7304,8 +7290,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 100,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 12"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -7480,7 +7466,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -7494,7 +7480,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7513,8 +7499,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 105,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -7522,7 +7508,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -7536,7 +7522,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7555,8 +7541,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 106,
-            "column" : 7,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 16"
+            "column" : 41,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -7665,7 +7651,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -7679,7 +7665,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7698,8 +7684,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 93,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 2"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7707,7 +7693,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -7721,7 +7707,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7740,8 +7726,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 94,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 8"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7884,7 +7870,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -7898,7 +7884,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7917,8 +7903,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 3"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7926,7 +7912,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -7940,7 +7926,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7959,8 +7945,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 100,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 12"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8148,7 +8134,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -8162,7 +8148,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8181,8 +8167,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 105,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 4"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -8190,7 +8176,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -8204,7 +8190,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8223,8 +8209,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 106,
-            "column" : 7,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 16"
+            "column" : 41,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -8446,7 +8432,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
             },
             {
               "type" : "expression",
@@ -8460,7 +8446,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8479,8 +8465,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 111,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_words = local_metadata.int_meta.new_words + 5"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_words + 5; ..."
           }
         },
         {
@@ -8488,7 +8474,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
             },
             {
               "type" : "expression",
@@ -8502,7 +8488,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8521,8 +8507,8 @@
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 112,
-            "column" : 8,
-            "source_fragment" : "local_metadata.int_meta.new_bytes = local_metadata.int_meta.new_bytes + 20"
+            "column" : 42,
+            "source_fragment" : "= local_metadata.int_meta.new_bytes + 20; ..."
           }
         }
       ]
@@ -9051,7 +9037,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "local_metadata_t.compute_checksum"]
+              "value" : ["scalars", "local_metadata_t._compute_checksum11"]
             },
             {
               "type" : "expression",
@@ -9071,8 +9057,8 @@
           "source_info" : {
             "filename" : "include/int_report.p4",
             "line" : 86,
-            "column" : 8,
-            "source_fragment" : "local_metadata.compute_checksum = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -9270,14 +9256,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "local_metadata_t._int_meta_switch_id4"]
             }
           ],
           "source_info" : {
             "filename" : "include/int_report.p4",
             "line" : 44,
             "column" : 8,
-            "source_fragment" : "hdr.report_fixed_header.sw_id = local_metadata.int_meta.switch_id"
+            "source_fragment" : "hdr.report_fixed_header.sw_id = local_metadata.int_meta.switch_id; ..."
           }
         },
         {
@@ -9340,8 +9326,58 @@
                         "value" : {
                           "op" : "&",
                           "left" : {
-                            "type" : "field",
-                            "value" : ["report_ipv4", "len"]
+                            "type" : "expression",
+                            "value" : {
+                              "op" : "&",
+                              "left" : {
+                                "type" : "expression",
+                                "value" : {
+                                  "op" : "+",
+                                  "left" : {
+                                    "type" : "hexstr",
+                                    "value" : "0x0056"
+                                  },
+                                  "right" : {
+                                    "type" : "expression",
+                                    "value" : {
+                                      "op" : "&",
+                                      "left" : {
+                                        "type" : "expression",
+                                        "value" : {
+                                          "op" : "<<",
+                                          "left" : {
+                                            "type" : "expression",
+                                            "value" : {
+                                              "op" : "&",
+                                              "left" : {
+                                                "type" : "field",
+                                                "value" : ["intl4_shim", "len"]
+                                              },
+                                              "right" : {
+                                                "type" : "hexstr",
+                                                "value" : "0xffff"
+                                              }
+                                            }
+                                          },
+                                          "right" : {
+                                            "type" : "hexstr",
+                                            "value" : "0x2"
+                                          }
+                                        }
+                                      },
+                                      "right" : {
+                                        "type" : "hexstr",
+                                        "value" : "0xffff"
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0xffff"
+                              }
+                            }
                           },
                           "right" : {
                             "type" : "hexstr",
@@ -9739,7 +9775,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_transit_hasReturned_0"]
+              "value" : ["scalars", "process_int_transit_hasReturned"]
             },
             {
               "type" : "expression",
@@ -9769,7 +9805,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_transit_hasReturned_0"]
+              "value" : ["scalars", "process_int_transit_hasReturned"]
             },
             {
               "type" : "expression",
@@ -9823,7 +9859,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       }
                     }
                   },
@@ -9921,7 +9957,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_bytes5"]
                       }
                     }
                   },
@@ -9970,7 +10006,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_new_words6"]
                       }
                     }
                   },
@@ -10204,13 +10240,13 @@
             {
               "match_type" : "ternary",
               "name" : "local_metadata.l4_src_port",
-              "target" : ["scalars", "local_metadata_t.l4_src_port"],
+              "target" : ["scalars", "local_metadata_t._l4_src_port0"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "local_metadata.l4_dst_port",
-              "target" : ["scalars", "local_metadata_t.l4_dst_port"],
+              "target" : ["scalars", "local_metadata_t._l4_dst_port1"],
               "mask" : null
             }
           ],
@@ -10335,13 +10371,13 @@
             {
               "match_type" : "ternary",
               "name" : "local_metadata.l4_src_port",
-              "target" : ["scalars", "local_metadata_t.l4_src_port"],
+              "target" : ["scalars", "local_metadata_t._l4_src_port0"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "local_metadata.l4_dst_port",
-              "target" : ["scalars", "local_metadata_t.l4_dst_port"],
+              "target" : ["scalars", "local_metadata_t._l4_dst_port1"],
               "mask" : null
             }
           ],
@@ -10437,7 +10473,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "source"]
+                    "value" : ["scalars", "local_metadata_t._int_meta_source7"]
                   }
                 }
               },
@@ -10474,7 +10510,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "sink"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_sink8"]
                       }
                     }
                   },
@@ -11579,7 +11615,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "transit"]
+                    "value" : ["scalars", "local_metadata_t._int_meta_transit9"]
                   }
                 }
               },
@@ -11607,7 +11643,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "process_int_transit_hasReturned_0"]
+                    "value" : ["scalars", "process_int_transit_hasReturned"]
                   }
                 }
               }
@@ -11735,7 +11771,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "sink"]
+                        "value" : ["scalars", "local_metadata_t._int_meta_sink8"]
                       }
                     }
                   },
@@ -11806,6 +11842,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -11830,6 +11868,8 @@
       "target" : ["report_ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_0",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -11896,4 +11936,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.p4info b/pipelines/basic/src/main/resources/p4c-out/bmv2/int_p4info.txt
similarity index 94%
rename from pipelines/basic/src/main/resources/p4c-out/bmv2/int.p4info
rename to pipelines/basic/src/main/resources/p4c-out/bmv2/int_p4info.txt
index 8507d9e..ad17d1e 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.p4info
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/int_p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+  arch: "v1model"
+}
 tables {
   preamble {
     id: 33561568
@@ -73,7 +76,6 @@
   const_default_action_id: 16784184
   direct_resource_ids: 318816189
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -92,12 +94,12 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318807707
   size: 511
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -116,12 +118,12 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318828289
   size: 511
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -158,12 +160,12 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318802143
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -182,11 +184,11 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   size: 1
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -205,10 +207,10 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 actions {
   preamble {
@@ -417,6 +419,7 @@
   preamble {
     id: 67146229
     name: "packet_in"
+    alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
   }
   metadata {
@@ -434,6 +437,7 @@
   preamble {
     id: 67121543
     name: "packet_out"
+    alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {
diff --git a/pipelines/fabric/src/main/resources/bmv2-compile.sh b/pipelines/fabric/src/main/resources/bmv2-compile.sh
index a249aa0..d9ea018 100755
--- a/pipelines/fabric/src/main/resources/bmv2-compile.sh
+++ b/pipelines/fabric/src/main/resources/bmv2-compile.sh
@@ -18,8 +18,7 @@
 (set -x; p4c-bm2-ss --arch v1model \
         -o ${OUT_DIR}/bmv2.json \
         ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} \
-        --p4runtime-file ${OUT_DIR}/p4info.txt \
-        --p4runtime-format text \
+        --p4runtime-files ${OUT_DIR}/p4info.txt \
         fabric.p4)
 (set -x; p4c-graphs ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} --graphs-dir ${OUT_DIR}/graphs fabric.p4)
 for f in ${OUT_DIR}/graphs/*.dot; do
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index e77a652..b2ff159 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -16,24 +16,37 @@
         ["spgw_ingress_hasReturned", 1, false],
         ["egress_next_tmp", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["fabric_metadata_t.eth_type", 16, 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.clone_to_cpu", 1, false],
-        ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_sport", 16, false],
-        ["fabric_metadata_t.l4_dport", 16, false],
-        ["_padding_2", 4, false]
+        ["fabric_metadata_t._eth_type0", 16, false],
+        ["fabric_metadata_t._ip_eth_type1", 16, false],
+        ["fabric_metadata_t._vlan_id2", 12, false],
+        ["fabric_metadata_t._vlan_pri3", 3, false],
+        ["fabric_metadata_t._vlan_cfi4", 1, false],
+        ["fabric_metadata_t._mpls_label5", 20, false],
+        ["fabric_metadata_t._mpls_ttl6", 8, false],
+        ["fabric_metadata_t._skip_forwarding7", 1, false],
+        ["fabric_metadata_t._skip_next8", 1, false],
+        ["fabric_metadata_t._fwd_type9", 3, false],
+        ["fabric_metadata_t._next_id10", 32, false],
+        ["fabric_metadata_t._is_multicast11", 1, false],
+        ["fabric_metadata_t._is_controller_packet_out12", 1, false],
+        ["fabric_metadata_t._clone_to_cpu13", 1, false],
+        ["fabric_metadata_t._ip_proto14", 8, false],
+        ["fabric_metadata_t._l4_sport15", 16, false],
+        ["fabric_metadata_t._l4_dport16", 16, false],
+        ["fabric_metadata_t._spgw_direction17", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
+        ["fabric_metadata_t._spgw_teid19", 32, false],
+        ["fabric_metadata_t._spgw_s1u_enb_addr20", 32, false],
+        ["fabric_metadata_t._spgw_s1u_sgw_addr21", 32, false],
+        ["fabric_metadata_t._int_meta_source22", 1, false],
+        ["fabric_metadata_t._int_meta_transit23", 1, false],
+        ["fabric_metadata_t._int_meta_sink24", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id25", 32, false],
+        ["fabric_metadata_t._int_meta_new_words26", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes27", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp28", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp29", 32, false],
+        ["_padding_0", 7, false]
       ]
     },
     {
@@ -316,33 +329,6 @@
         ["padding", 2, false],
         ["dscp", 6, false]
       ]
-    },
-    {
-      "name" : "spgw_meta_t",
-      "id" : 26,
-      "fields" : [
-        ["direction", 2, false],
-        ["ipv4_len", 16, false],
-        ["teid", 32, false],
-        ["s1u_enb_addr", 32, false],
-        ["s1u_sgw_addr", 32, false],
-        ["_padding_0", 6, false]
-      ]
-    },
-    {
-      "name" : "int_metadata_t",
-      "id" : 27,
-      "fields" : [
-        ["source", 1, 0],
-        ["transit", 1, 0],
-        ["sink", 1, 0],
-        ["switch_id", 32, false],
-        ["new_words", 8, false],
-        ["new_bytes", 16, false],
-        ["ig_tstamp", 32, false],
-        ["eg_tstamp", 32, false],
-        ["_padding_1", 5, false]
-      ]
     }
   ],
   "headers" : [
@@ -583,20 +569,6 @@
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.spgw",
-      "id" : 34,
-      "header_type" : "spgw_meta_t",
-      "metadata" : true,
-      "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.int_meta",
-      "id" : 35,
-      "header_type" : "int_metadata_t",
-      "metadata" : true,
-      "pi_omit" : true
     }
   ],
   "header_stacks" : [],
@@ -703,7 +675,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._eth_type0"]
                 },
                 {
                   "type" : "field",
@@ -716,7 +688,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                  "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
                 },
                 {
                   "type" : "hexstr",
@@ -879,7 +851,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
                 },
                 {
                   "type" : "field",
@@ -892,7 +864,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
                 },
                 {
                   "type" : "field",
@@ -958,7 +930,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
                 },
                 {
                   "type" : "field",
@@ -971,7 +943,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
                 },
                 {
                   "type" : "hexstr",
@@ -1043,7 +1015,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
                 },
                 {
                   "type" : "field",
@@ -1056,7 +1028,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
                 },
                 {
                   "type" : "hexstr",
@@ -1115,7 +1087,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -1128,7 +1100,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1164,7 +1136,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -1177,7 +1149,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1386,7 +1358,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -1399,7 +1371,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -2193,7 +2165,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "teid"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             },
             {
               "type" : "runtime_data",
@@ -2203,8 +2175,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 63,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.teid = teid"
+            "column" : 30,
+            "source_fragment" : "= teid; ..."
           }
         },
         {
@@ -2212,7 +2184,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -2222,8 +2194,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 64,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr"
+            "column" : 38,
+            "source_fragment" : "= s1u_enb_addr; ..."
           }
         },
         {
@@ -2231,7 +2203,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
             },
             {
               "type" : "runtime_data",
@@ -2241,8 +2213,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 65,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr"
+            "column" : 38,
+            "source_fragment" : "= s1u_sgw_addr; ..."
           }
         }
       ]
@@ -2257,7 +2229,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "source"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
             },
             {
               "type" : "expression",
@@ -2277,8 +2249,8 @@
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 42,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.int_meta.source = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2293,7 +2265,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "sink"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
             },
             {
               "type" : "expression",
@@ -2313,8 +2285,8 @@
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 63,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.int_meta.sink = true"
+            "column" : 38,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2329,7 +2301,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
             },
             {
               "type" : "expression",
@@ -2349,8 +2321,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 36,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -2358,7 +2330,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2378,8 +2350,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 37,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2405,7 +2377,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -2415,8 +2387,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 47,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -2436,7 +2408,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
             },
             {
               "type" : "runtime_data",
@@ -2446,8 +2418,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 82,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
+            "column" : 33,
+            "source_fragment" : "= fwd_type; ..."
           }
         }
       ]
@@ -2467,7 +2439,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2477,8 +2449,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2498,7 +2470,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "hexstr",
@@ -2508,8 +2480,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 62,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = 0"
+            "column" : 35,
+            "source_fragment" : "= 0; ..."
           }
         },
         {
@@ -2517,7 +2489,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2527,8 +2499,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2548,7 +2520,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2558,8 +2530,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2585,7 +2557,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2595,8 +2567,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2616,7 +2588,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2626,8 +2598,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 33,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2661,7 +2633,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2681,8 +2653,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 40,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2697,7 +2669,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
             },
             {
               "type" : "expression",
@@ -2717,8 +2689,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.clone_to_cpu = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2743,7 +2715,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2763,8 +2735,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 52,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2790,7 +2762,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -2800,8 +2772,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 70,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -2852,7 +2824,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2862,8 +2834,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -3003,7 +2975,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "runtime_data",
@@ -3013,8 +2985,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+            "column" : 35,
+            "source_fragment" : "= label; ..."
           }
         },
         {
@@ -3211,7 +3183,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "runtime_data",
@@ -3221,8 +3193,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+            "column" : 35,
+            "source_fragment" : "= label; ..."
           }
         },
         {
@@ -3318,7 +3290,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+              "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
             },
             {
               "type" : "expression",
@@ -3338,8 +3310,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 209,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.is_multicast = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -3596,7 +3568,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
             },
             {
               "type" : "expression",
@@ -3616,8 +3588,8 @@
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 27,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
+            "column" : 53,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -3632,7 +3604,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
@@ -3642,8 +3614,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 103,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
           }
         },
         {
@@ -3651,7 +3623,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "field",
@@ -3661,8 +3633,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 104,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+            "column" : 36,
+            "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
         },
         {
@@ -3670,7 +3642,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             },
             {
               "type" : "field",
@@ -3680,8 +3652,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 105,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
         },
         {
@@ -3689,7 +3661,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             },
             {
               "type" : "field",
@@ -3699,8 +3671,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 106,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
         }
       ]
@@ -3715,7 +3687,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             },
             {
               "type" : "hexstr",
@@ -3725,8 +3697,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 113,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+            "column" : 37,
+            "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
         }
       ]
@@ -3818,7 +3790,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3904,7 +3876,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3930,7 +3902,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -4015,7 +3987,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             },
             {
               "type" : "field",
@@ -4025,8 +3997,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 174,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.ipv4_len = ipv4.total_len"
+            "column" : 34,
+            "source_fragment" : "= ipv4.total_len; ..."
           }
         }
       ]
@@ -4451,14 +4423,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 202,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr"
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr; ..."
           }
         },
         {
@@ -4470,14 +4442,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 203,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr"
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr; ..."
           }
         },
         {
@@ -4571,7 +4543,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.spgw", "ipv4_len"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4770,14 +4742,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 221,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len"
+            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
           }
         },
         {
@@ -4789,14 +4761,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "teid"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 222,
             "column" : 8,
-            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid"
+            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
           }
         }
       ]
@@ -5162,14 +5134,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport; ..."
           }
         },
         {
@@ -5311,7 +5283,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "transit"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
             },
             {
               "type" : "expression",
@@ -5331,8 +5303,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 26,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.transit = true"
+            "column" : 31,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -5340,7 +5312,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             },
             {
               "type" : "runtime_data",
@@ -5350,8 +5322,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 31,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.switch_id = switch_id"
+            "column" : 33,
+            "source_fragment" : "= switch_id; ..."
           }
         }
       ]
@@ -5438,7 +5410,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5452,7 +5424,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5471,8 +5443,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -5480,7 +5452,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5494,7 +5466,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5513,8 +5485,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -5563,7 +5535,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5577,7 +5549,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5596,8 +5568,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -5605,7 +5577,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5619,7 +5591,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5638,8 +5610,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -5754,7 +5726,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5768,7 +5740,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5787,8 +5759,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -5796,7 +5768,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5810,7 +5782,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5829,8 +5801,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5924,7 +5896,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5938,7 +5910,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5957,8 +5929,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -5966,7 +5938,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5980,7 +5952,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5999,8 +5971,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6160,7 +6132,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6174,7 +6146,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6193,8 +6165,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6202,7 +6174,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6216,7 +6188,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6235,8 +6207,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6364,7 +6336,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6378,7 +6350,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6397,8 +6369,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6406,7 +6378,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6420,7 +6392,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6439,8 +6411,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6634,7 +6606,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6648,7 +6620,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6667,8 +6639,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -6676,7 +6648,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6690,7 +6662,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6709,8 +6681,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -6744,14 +6716,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6759,7 +6731,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6773,7 +6745,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6792,8 +6764,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6801,7 +6773,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6815,7 +6787,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6834,8 +6806,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6935,14 +6907,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6950,7 +6922,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6964,7 +6936,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6983,8 +6955,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6992,7 +6964,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7006,7 +6978,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7025,8 +6997,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7094,14 +7066,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7109,7 +7081,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7123,7 +7095,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7142,8 +7114,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7151,7 +7123,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7165,7 +7137,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7184,8 +7156,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7319,14 +7291,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7334,7 +7306,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7348,7 +7320,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7367,8 +7339,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7376,7 +7348,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7390,7 +7362,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7409,8 +7381,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -7523,14 +7495,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7538,7 +7510,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7552,7 +7524,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7571,8 +7543,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7580,7 +7552,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7594,7 +7566,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7613,8 +7585,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7793,14 +7765,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7808,7 +7780,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7822,7 +7794,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7841,8 +7813,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7850,7 +7822,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7864,7 +7836,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7883,8 +7855,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8031,14 +8003,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -8046,7 +8018,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8060,7 +8032,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8079,8 +8051,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8088,7 +8060,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8102,7 +8074,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8121,8 +8093,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8335,14 +8307,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -8350,7 +8322,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8364,7 +8336,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8383,8 +8355,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -8392,7 +8364,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8406,7 +8378,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8425,8 +8397,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -8481,7 +8453,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8495,7 +8467,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8514,8 +8486,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8523,7 +8495,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8537,7 +8509,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8556,8 +8528,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -8625,7 +8597,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8639,7 +8611,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8658,8 +8630,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8667,7 +8639,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8681,7 +8653,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8700,8 +8672,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -8803,7 +8775,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8817,7 +8789,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8836,8 +8808,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -8845,7 +8817,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8859,7 +8831,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8878,8 +8850,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8951,7 +8923,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8965,7 +8937,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8984,8 +8956,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8993,7 +8965,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9007,7 +8979,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9026,8 +8998,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -9133,7 +9105,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9147,7 +9119,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9166,8 +9138,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9175,7 +9147,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9189,7 +9161,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9208,8 +9180,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -9334,7 +9306,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9348,7 +9320,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9367,8 +9339,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9376,7 +9348,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9390,7 +9362,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9409,8 +9381,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -9569,7 +9541,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9583,7 +9555,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9602,8 +9574,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -9611,7 +9583,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9625,7 +9597,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9644,8 +9616,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -9694,7 +9666,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9708,7 +9680,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9727,8 +9699,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -9736,7 +9708,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9750,7 +9722,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9769,8 +9741,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -9853,7 +9825,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9867,7 +9839,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9886,8 +9858,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9895,7 +9867,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9909,7 +9881,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9928,8 +9900,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -10031,7 +10003,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10045,7 +10017,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10064,8 +10036,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10073,7 +10045,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10087,7 +10059,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10106,8 +10078,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -10243,7 +10215,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10257,7 +10229,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10276,8 +10248,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10285,7 +10257,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10299,7 +10271,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10318,8 +10290,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -10425,7 +10397,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10439,7 +10411,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10458,8 +10430,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10467,7 +10439,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10481,7 +10453,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10500,8 +10472,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -10641,7 +10613,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10655,7 +10627,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10674,8 +10646,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10683,7 +10655,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10697,7 +10669,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10716,8 +10688,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -10876,7 +10848,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10890,7 +10862,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10909,8 +10881,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10918,7 +10890,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10932,7 +10904,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10951,8 +10923,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -11145,7 +11117,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -11159,7 +11131,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11178,8 +11150,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -11187,7 +11159,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -11201,7 +11173,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11220,8 +11192,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -12274,18 +12246,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 248,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+            "column" : 33,
+            "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
           }
         }
       ]
@@ -12319,14 +12291,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 254,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
         },
         {
@@ -12376,14 +12348,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 257,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
         },
         {
@@ -12391,7 +12363,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -12436,14 +12408,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 266,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
         },
         {
@@ -12455,14 +12427,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 267,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
         },
         {
@@ -12474,14 +12446,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 268,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -12493,14 +12465,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 269,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
           }
         },
         {
@@ -12538,14 +12510,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 280,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -12992,7 +12964,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       }
                     }
                   },
@@ -13090,7 +13062,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       }
                     }
                   },
@@ -13139,7 +13111,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       }
                     }
                   },
@@ -13432,7 +13404,7 @@
             {
               "match_type" : "exact",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             }
           ],
@@ -13795,7 +13767,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -13838,7 +13810,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
+              "target" : ["scalars", "fabric_metadata_t._mpls_label5"],
               "mask" : null
             }
           ],
@@ -13956,19 +13928,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t.ip_proto"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             },
             {
@@ -13992,7 +13964,7 @@
             {
               "match_type" : "ternary",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             },
             {
@@ -14062,7 +14034,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14100,7 +14072,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14139,7 +14111,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14173,7 +14145,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14210,7 +14182,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14402,15 +14374,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
               }
             ]
           }
@@ -14684,7 +14656,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
                   }
                 }
               },
@@ -14712,7 +14684,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14738,7 +14710,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14764,7 +14736,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14790,7 +14762,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14821,7 +14793,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_next8"]
                   }
                 }
               },
@@ -14906,7 +14878,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "sink"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
                   }
                 }
               },
@@ -15060,7 +15032,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -15345,13 +15317,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             }
           ],
@@ -16365,7 +16337,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
                   }
                 }
               },
@@ -16428,7 +16400,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -16449,7 +16421,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
                       }
                     }
                   },
@@ -16488,7 +16460,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -16532,7 +16504,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -16611,7 +16583,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -16784,7 +16756,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["userMetadata.spgw", "direction"]
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -16895,7 +16867,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "source"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
                   }
                 }
               },
@@ -16951,7 +16923,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "transit"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
                   }
                 }
               },
@@ -17103,7 +17075,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "sink"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
                   }
                 }
               },
@@ -17132,6 +17104,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -17156,6 +17130,8 @@
       "target" : ["gtpu_ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_0",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -17180,6 +17156,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_1",
+      "verify" : true,
+      "update" : false,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -17246,4 +17224,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index f1e2a31..7b0b869 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+  arch: "v1model"
+}
 tables {
   preamble {
     id: 33582731
@@ -15,7 +18,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318781522
@@ -56,7 +60,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318787614
@@ -79,7 +84,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318770551
@@ -176,7 +182,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318770289
@@ -199,7 +206,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318830507
@@ -225,7 +233,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318811107
@@ -248,7 +257,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318799210
@@ -368,7 +378,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318768144
@@ -400,7 +411,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318778156
@@ -429,7 +441,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318769096
@@ -458,7 +471,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   implementation_id: 285217164
@@ -482,7 +496,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318801752
@@ -523,7 +538,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318800047
@@ -546,7 +562,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   size: 1
@@ -562,7 +579,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   size: 1024
 }
@@ -589,7 +607,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318827144
@@ -1249,6 +1268,7 @@
   preamble {
     id: 67146229
     name: "packet_in"
+    alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
   }
   metadata {
@@ -1266,6 +1286,7 @@
   preamble {
     id: 67121543
     name: "packet_out"
+    alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index a10301a..ba1a5d2 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -10,23 +10,32 @@
         ["tmp_1", 32, false],
         ["egress_next_tmp", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["fabric_metadata_t.eth_type", 16, 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.clone_to_cpu", 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._eth_type0", 16, false],
+        ["fabric_metadata_t._ip_eth_type1", 16, false],
+        ["fabric_metadata_t._vlan_id2", 12, false],
+        ["fabric_metadata_t._vlan_pri3", 3, false],
+        ["fabric_metadata_t._vlan_cfi4", 1, false],
+        ["fabric_metadata_t._mpls_label5", 20, false],
+        ["fabric_metadata_t._mpls_ttl6", 8, false],
+        ["fabric_metadata_t._skip_forwarding7", 1, false],
+        ["fabric_metadata_t._skip_next8", 1, false],
+        ["fabric_metadata_t._fwd_type9", 3, false],
+        ["fabric_metadata_t._next_id10", 32, false],
+        ["fabric_metadata_t._is_multicast11", 1, false],
+        ["fabric_metadata_t._is_controller_packet_out12", 1, false],
+        ["fabric_metadata_t._clone_to_cpu13", 1, false],
+        ["fabric_metadata_t._ip_proto14", 8, false],
+        ["fabric_metadata_t._l4_sport15", 16, false],
+        ["fabric_metadata_t._l4_dport16", 16, 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", 5, false]
       ]
     },
     {
@@ -257,21 +266,6 @@
         ["padding", 2, false],
         ["dscp", 6, false]
       ]
-    },
-    {
-      "name" : "int_metadata_t",
-      "id" : 22,
-      "fields" : [
-        ["source", 1, 0],
-        ["transit", 1, 0],
-        ["sink", 1, 0],
-        ["switch_id", 32, false],
-        ["new_words", 8, false],
-        ["new_bytes", 16, false],
-        ["ig_tstamp", 32, false],
-        ["eg_tstamp", 32, false],
-        ["_padding_0", 5, false]
-      ]
     }
   ],
   "headers" : [
@@ -435,13 +429,6 @@
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.int_meta",
-      "id" : 23,
-      "header_type" : "int_metadata_t",
-      "metadata" : true,
-      "pi_omit" : true
     }
   ],
   "header_stacks" : [],
@@ -528,7 +515,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._eth_type0"]
                 },
                 {
                   "type" : "field",
@@ -541,7 +528,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                  "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
                 },
                 {
                   "type" : "hexstr",
@@ -686,7 +673,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
                 },
                 {
                   "type" : "field",
@@ -699,7 +686,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
                 },
                 {
                   "type" : "field",
@@ -759,7 +746,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
                 },
                 {
                   "type" : "field",
@@ -772,7 +759,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
                 },
                 {
                   "type" : "hexstr",
@@ -844,7 +831,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -857,7 +844,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -893,7 +880,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -906,7 +893,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1441,7 +1428,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "source"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
             },
             {
               "type" : "expression",
@@ -1461,8 +1448,8 @@
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 42,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.int_meta.source = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1477,7 +1464,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
             },
             {
               "type" : "expression",
@@ -1497,8 +1484,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 36,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -1506,7 +1493,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1526,8 +1513,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 37,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1553,7 +1540,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -1563,8 +1550,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 47,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -1584,7 +1571,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
             },
             {
               "type" : "runtime_data",
@@ -1594,8 +1581,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 82,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
+            "column" : 33,
+            "source_fragment" : "= fwd_type; ..."
           }
         }
       ]
@@ -1615,7 +1602,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1625,8 +1612,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1646,7 +1633,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "hexstr",
@@ -1656,8 +1643,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 62,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = 0"
+            "column" : 35,
+            "source_fragment" : "= 0; ..."
           }
         },
         {
@@ -1665,7 +1652,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1675,8 +1662,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1696,7 +1683,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1706,8 +1693,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1733,7 +1720,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1743,8 +1730,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 33,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1778,7 +1765,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1798,8 +1785,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 40,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1814,7 +1801,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
             },
             {
               "type" : "expression",
@@ -1834,8 +1821,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.clone_to_cpu = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1860,7 +1847,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1880,8 +1867,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 52,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1907,7 +1894,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -1917,8 +1904,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 70,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -1969,7 +1956,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1979,8 +1966,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2120,7 +2107,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "runtime_data",
@@ -2130,8 +2117,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+            "column" : 35,
+            "source_fragment" : "= label; ..."
           }
         },
         {
@@ -2227,7 +2214,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+              "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
             },
             {
               "type" : "expression",
@@ -2247,8 +2234,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 209,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.is_multicast = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2297,7 +2284,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
             },
             {
               "type" : "expression",
@@ -2317,8 +2304,8 @@
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 27,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
+            "column" : 53,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2333,7 +2320,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
@@ -2343,8 +2330,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 103,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
           }
         },
         {
@@ -2352,7 +2339,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "field",
@@ -2362,8 +2349,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 104,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+            "column" : 36,
+            "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
         },
         {
@@ -2371,7 +2358,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             },
             {
               "type" : "field",
@@ -2381,8 +2368,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 105,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
         },
         {
@@ -2390,7 +2377,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             },
             {
               "type" : "field",
@@ -2400,8 +2387,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 106,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
         }
       ]
@@ -2416,7 +2403,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             },
             {
               "type" : "hexstr",
@@ -2426,8 +2413,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 113,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+            "column" : 37,
+            "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
         }
       ]
@@ -2939,14 +2926,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport; ..."
           }
         },
         {
@@ -3088,7 +3075,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "transit"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
             },
             {
               "type" : "expression",
@@ -3108,8 +3095,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 26,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.transit = true"
+            "column" : 31,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -3117,7 +3104,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             },
             {
               "type" : "runtime_data",
@@ -3127,8 +3114,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 31,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.switch_id = switch_id"
+            "column" : 33,
+            "source_fragment" : "= switch_id; ..."
           }
         }
       ]
@@ -3215,7 +3202,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3229,7 +3216,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3248,8 +3235,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -3257,7 +3244,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3271,7 +3258,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3290,8 +3277,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -3340,7 +3327,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3354,7 +3341,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3373,8 +3360,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -3382,7 +3369,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3396,7 +3383,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3415,8 +3402,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -3531,7 +3518,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3545,7 +3532,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3564,8 +3551,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -3573,7 +3560,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3587,7 +3574,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3606,8 +3593,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -3701,7 +3688,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3715,7 +3702,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3734,8 +3721,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -3743,7 +3730,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3757,7 +3744,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3776,8 +3763,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -3937,7 +3924,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -3951,7 +3938,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3970,8 +3957,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -3979,7 +3966,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -3993,7 +3980,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4012,8 +3999,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4141,7 +4128,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4155,7 +4142,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4174,8 +4161,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -4183,7 +4170,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4197,7 +4184,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4216,8 +4203,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4411,7 +4398,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4425,7 +4412,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4444,8 +4431,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -4453,7 +4440,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4467,7 +4454,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4486,8 +4473,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -4521,14 +4508,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -4536,7 +4523,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4550,7 +4537,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4569,8 +4556,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -4578,7 +4565,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4592,7 +4579,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4611,8 +4598,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -4712,14 +4699,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -4727,7 +4714,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4741,7 +4728,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4760,8 +4747,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -4769,7 +4756,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4783,7 +4770,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4802,8 +4789,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -4871,14 +4858,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -4886,7 +4873,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -4900,7 +4887,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4919,8 +4906,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -4928,7 +4915,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -4942,7 +4929,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4961,8 +4948,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5096,14 +5083,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -5111,7 +5098,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5125,7 +5112,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5144,8 +5131,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -5153,7 +5140,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5167,7 +5154,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5186,8 +5173,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -5300,14 +5287,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -5315,7 +5302,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5329,7 +5316,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5348,8 +5335,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -5357,7 +5344,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5371,7 +5358,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5390,8 +5377,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5570,14 +5557,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -5585,7 +5572,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5599,7 +5586,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5618,8 +5605,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -5627,7 +5614,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5641,7 +5628,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5660,8 +5647,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -5808,14 +5795,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -5823,7 +5810,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -5837,7 +5824,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5856,8 +5843,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -5865,7 +5852,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -5879,7 +5866,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5898,8 +5885,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -6112,14 +6099,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6127,7 +6114,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6141,7 +6128,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6160,8 +6147,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -6169,7 +6156,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6183,7 +6170,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6202,8 +6189,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -6258,7 +6245,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6272,7 +6259,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6291,8 +6278,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6300,7 +6287,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6314,7 +6301,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6333,8 +6320,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6402,7 +6389,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6416,7 +6403,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6435,8 +6422,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6444,7 +6431,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6458,7 +6445,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6477,8 +6464,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6580,7 +6567,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6594,7 +6581,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6613,8 +6600,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6622,7 +6609,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6636,7 +6623,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6655,8 +6642,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6728,7 +6715,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6742,7 +6729,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6761,8 +6748,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6770,7 +6757,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6784,7 +6771,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6803,8 +6790,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6910,7 +6897,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -6924,7 +6911,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6943,8 +6930,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6952,7 +6939,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -6966,7 +6953,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6985,8 +6972,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7111,7 +7098,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7125,7 +7112,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7144,8 +7131,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7153,7 +7140,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7167,7 +7154,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7186,8 +7173,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7346,7 +7333,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7360,7 +7347,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7379,8 +7366,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7388,7 +7375,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7402,7 +7389,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7421,8 +7408,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -7471,7 +7458,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7485,7 +7472,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7504,8 +7491,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -7513,7 +7500,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7527,7 +7514,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7546,8 +7533,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -7630,7 +7617,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7644,7 +7631,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7663,8 +7650,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7672,7 +7659,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7686,7 +7673,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7705,8 +7692,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7808,7 +7795,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -7822,7 +7809,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7841,8 +7828,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7850,7 +7837,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -7864,7 +7851,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7883,8 +7870,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8020,7 +8007,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8034,7 +8021,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8053,8 +8040,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8062,7 +8049,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8076,7 +8063,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8095,8 +8082,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8202,7 +8189,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8216,7 +8203,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8235,8 +8222,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -8244,7 +8231,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8258,7 +8245,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8277,8 +8264,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8418,7 +8405,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8432,7 +8419,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8451,8 +8438,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8460,7 +8447,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8474,7 +8461,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8493,8 +8480,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8653,7 +8640,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8667,7 +8654,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8686,8 +8673,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8695,7 +8682,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8709,7 +8696,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8728,8 +8715,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8922,7 +8909,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
             },
             {
               "type" : "expression",
@@ -8936,7 +8923,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8955,8 +8942,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -8964,7 +8951,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
             },
             {
               "type" : "expression",
@@ -8978,7 +8965,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8997,8 +8984,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -9028,18 +9015,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 248,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+            "column" : 33,
+            "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
           }
         }
       ]
@@ -9073,14 +9060,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 254,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
         },
         {
@@ -9130,14 +9117,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 257,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
         },
         {
@@ -9145,7 +9132,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -9190,14 +9177,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 266,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
         },
         {
@@ -9209,14 +9196,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 267,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
         },
         {
@@ -9228,14 +9215,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 268,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -9247,14 +9234,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 269,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
           }
         },
         {
@@ -9292,14 +9279,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 280,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -9680,7 +9667,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       }
                     }
                   },
@@ -9778,7 +9765,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
                       }
                     }
                   },
@@ -9827,7 +9814,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
                       }
                     }
                   },
@@ -10005,7 +9992,7 @@
             {
               "match_type" : "exact",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             }
           ],
@@ -10041,7 +10028,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -10084,7 +10071,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
+              "target" : ["scalars", "fabric_metadata_t._mpls_label5"],
               "mask" : null
             }
           ],
@@ -10165,19 +10152,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t.ip_proto"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             },
             {
@@ -10201,7 +10188,7 @@
             {
               "match_type" : "ternary",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             },
             {
@@ -10271,7 +10258,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -10309,7 +10296,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -10343,7 +10330,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -10380,7 +10367,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -10512,15 +10499,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
               }
             ]
           }
@@ -10623,7 +10610,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
                   }
                 }
               },
@@ -10651,7 +10638,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10677,7 +10664,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10703,7 +10690,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -10734,7 +10721,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_next8"]
                   }
                 }
               },
@@ -10940,7 +10927,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -11156,13 +11143,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             }
           ],
@@ -12100,7 +12087,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
                   }
                 }
               },
@@ -12163,7 +12150,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -12184,7 +12171,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
                       }
                     }
                   },
@@ -12223,7 +12210,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -12267,7 +12254,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -12346,7 +12333,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -12555,7 +12542,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "source"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
                   }
                 }
               },
@@ -12611,7 +12598,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "transit"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
                   }
                 }
               },
@@ -12733,6 +12720,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -12757,6 +12746,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_0",
+      "verify" : true,
+      "update" : false,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -12823,4 +12814,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index 6790d59..6c5b97e 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+  arch: "v1model"
+}
 tables {
   preamble {
     id: 33581620
@@ -15,7 +18,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318787614
@@ -112,7 +116,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318770289
@@ -135,7 +140,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318830507
@@ -161,7 +167,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318811107
@@ -281,7 +288,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318768144
@@ -313,7 +321,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318778156
@@ -342,7 +351,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   implementation_id: 285217164
@@ -366,7 +376,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318801752
@@ -407,7 +418,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318800047
@@ -430,7 +442,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   size: 1
@@ -458,7 +471,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318827144
@@ -940,6 +954,7 @@
   preamble {
     id: 67146229
     name: "packet_in"
+    alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
   }
   metadata {
@@ -957,6 +972,7 @@
   preamble {
     id: 67121543
     name: "packet_out"
+    alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 39b7f71..e5a54ce 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -15,24 +15,37 @@
         ["spgw_ingress_hasReturned", 1, false],
         ["egress_next_tmp", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["fabric_metadata_t.eth_type", 16, 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.clone_to_cpu", 1, false],
-        ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_sport", 16, false],
-        ["fabric_metadata_t.l4_dport", 16, false],
-        ["_padding_2", 4, false]
+        ["fabric_metadata_t._eth_type0", 16, false],
+        ["fabric_metadata_t._ip_eth_type1", 16, false],
+        ["fabric_metadata_t._vlan_id2", 12, false],
+        ["fabric_metadata_t._vlan_pri3", 3, false],
+        ["fabric_metadata_t._vlan_cfi4", 1, false],
+        ["fabric_metadata_t._mpls_label5", 20, false],
+        ["fabric_metadata_t._mpls_ttl6", 8, false],
+        ["fabric_metadata_t._skip_forwarding7", 1, false],
+        ["fabric_metadata_t._skip_next8", 1, false],
+        ["fabric_metadata_t._fwd_type9", 3, false],
+        ["fabric_metadata_t._next_id10", 32, false],
+        ["fabric_metadata_t._is_multicast11", 1, false],
+        ["fabric_metadata_t._is_controller_packet_out12", 1, false],
+        ["fabric_metadata_t._clone_to_cpu13", 1, false],
+        ["fabric_metadata_t._ip_proto14", 8, false],
+        ["fabric_metadata_t._l4_sport15", 16, false],
+        ["fabric_metadata_t._l4_dport16", 16, false],
+        ["fabric_metadata_t._spgw_direction17", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
+        ["fabric_metadata_t._spgw_teid19", 32, false],
+        ["fabric_metadata_t._spgw_s1u_enb_addr20", 32, false],
+        ["fabric_metadata_t._spgw_s1u_sgw_addr21", 32, false],
+        ["fabric_metadata_t._int_meta_source22", 1, false],
+        ["fabric_metadata_t._int_meta_transit23", 1, false],
+        ["fabric_metadata_t._int_meta_sink24", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id25", 32, false],
+        ["fabric_metadata_t._int_meta_new_words26", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes27", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp28", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp29", 32, false],
+        ["_padding_0", 7, false]
       ]
     },
     {
@@ -278,33 +291,6 @@
         ["padding", 2, false],
         ["dscp", 6, false]
       ]
-    },
-    {
-      "name" : "spgw_meta_t",
-      "id" : 23,
-      "fields" : [
-        ["direction", 2, false],
-        ["ipv4_len", 16, false],
-        ["teid", 32, false],
-        ["s1u_enb_addr", 32, false],
-        ["s1u_sgw_addr", 32, false],
-        ["_padding_0", 6, false]
-      ]
-    },
-    {
-      "name" : "int_metadata_t",
-      "id" : 24,
-      "fields" : [
-        ["source", 1, 0],
-        ["transit", 1, 0],
-        ["sink", 1, 0],
-        ["switch_id", 32, false],
-        ["new_words", 8, false],
-        ["new_bytes", 16, false],
-        ["ig_tstamp", 32, false],
-        ["eg_tstamp", 32, false],
-        ["_padding_1", 5, false]
-      ]
     }
   ],
   "headers" : [
@@ -503,20 +489,6 @@
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.spgw",
-      "id" : 28,
-      "header_type" : "spgw_meta_t",
-      "metadata" : true,
-      "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.int_meta",
-      "id" : 29,
-      "header_type" : "int_metadata_t",
-      "metadata" : true,
-      "pi_omit" : true
     }
   ],
   "header_stacks" : [],
@@ -603,7 +575,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._eth_type0"]
                 },
                 {
                   "type" : "field",
@@ -616,7 +588,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                  "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
                 },
                 {
                   "type" : "hexstr",
@@ -761,7 +733,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
                 },
                 {
                   "type" : "field",
@@ -774,7 +746,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
                 },
                 {
                   "type" : "field",
@@ -834,7 +806,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
                 },
                 {
                   "type" : "field",
@@ -847,7 +819,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
                 },
                 {
                   "type" : "hexstr",
@@ -919,7 +891,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -932,7 +904,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -968,7 +940,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -981,7 +953,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1190,7 +1162,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -1203,7 +1175,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1860,7 +1832,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "teid"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             },
             {
               "type" : "runtime_data",
@@ -1870,8 +1842,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 63,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.teid = teid"
+            "column" : 30,
+            "source_fragment" : "= teid; ..."
           }
         },
         {
@@ -1879,7 +1851,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -1889,8 +1861,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 64,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr"
+            "column" : 38,
+            "source_fragment" : "= s1u_enb_addr; ..."
           }
         },
         {
@@ -1898,7 +1870,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
             },
             {
               "type" : "runtime_data",
@@ -1908,8 +1880,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 65,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr"
+            "column" : 38,
+            "source_fragment" : "= s1u_sgw_addr; ..."
           }
         }
       ]
@@ -1924,7 +1896,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "source"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
             },
             {
               "type" : "expression",
@@ -1944,8 +1916,8 @@
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 42,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.int_meta.source = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1960,7 +1932,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
             },
             {
               "type" : "expression",
@@ -1980,8 +1952,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 36,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -1989,7 +1961,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2009,8 +1981,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 37,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2036,7 +2008,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -2046,8 +2018,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 47,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -2067,7 +2039,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
             },
             {
               "type" : "runtime_data",
@@ -2077,8 +2049,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 82,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
+            "column" : 33,
+            "source_fragment" : "= fwd_type; ..."
           }
         }
       ]
@@ -2098,7 +2070,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2108,8 +2080,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2129,7 +2101,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "hexstr",
@@ -2139,8 +2111,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 62,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = 0"
+            "column" : 35,
+            "source_fragment" : "= 0; ..."
           }
         },
         {
@@ -2148,7 +2120,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2158,8 +2130,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2179,7 +2151,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2189,8 +2161,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2216,7 +2188,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2226,8 +2198,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 33,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2261,7 +2233,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2281,8 +2253,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 40,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2297,7 +2269,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
             },
             {
               "type" : "expression",
@@ -2317,8 +2289,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.clone_to_cpu = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2343,7 +2315,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2363,8 +2335,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 52,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2390,7 +2362,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -2400,8 +2372,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 70,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -2452,7 +2424,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2462,8 +2434,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2603,7 +2575,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "runtime_data",
@@ -2613,8 +2585,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+            "column" : 35,
+            "source_fragment" : "= label; ..."
           }
         },
         {
@@ -2710,7 +2682,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+              "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
             },
             {
               "type" : "expression",
@@ -2730,8 +2702,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 209,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.is_multicast = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2988,7 +2960,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
             },
             {
               "type" : "expression",
@@ -3008,8 +2980,8 @@
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 27,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
+            "column" : 53,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -3024,7 +2996,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
@@ -3034,8 +3006,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 103,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
           }
         },
         {
@@ -3043,7 +3015,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "field",
@@ -3053,8 +3025,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 104,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+            "column" : 36,
+            "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
         },
         {
@@ -3062,7 +3034,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             },
             {
               "type" : "field",
@@ -3072,8 +3044,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 105,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
         },
         {
@@ -3081,7 +3053,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             },
             {
               "type" : "field",
@@ -3091,8 +3063,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 106,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
         }
       ]
@@ -3107,7 +3079,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             },
             {
               "type" : "hexstr",
@@ -3117,8 +3089,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 113,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+            "column" : 37,
+            "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
         }
       ]
@@ -3210,7 +3182,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3296,7 +3268,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3322,7 +3294,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3407,7 +3379,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             },
             {
               "type" : "field",
@@ -3417,8 +3389,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 174,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.ipv4_len = ipv4.total_len"
+            "column" : 34,
+            "source_fragment" : "= ipv4.total_len; ..."
           }
         }
       ]
@@ -3811,14 +3783,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 202,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr"
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr; ..."
           }
         },
         {
@@ -3830,14 +3802,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 203,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr"
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr; ..."
           }
         },
         {
@@ -3931,7 +3903,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.spgw", "ipv4_len"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4130,14 +4102,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 221,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len"
+            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
           }
         },
         {
@@ -4149,14 +4121,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "teid"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 222,
             "column" : 8,
-            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid"
+            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
           }
         }
       ]
@@ -4522,14 +4494,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport; ..."
           }
         },
         {
@@ -4671,7 +4643,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "transit"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
             },
             {
               "type" : "expression",
@@ -4691,8 +4663,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 26,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.transit = true"
+            "column" : 31,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -4700,7 +4672,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             },
             {
               "type" : "runtime_data",
@@ -4710,8 +4682,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 31,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.switch_id = switch_id"
+            "column" : 33,
+            "source_fragment" : "= switch_id; ..."
           }
         }
       ]
@@ -4798,7 +4770,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -4812,7 +4784,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4831,8 +4803,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -4840,7 +4812,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -4854,7 +4826,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4873,8 +4845,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -4923,7 +4895,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -4937,7 +4909,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4956,8 +4928,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -4965,7 +4937,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -4979,7 +4951,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4998,8 +4970,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -5114,7 +5086,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5128,7 +5100,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5147,8 +5119,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -5156,7 +5128,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5170,7 +5142,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5189,8 +5161,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5284,7 +5256,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5298,7 +5270,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5317,8 +5289,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -5326,7 +5298,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5340,7 +5312,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5359,8 +5331,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -5520,7 +5492,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5534,7 +5506,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5553,8 +5525,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -5562,7 +5534,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5576,7 +5548,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5595,8 +5567,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5724,7 +5696,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5738,7 +5710,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5757,8 +5729,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -5766,7 +5738,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5780,7 +5752,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5799,8 +5771,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5994,7 +5966,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6008,7 +5980,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6027,8 +5999,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -6036,7 +6008,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6050,7 +6022,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6069,8 +6041,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -6104,14 +6076,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6119,7 +6091,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6133,7 +6105,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6152,8 +6124,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6161,7 +6133,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6175,7 +6147,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6194,8 +6166,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6295,14 +6267,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6310,7 +6282,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6324,7 +6296,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6343,8 +6315,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6352,7 +6324,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6366,7 +6338,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6385,8 +6357,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6454,14 +6426,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6469,7 +6441,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6483,7 +6455,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6502,8 +6474,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6511,7 +6483,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6525,7 +6497,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6544,8 +6516,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6679,14 +6651,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6694,7 +6666,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6708,7 +6680,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6727,8 +6699,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -6736,7 +6708,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6750,7 +6722,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6769,8 +6741,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -6883,14 +6855,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6898,7 +6870,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6912,7 +6884,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6931,8 +6903,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6940,7 +6912,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6954,7 +6926,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6973,8 +6945,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7153,14 +7125,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7168,7 +7140,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7182,7 +7154,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7201,8 +7173,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7210,7 +7182,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7224,7 +7196,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7243,8 +7215,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -7391,14 +7363,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7406,7 +7378,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7420,7 +7392,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7439,8 +7411,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7448,7 +7420,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7462,7 +7434,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7481,8 +7453,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -7695,14 +7667,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "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"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7710,7 +7682,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7724,7 +7696,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7743,8 +7715,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -7752,7 +7724,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7766,7 +7738,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7785,8 +7757,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -7841,7 +7813,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7855,7 +7827,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7874,8 +7846,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -7883,7 +7855,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7897,7 +7869,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7916,8 +7888,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -7985,7 +7957,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7999,7 +7971,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8018,8 +7990,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8027,7 +7999,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8041,7 +8013,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8060,8 +8032,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -8163,7 +8135,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8177,7 +8149,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8196,8 +8168,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -8205,7 +8177,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8219,7 +8191,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8238,8 +8210,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8311,7 +8283,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8325,7 +8297,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8344,8 +8316,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8353,7 +8325,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8367,7 +8339,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8386,8 +8358,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -8493,7 +8465,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8507,7 +8479,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8526,8 +8498,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -8535,7 +8507,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8549,7 +8521,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8568,8 +8540,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8694,7 +8666,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8708,7 +8680,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8727,8 +8699,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -8736,7 +8708,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8750,7 +8722,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8769,8 +8741,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8929,7 +8901,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8943,7 +8915,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8962,8 +8934,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8971,7 +8943,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8985,7 +8957,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9004,8 +8976,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -9054,7 +9026,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9068,7 +9040,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9087,8 +9059,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -9096,7 +9068,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9110,7 +9082,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9129,8 +9101,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -9213,7 +9185,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9227,7 +9199,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9246,8 +9218,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9255,7 +9227,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9269,7 +9241,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9288,8 +9260,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -9391,7 +9363,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9405,7 +9377,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9424,8 +9396,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9433,7 +9405,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9447,7 +9419,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9466,8 +9438,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -9603,7 +9575,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9617,7 +9589,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9636,8 +9608,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -9645,7 +9617,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9659,7 +9631,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9678,8 +9650,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -9785,7 +9757,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9799,7 +9771,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9818,8 +9790,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9827,7 +9799,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9841,7 +9813,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9860,8 +9832,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -10001,7 +9973,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10015,7 +9987,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10034,8 +10006,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10043,7 +10015,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10057,7 +10029,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10076,8 +10048,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -10236,7 +10208,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10250,7 +10222,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10269,8 +10241,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10278,7 +10250,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10292,7 +10264,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10311,8 +10283,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -10505,7 +10477,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10519,7 +10491,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10538,8 +10510,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -10547,7 +10519,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10561,7 +10533,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10580,8 +10552,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -10611,18 +10583,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 248,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+            "column" : 33,
+            "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
           }
         }
       ]
@@ -10656,14 +10628,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 254,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
         },
         {
@@ -10713,14 +10685,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 257,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
         },
         {
@@ -10728,7 +10700,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -10773,14 +10745,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 266,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
         },
         {
@@ -10792,14 +10764,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 267,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
         },
         {
@@ -10811,14 +10783,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 268,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -10830,14 +10802,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 269,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
           }
         },
         {
@@ -10875,14 +10847,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 280,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -11263,7 +11235,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       }
                     }
                   },
@@ -11361,7 +11333,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       }
                     }
                   },
@@ -11410,7 +11382,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       }
                     }
                   },
@@ -11703,7 +11675,7 @@
             {
               "match_type" : "exact",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             }
           ],
@@ -12066,7 +12038,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -12109,7 +12081,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
+              "target" : ["scalars", "fabric_metadata_t._mpls_label5"],
               "mask" : null
             }
           ],
@@ -12190,19 +12162,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t.ip_proto"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             },
             {
@@ -12226,7 +12198,7 @@
             {
               "match_type" : "ternary",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             },
             {
@@ -12296,7 +12268,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -12334,7 +12306,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -12368,7 +12340,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -12405,7 +12377,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -12537,15 +12509,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
               }
             ]
           }
@@ -12819,7 +12791,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
                   }
                 }
               },
@@ -12847,7 +12819,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -12873,7 +12845,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -12899,7 +12871,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -12930,7 +12902,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_next8"]
                   }
                 }
               },
@@ -13136,7 +13108,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -13375,13 +13347,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             }
           ],
@@ -14319,7 +14291,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
                   }
                 }
               },
@@ -14382,7 +14354,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -14403,7 +14375,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
                       }
                     }
                   },
@@ -14442,7 +14414,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -14486,7 +14458,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14565,7 +14537,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14689,7 +14661,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["userMetadata.spgw", "direction"]
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14800,7 +14772,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "source"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
                   }
                 }
               },
@@ -14856,7 +14828,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "transit"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
                   }
                 }
               },
@@ -14978,6 +14950,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -15002,6 +14976,8 @@
       "target" : ["gtpu_ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_0",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -15026,6 +15002,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_1",
+      "verify" : true,
+      "update" : false,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -15092,4 +15070,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index cd3d23d..b069b52 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+  arch: "v1model"
+}
 tables {
   preamble {
     id: 33582731
@@ -15,7 +18,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318781522
@@ -56,7 +60,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318787614
@@ -153,7 +158,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318770289
@@ -176,7 +182,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318830507
@@ -202,7 +209,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318811107
@@ -322,7 +330,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318768144
@@ -354,7 +363,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318778156
@@ -383,7 +393,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   implementation_id: 285217164
@@ -407,7 +418,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318801752
@@ -448,7 +460,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318800047
@@ -471,7 +484,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   size: 1
@@ -499,7 +513,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318827144
@@ -1014,6 +1029,7 @@
   preamble {
     id: 67146229
     name: "packet_in"
+    alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
   }
   metadata {
@@ -1031,6 +1047,7 @@
   preamble {
     id: 67121543
     name: "packet_out"
+    alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index 795c067..f0a6139 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -13,24 +13,29 @@
         ["spgw_normalizer_hasReturned", 1, false],
         ["spgw_ingress_hasReturned", 1, false],
         ["egress_next_tmp", 1, false],
-        ["fabric_metadata_t.eth_type", 16, 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.clone_to_cpu", 1, false],
-        ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_sport", 16, false],
-        ["fabric_metadata_t.l4_dport", 16, false],
-        ["_padding_1", 3, false]
+        ["fabric_metadata_t._eth_type0", 16, false],
+        ["fabric_metadata_t._ip_eth_type1", 16, false],
+        ["fabric_metadata_t._vlan_id2", 12, false],
+        ["fabric_metadata_t._vlan_pri3", 3, false],
+        ["fabric_metadata_t._vlan_cfi4", 1, false],
+        ["fabric_metadata_t._mpls_label5", 20, false],
+        ["fabric_metadata_t._mpls_ttl6", 8, false],
+        ["fabric_metadata_t._skip_forwarding7", 1, false],
+        ["fabric_metadata_t._skip_next8", 1, false],
+        ["fabric_metadata_t._fwd_type9", 3, false],
+        ["fabric_metadata_t._next_id10", 32, false],
+        ["fabric_metadata_t._is_multicast11", 1, false],
+        ["fabric_metadata_t._is_controller_packet_out12", 1, false],
+        ["fabric_metadata_t._clone_to_cpu13", 1, false],
+        ["fabric_metadata_t._ip_proto14", 8, false],
+        ["fabric_metadata_t._l4_sport15", 16, false],
+        ["fabric_metadata_t._l4_dport16", 16, false],
+        ["fabric_metadata_t._spgw_direction17", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
+        ["fabric_metadata_t._spgw_teid19", 32, false],
+        ["fabric_metadata_t._spgw_s1u_enb_addr20", 32, false],
+        ["fabric_metadata_t._spgw_s1u_sgw_addr21", 32, false],
+        ["_padding_0", 1, false]
       ]
     },
     {
@@ -178,18 +183,6 @@
         ["ingress_port", 9, false],
         ["_pad", 7, false]
       ]
-    },
-    {
-      "name" : "spgw_meta_t",
-      "id" : 12,
-      "fields" : [
-        ["direction", 2, false],
-        ["ipv4_len", 16, false],
-        ["teid", 32, false],
-        ["s1u_enb_addr", 32, false],
-        ["s1u_sgw_addr", 32, false],
-        ["_padding_0", 6, false]
-      ]
     }
   ],
   "headers" : [
@@ -311,13 +304,6 @@
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.spgw",
-      "id" : 17,
-      "header_type" : "spgw_meta_t",
-      "metadata" : true,
-      "pi_omit" : true
     }
   ],
   "header_stacks" : [],
@@ -404,7 +390,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._eth_type0"]
                 },
                 {
                   "type" : "field",
@@ -417,7 +403,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                  "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
                 },
                 {
                   "type" : "hexstr",
@@ -562,7 +548,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
                 },
                 {
                   "type" : "field",
@@ -575,7 +561,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
                 },
                 {
                   "type" : "field",
@@ -635,7 +621,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
                 },
                 {
                   "type" : "field",
@@ -648,7 +634,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
                 },
                 {
                   "type" : "hexstr",
@@ -707,7 +693,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -720,7 +706,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -756,7 +742,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -769,7 +755,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -965,7 +951,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -978,7 +964,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1502,7 +1488,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "teid"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             },
             {
               "type" : "runtime_data",
@@ -1512,8 +1498,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 63,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.teid = teid"
+            "column" : 30,
+            "source_fragment" : "= teid; ..."
           }
         },
         {
@@ -1521,7 +1507,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -1531,8 +1517,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 64,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr"
+            "column" : 38,
+            "source_fragment" : "= s1u_enb_addr; ..."
           }
         },
         {
@@ -1540,7 +1526,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
             },
             {
               "type" : "runtime_data",
@@ -1550,8 +1536,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 65,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr"
+            "column" : 38,
+            "source_fragment" : "= s1u_sgw_addr; ..."
           }
         }
       ]
@@ -1566,7 +1552,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
             },
             {
               "type" : "expression",
@@ -1586,8 +1572,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 36,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -1595,7 +1581,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1615,8 +1601,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 37,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1642,7 +1628,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -1652,8 +1638,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 47,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -1673,7 +1659,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
             },
             {
               "type" : "runtime_data",
@@ -1683,8 +1669,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 82,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
+            "column" : 33,
+            "source_fragment" : "= fwd_type; ..."
           }
         }
       ]
@@ -1704,7 +1690,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1714,8 +1700,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1735,7 +1721,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "hexstr",
@@ -1745,8 +1731,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 62,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = 0"
+            "column" : 35,
+            "source_fragment" : "= 0; ..."
           }
         },
         {
@@ -1754,7 +1740,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1764,8 +1750,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1785,7 +1771,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1795,8 +1781,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1822,7 +1808,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -1832,8 +1818,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 33,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -1867,7 +1853,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1887,8 +1873,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 40,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1903,7 +1889,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
             },
             {
               "type" : "expression",
@@ -1923,8 +1909,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.clone_to_cpu = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1949,7 +1935,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -1969,8 +1955,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 52,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -1996,7 +1982,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -2006,8 +1992,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 70,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -2058,7 +2044,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2068,8 +2054,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2209,7 +2195,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "runtime_data",
@@ -2219,8 +2205,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+            "column" : 35,
+            "source_fragment" : "= label; ..."
           }
         },
         {
@@ -2316,7 +2302,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+              "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
             },
             {
               "type" : "expression",
@@ -2336,8 +2322,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 209,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.is_multicast = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2594,7 +2580,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
             },
             {
               "type" : "expression",
@@ -2614,8 +2600,8 @@
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 27,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
+            "column" : 53,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2630,7 +2616,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
@@ -2640,8 +2626,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 103,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
           }
         },
         {
@@ -2649,7 +2635,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "field",
@@ -2659,8 +2645,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 104,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+            "column" : 36,
+            "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
         },
         {
@@ -2668,7 +2654,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             },
             {
               "type" : "field",
@@ -2678,8 +2664,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 105,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
         },
         {
@@ -2687,7 +2673,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             },
             {
               "type" : "field",
@@ -2697,8 +2683,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 106,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
         }
       ]
@@ -2713,7 +2699,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             },
             {
               "type" : "hexstr",
@@ -2723,8 +2709,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 113,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+            "column" : 37,
+            "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
         }
       ]
@@ -2816,7 +2802,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -2902,7 +2888,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -2928,7 +2914,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3013,7 +2999,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             },
             {
               "type" : "field",
@@ -3023,8 +3009,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 174,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.ipv4_len = ipv4.total_len"
+            "column" : 34,
+            "source_fragment" : "= ipv4.total_len; ..."
           }
         }
       ]
@@ -3393,14 +3379,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 202,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr"
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr; ..."
           }
         },
         {
@@ -3412,14 +3398,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 203,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr"
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr; ..."
           }
         },
         {
@@ -3513,7 +3499,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.spgw", "ipv4_len"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3712,14 +3698,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 221,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len"
+            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
           }
         },
         {
@@ -3731,14 +3717,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "teid"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 222,
             "column" : 8,
-            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid"
+            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
           }
         }
       ]
@@ -3768,18 +3754,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 248,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+            "column" : 33,
+            "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
           }
         }
       ]
@@ -3813,14 +3799,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 254,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
         },
         {
@@ -3870,14 +3856,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 257,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
         },
         {
@@ -3885,7 +3871,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -3930,14 +3916,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 266,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
         },
         {
@@ -3949,14 +3935,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 267,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
         },
         {
@@ -3968,14 +3954,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 268,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -3987,14 +3973,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 269,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
           }
         },
         {
@@ -4032,14 +4018,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 280,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -4598,7 +4584,7 @@
             {
               "match_type" : "exact",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             }
           ],
@@ -4961,7 +4947,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -5004,7 +4990,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
+              "target" : ["scalars", "fabric_metadata_t._mpls_label5"],
               "mask" : null
             }
           ],
@@ -5085,19 +5071,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t.ip_proto"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             },
             {
@@ -5121,7 +5107,7 @@
             {
               "match_type" : "ternary",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             },
             {
@@ -5191,7 +5177,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -5229,7 +5215,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -5263,7 +5249,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -5300,7 +5286,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -5395,15 +5381,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
               }
             ]
           }
@@ -5677,7 +5663,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
                   }
                 }
               },
@@ -5705,7 +5691,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -5731,7 +5717,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -5757,7 +5743,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -5788,7 +5774,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_next8"]
                   }
                 }
               },
@@ -5994,7 +5980,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -6231,7 +6217,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
                   }
                 }
               },
@@ -6294,7 +6280,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -6315,7 +6301,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
                       }
                     }
                   },
@@ -6354,7 +6340,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -6398,7 +6384,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -6477,7 +6463,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -6601,7 +6587,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["userMetadata.spgw", "direction"]
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -6628,6 +6614,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -6652,6 +6640,8 @@
       "target" : ["gtpu_ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_0",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -6676,6 +6666,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_1",
+      "verify" : true,
+      "update" : false,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -6742,4 +6734,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index a0fe167..c76efb0 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+  arch: "v1model"
+}
 tables {
   preamble {
     id: 33582731
@@ -15,7 +18,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318781522
@@ -130,7 +134,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318770289
@@ -153,7 +158,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318830507
@@ -179,7 +185,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318811107
@@ -299,7 +306,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318768144
@@ -331,7 +339,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318778156
@@ -360,7 +369,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   implementation_id: 285217164
@@ -384,7 +394,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318801752
@@ -413,7 +424,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318827144
@@ -853,6 +865,7 @@
   preamble {
     id: 67146229
     name: "packet_in"
+    alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
   }
   metadata {
@@ -870,6 +883,7 @@
   preamble {
     id: 67121543
     name: "packet_out"
+    alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 7a82d6b..f52d3b4 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -4397,6 +4397,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -4421,6 +4423,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_0",
+      "verify" : true,
+      "update" : false,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -4487,4 +4491,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index b91f305..d8ce747 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -1,3 +1,6 @@
+pkg_info {
+  arch: "v1model"
+}
 tables {
   preamble {
     id: 33611649
@@ -89,7 +92,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318770289
@@ -112,7 +116,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318830507
@@ -138,7 +143,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318811107
@@ -258,7 +264,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318768144
@@ -290,7 +297,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318778156
@@ -319,7 +327,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   implementation_id: 285217164
@@ -343,7 +352,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318801752
@@ -372,7 +382,8 @@
   }
   action_refs {
     id: 16819938
-    annotations: "@defaultonly()"
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318827144
@@ -779,6 +790,7 @@
   preamble {
     id: 67146229
     name: "packet_in"
+    alias: "packet_in"
     annotations: "@controller_header(\"packet_in\")"
   }
   metadata {
@@ -796,6 +808,7 @@
   preamble {
     id: 67121543
     name: "packet_out"
+    alias: "packet_out"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {