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 {