diff --git a/benchmarks/README.md b/benchmarks/README.md
index 25cbf09a..484eabf5 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -41,6 +41,23 @@ queens5x5/fc               1867    179227518621      1023295666
 -->
 
 <!--
+v1.1.0
+
+    ┍━ benchmarks/clausify/benchmark ━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    │ PASS [mem:  53769377, cpu:  16198154564] bench_clausify_f1
+    │ PASS [mem:  67108683, cpu:  20169891270] bench_clausify_f2
+    │ PASS [mem: 179606857, cpu:  53923018831] bench_clausify_f3
+    │ PASS [mem: 231444137, cpu:  70014384566] bench_clausify_f4
+    │ PASS [mem: 874286879, cpu: 262421671684] bench_clausify_f5
+    ┕━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 5 tests | 5 passed | 0 failed
+
+    ┍━ benchmarks/knights/benchmark ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    │ PASS [mem: 172246681, cpu:  57037226471] bench_knights_100_4x4
+    │ PASS [mem: 321690197, cpu: 137399466410] bench_knights_100_6x6
+    │ PASS [mem: 601026745, cpu: 281418742606] bench_knights_100_8x8
+    ┕━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3 tests | 3 passed | 0 failed
+
+
 v1.0.29-alpha & v1.0.28-alpha
 
     ┍━ benchmarks/clausify/benchmark ━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -128,26 +145,26 @@ V1.0.20-alpha, v1.0.19-alpha & v1.0.18-alpha
 
 ### CPU
 
-| Benchmark         | `v1.0.29`    | vs `v1.0.25` | vs `v1.0.23` | vs `v1.0.21` | vs `v1.0.18` |
+| Benchmark         | `v1.1.0`     | vs `v1.0.29` | vs `v1.0.25` | vs `v1.0.23` | vs `v1.0.21` |
 | ---               | ---:         | ---:         | ---:         | ---:         | ---:         |
-| `clausify_f1`     | 21594809455  | -6.26%       | +11.71%      | +11.71%      | +11.84%      |
-| `clausify_f2`     | 26864755594  | -6.07%       | +11.30%      | +11.30%      | +11.44%      |
-| `clausify_f3`     | 71814854199  | -5.98%       | +11.17%      | +11.17%      | +11.31%      |
-| `clausify_f4`     | 93024749730  | -5.01%       | +9.37%       | +9.37%       | +9.55%       |
-| `clausify_f5`     | 349894049008 | -6.00%       | +11.24%      | +11.24%      | +11.35%      |
-| `knights_100_4x4` | 71851995726  | +1.40%       | +4.45%       | +4.30%       | +4.80%       |
-| `knights_100_6x6` | 159767368294 | +8.93%       | +11.92%      | +11.85%      | +12.70%      |
-| `knights_100_8x8` | 319834775948 | +11.40%      | +14.35%      | +14.32%      | +15.13%      |
+| `clausify_f1`     | 16198154564  | -24.99%      | -6.26%       | +11.71%      | +11.71%      |
+| `clausify_f2`     | 20169891270  | -24.92%      | -6.07%       | +11.30%      | +11.30%      |
+| `clausify_f3`     | 53923018831  | -24.91%      | -5.98%       | +11.17%      | +11.17%      |
+| `clausify_f4`     | 70014384566  | -24.74%      | -5.01%       | +9.37%       | +9.37%       |
+| `clausify_f5`     | 262421671684 | -25.00%      | -6.00%       | +11.24%      | +11.24%      |
+| `knights_100_4x4` | 57037226471  | -20.62%      | +1.40%       | +4.45%       | +4.30%       |
+| `knights_100_6x6` | 137399466410 | -14.00%      | +8.93%       | +11.92%      | +11.85%      |
+| `knights_100_8x8` | 281418742606 | -12.00%      | +11.40%      | +14.35%      | +14.32%      |
 
 ### Mem
 
-| Benchmark         | `v1.0.29` | vs `v1.0.25` | vs `v1.0.23` | vs `v1.0.21` | vs `v1.0.18` |
+| Benchmark         | `v1.1.0`  | vs `v1.0.29` | vs `v1.0.25` | vs `v1.0.23` | vs `v1.0.21` |
 | ---               | ---:      | ---:         | ---:         | ---:         | ---:         |
-| `clausify_f1`     | 53769377  | -2.29%       | +20.40%      | +20.40%      | +20.63%      |
-| `clausify_f2`     | 67108683  | -2.54%       | +19.63%      | +19.63%      | +19.87%      |
-| `clausify_f3`     | 179606857 | -2.64%       | +19.38%      | +19.38%      | +19.61%      |
-| `clausify_f4`     | 231444137 | -2.75%       | +16.33%      | +16.33%      | +16.64%      |
-| `clausify_f5`     | 874286879 | -2.63%       | +19.53%      | +19.53%      | +19.72%      |
-| `knights_100_4x4` | 172256715 | -0.48%       | +5.04%       | +4.90%       | +5.80%       |
-| `knights_100_6x6` | 321712271 | +10.08%      | +16.54%      | +16.46%      | +18.29%      |
-| `knights_100_8x8` | 601065675 | +14.48%      | +21.30%      | +21.26%      | +23.15%      |
+| `clausify_f1`     | 53769377  | ± 0.00%      | -2.29%       | +20.40%      | +20.40%      |
+| `clausify_f2`     | 67108683  | ± 0.00%      | -2.54%       | +19.63%      | +19.63%      |
+| `clausify_f3`     | 179606857 | ± 0.00%      | -2.64%       | +19.38%      | +19.38%      |
+| `clausify_f4`     | 231444137 | ± 0.00%      | -2.75%       | +16.33%      | +16.33%      |
+| `clausify_f5`     | 874286879 | ± 0.00%      | -2.63%       | +19.53%      | +19.53%      |
+| `knights_100_4x4` | 172246681 | -0.01%       | -0.48%       | +5.04%       | +4.90%       |
+| `knights_100_6x6` | 321690197 | -0.01%       | +10.08%      | +16.54%      | +16.46%      |
+| `knights_100_8x8` | 601026745 | -0.01%       | +14.48%      | +21.30%      | +21.26%      |
diff --git a/benchmarks/aiken.lock b/benchmarks/aiken.lock
index 62f2265a..8985dcdb 100644
--- a/benchmarks/aiken.lock
+++ b/benchmarks/aiken.lock
@@ -3,13 +3,14 @@
 
 [[requirements]]
 name = "aiken-lang/stdlib"
-version = "1.9.0"
+version = "main"
 source = "github"
 
 [[packages]]
 name = "aiken-lang/stdlib"
-version = "1.9.0"
+version = "main"
 requirements = []
 source = "github"
 
 [etags]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1725022066, nanos_since_epoch = 34627000 }, "21da5761ffd088c964cb038888826da8a6ea1d8c26f6f4e8a1dc6e97a64fe3f7"]
diff --git a/benchmarks/lib/benchmarks/clausify/benchmark.ak b/benchmarks/lib/benchmarks/clausify/benchmark.ak
index 4ffd36c5..bf99a357 100644
--- a/benchmarks/lib/benchmarks/clausify/benchmark.ak
+++ b/benchmarks/lib/benchmarks/clausify/benchmark.ak
@@ -1,5 +1,5 @@
-use aiken/int
-use aiken/list
+use aiken/collection/list
+use aiken/primitive/int
 
 // ------------------------------------------------------------------ Benchmarks
 
diff --git a/benchmarks/lib/benchmarks/knights/benchmark.ak b/benchmarks/lib/benchmarks/knights/benchmark.ak
index 15bea26e..b66d6859 100644
--- a/benchmarks/lib/benchmarks/knights/benchmark.ak
+++ b/benchmarks/lib/benchmarks/knights/benchmark.ak
@@ -1,4 +1,4 @@
-use aiken/list
+use aiken/collection/list
 use benchmarks/knights/heuristic.{descendants, start_tour, tour_finished}
 use benchmarks/knights/queue.{Queue}
 use benchmarks/knights/types.{ChessSet, Solution}
@@ -10,11 +10,11 @@ test bench_knights_100_4x4() {
 }
 
 test bench_knights_100_6x6() {
-  run_knights(100, 6) == solution_100_6x6()
+  run_knights(100, 6) == solution_100_6x6
 }
 
 test bench_knights_100_8x8() {
-  run_knights(100, 8) == solution_100_8x8()
+  run_knights(100, 8) == solution_100_8x8
 }
 
 // ----------------------------------------------------------------------- Setup
@@ -30,7 +30,7 @@ fn depth_search(
   done: fn(a) -> Bool,
 ) -> Queue<a> {
   if depth == 0 || queue.is_empty(xs) {
-    queue.new()
+    queue.empty
   } else if done(queue.head(xs)) {
     depth_search(depth - 1, queue.remove_front(xs), grow, done)
       |> queue.append_front(queue.head(xs))
@@ -41,7 +41,7 @@ fn depth_search(
 }
 
 fn root(size: Int) -> Queue<(Int, ChessSet)> {
-  queue.append_all_front(queue.new(), mk_starts(size))
+  queue.append_all_front(queue.empty, mk_starts(size))
 }
 
 fn mk_starts(size: Int) -> List<(Int, ChessSet)> {
@@ -79,7 +79,7 @@ fn done(item: (Int, ChessSet)) -> Bool {
 
 // ------------------------------------------------------------------ Fixtures
 
-fn solution_100_6x6() -> Solution {
+const solution_100_6x6: Solution =
   [
     (
       0,
@@ -266,9 +266,9 @@ fn solution_100_6x6() -> Solution {
       },
     ),
   ]
-}
 
-fn solution_100_8x8() -> Solution {
+
+const solution_100_8x8: Solution =
   [
     (
       0,
@@ -493,4 +493,3 @@ fn solution_100_8x8() -> Solution {
       },
     ),
   ]
-}
diff --git a/benchmarks/lib/benchmarks/knights/chess_set.ak b/benchmarks/lib/benchmarks/knights/chess_set.ak
index 5639dacc..97fe35e3 100644
--- a/benchmarks/lib/benchmarks/knights/chess_set.ak
+++ b/benchmarks/lib/benchmarks/knights/chess_set.ak
@@ -1,4 +1,4 @@
-use aiken/list
+use aiken/collection/list
 use benchmarks/knights/types.{ChessSet, Tile}
 
 pub fn create_board(size: Int, init_square: Tile) -> ChessSet {
diff --git a/benchmarks/lib/benchmarks/knights/heuristic.ak b/benchmarks/lib/benchmarks/knights/heuristic.ak
index efcfb2b1..3a7a6c82 100644
--- a/benchmarks/lib/benchmarks/knights/heuristic.ak
+++ b/benchmarks/lib/benchmarks/knights/heuristic.ak
@@ -1,6 +1,6 @@
 use aiken/builtin
-use aiken/int
-use aiken/list
+use aiken/collection/list
+use aiken/primitive/int
 use benchmarks/knights/chess_set.{
   add_piece, create_board, delete_first, first_piece, is_square_free, last_piece,
 }
@@ -18,9 +18,8 @@ type Direction {
   RD
 }
 
-fn direction_list() {
+const direction_list =
   [UL, UR, DL, DR, LU, LD, RU, RD]
-}
 
 fn move(direction: Direction, tile: Tile) -> Tile {
   let (x, y) = tile
@@ -130,7 +129,7 @@ fn move_knight(board: ChessSet, direction: Direction) -> ChessSet {
 }
 
 fn possible_moves(board: ChessSet) -> List<Direction> {
-  direction_list() |> list.filter(can_move(board, _))
+  direction_list |> list.filter(can_move(board, _))
 }
 
 fn compare_chess_set(a: (Int, ChessSet), b: (Int, ChessSet)) -> Ordering {
diff --git a/benchmarks/lib/benchmarks/knights/queue.ak b/benchmarks/lib/benchmarks/knights/queue.ak
index 0abd9c76..b1769836 100644
--- a/benchmarks/lib/benchmarks/knights/queue.ak
+++ b/benchmarks/lib/benchmarks/knights/queue.ak
@@ -1,12 +1,10 @@
-use aiken/list
+use aiken/collection/list
 
 pub opaque type Queue<a> {
   inner: List<a>,
 }
 
-pub fn new() -> Queue<a> {
-  [] |> Queue
-}
+pub const empty: Queue<a> = [] |> Queue
 
 pub fn to_list(self: Queue<a>) -> List<a> {
   self.inner
diff --git a/benchmarks/lib/benchmarks/knights/sort.ak b/benchmarks/lib/benchmarks/knights/sort.ak
index 40a59c8f..2334de26 100644
--- a/benchmarks/lib/benchmarks/knights/sort.ak
+++ b/benchmarks/lib/benchmarks/knights/sort.ak
@@ -1,4 +1,4 @@
-use aiken/list
+use aiken/collection/list
 
 pub fn quicksort(xs: List<a>, compare: fn(a, a) -> Ordering) -> List<a> {
   when xs is {
diff --git a/examples/gift_card/aiken.lock b/examples/gift_card/aiken.lock
index 0ba1dc01..89d1a4d8 100644
--- a/examples/gift_card/aiken.lock
+++ b/examples/gift_card/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1724799279, nanos_since_epoch = 877917000 }, "cdbbce58b61deb385e7ea787a2e0fc2dc8fe94db9999e0e6275bc9c70e5796be"]
+"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1725021962, nanos_since_epoch = 944823000 }, "cdbbce58b61deb385e7ea787a2e0fc2dc8fe94db9999e0e6275bc9c70e5796be"]
diff --git a/examples/gift_card/plutus.json b/examples/gift_card/plutus.json
index 587f9a20..f9311d0a 100644
--- a/examples/gift_card/plutus.json
+++ b/examples/gift_card/plutus.json
@@ -3,10 +3,10 @@
     "title": "aiken-lang/gift_card",
     "description": "Create a gift card that can be used to redeem locked assets",
     "version": "0.0.0",
-    "plutusVersion": "v2",
+    "plutusVersion": "v3",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+9943c2c"
+      "version": "v1.1.0+9407b67"
     },
     "license": "Apache-2.0"
   },
@@ -33,8 +33,8 @@
           }
         }
       ],
-      "compiledCode": "59041b0100003232323232323232232253330043232323232323232325323233300f300100613232323232325333015300830163754002264a66602c6010602e6ea80044c94ccc05cc028c060dd5003099b8732325333019300b301a37540022900009bad301e301b375400264a666032601660346ea8004530103d87a8000132330010013756603e60386ea8008894ccc078004530103d87a8000132323232533301f337220100042a66603e66e3c0200084c050cc08cdd4000a5eb80530103d87a8000133006006003375a60400066eb8c078008c088008c080004cc030014008dd7180e180c9baa0064800458dd7180d980c1baa00116301a301737546034602e6ea8c068c06cc05cdd5180d180b9baa0011632330010013758603400644a6660320022980103d87a80001323253330183375e601c60346ea80080204c034cc0700092f5c0266008008002603a00460360026eacc060c064c064c064c064004c050dd5006980b180b801180a80098089baa0071533300f3002006132323253330123005001132533301600116132533333301b0011616161325333018301b0031500516375a0022c603000260286ea802c54ccc048c01000454ccc054c050dd50058a8010b0b18091baa00a1323232323232325333017300a3018375402026464a66603266002008466e3c0600044c8c8cc004004014894ccc07c004528899191919299981019804004919b8f00100315333020323300100100e22533302500114a0264a6660466464a66604a66ebcc0a8c0acc0ac008cdd2a4008660526ea401d2f5c0266ebcc06cc09cdd50008060a50302900130253754605000429444cc00c00c004c0a000454ccc080c0480044cc01801800c5280b0b1bad3021003375c603e0046046004604200266e9520023301d375201497ae014a044646600200200644a66603e00229404c94ccc074c010dd718110010a5113300300300130220013232333001001375a603c60366ea80492f5c0444a666036601c0042002266600600666e0000920013301f37526e50cdc58010020009bb3300d30193754603800c2646600200200444a66603800229444c94ccc068cdc39bad301c301f002480044cc00c00c004528180f80099299980b9804980c1baa00114bd6f7b63009bab301c30193754002660146eacc06c00801cdd6180d180d980d980d980d800980d180d0011bac3018001301830180023758602c00260246ea802cdd7180a18089baa00716370e90011b874800088c8cc00400400c894ccc04c004530103d87a800013232323253330143372200e0042a66602866e3c01c0084c024cc060dd3000a5eb80530103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dd2a40004602000260146ea8004c034c038008c030004c030008c028004c018dd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15744ae91",
-      "hash": "6c10e19fb5e6669d8b542369d650bcffe72bad1368f50b83b30fb78c"
+      "compiledCode": "59041b0101003232323232323232232253330043232323232323232325323233300f300100613232323232325333015300830163754002264a66602c6010602e6ea80044c94ccc05cc028c060dd5003099b8732325333019300b301a37540022900009bad301e301b375400264a666032601660346ea8004530103d87a8000132330010013756603e60386ea8008894ccc078004530103d87a8000132323232533301f337220100042a66603e66e3c0200084c050cc08cdd4000a5eb80530103d87a8000133006006003375a60400066eb8c078008c088008c080004cc030014008dd7180e180c9baa0064800458dd7180d980c1baa00116301a301737546034602e6ea8c068c06cc05cdd5180d180b9baa0011632330010013758603400644a6660320022980103d87a80001323253330183375e601c60346ea80080204c034cc0700092f5c0266008008002603a00460360026eacc060c064c064c064c064004c050dd5006980b180b801180a80098089baa0071533300f3002006132323253330123005001132533301600116132533333301b0011616161325333018301b0031500516375a0022c603000260286ea802c54ccc048c01000454ccc054c050dd50058a8010b0b18091baa00a1323232323232325333017300a3018375402026464a66603266002008466e3c0600044c8c8cc004004014894ccc07c004528899191919299981019804004919b8f00100315333020323300100100e22533302500114a0264a6660466464a66604a66ebcc0a8c0acc0ac008cdd2a4008660526ea401d2f5c0266ebcc06cc09cdd50008060a50302900130253754605000429444cc00c00c004c0a000454ccc080c0480044cc01801800c5280b0b1bad3021003375c603e0046046004604200266e9520023301d375201497ae014a044646600200200644a66603e00229404c94ccc074c010dd718110010a5113300300300130220013232333001001375a603c60366ea80492f5c0444a666036601c0042002266600600666e0000920013301f37526e50cdc58010020009bb3300d30193754603800c2646600200200444a66603800229444c94ccc068cdc39bad301c301f002480044cc00c00c004528180f80099299980b9804980c1baa00114bd6f7b63009bab301c30193754002660146eacc06c00801cdd6180d180d980d980d980d800980d180d0011bac3018001301830180023758602c00260246ea802cdd7180a18089baa00716370e90011b874800088c8cc00400400c894ccc04c004530103d87a800013232323253330143372200e0042a66602866e3c01c0084c024cc060dd3000a5eb80530103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dd2a40004602000260146ea8004c034c038008c030004c030008c028004c018dd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15744ae91",
+      "hash": "06ffde77d3c5775acc98a1a6a00e6bd9870f22261210ae61f77190dd"
     },
     {
       "title": "multi.redeem.mint",
@@ -52,8 +52,8 @@
           }
         }
       ],
-      "compiledCode": "59041b0100003232323232323232232253330043232323232323232325323233300f300100613232323232325333015300830163754002264a66602c6010602e6ea80044c94ccc05cc028c060dd5003099b8732325333019300b301a37540022900009bad301e301b375400264a666032601660346ea8004530103d87a8000132330010013756603e60386ea8008894ccc078004530103d87a8000132323232533301f337220100042a66603e66e3c0200084c050cc08cdd4000a5eb80530103d87a8000133006006003375a60400066eb8c078008c088008c080004cc030014008dd7180e180c9baa0064800458dd7180d980c1baa00116301a301737546034602e6ea8c068c06cc05cdd5180d180b9baa0011632330010013758603400644a6660320022980103d87a80001323253330183375e601c60346ea80080204c034cc0700092f5c0266008008002603a00460360026eacc060c064c064c064c064004c050dd5006980b180b801180a80098089baa0071533300f3002006132323253330123005001132533301600116132533333301b0011616161325333018301b0031500516375a0022c603000260286ea802c54ccc048c01000454ccc054c050dd50058a8010b0b18091baa00a1323232323232325333017300a3018375402026464a66603266002008466e3c0600044c8c8cc004004014894ccc07c004528899191919299981019804004919b8f00100315333020323300100100e22533302500114a0264a6660466464a66604a66ebcc0a8c0acc0ac008cdd2a4008660526ea401d2f5c0266ebcc06cc09cdd50008060a50302900130253754605000429444cc00c00c004c0a000454ccc080c0480044cc01801800c5280b0b1bad3021003375c603e0046046004604200266e9520023301d375201497ae014a044646600200200644a66603e00229404c94ccc074c010dd718110010a5113300300300130220013232333001001375a603c60366ea80492f5c0444a666036601c0042002266600600666e0000920013301f37526e50cdc58010020009bb3300d30193754603800c2646600200200444a66603800229444c94ccc068cdc39bad301c301f002480044cc00c00c004528180f80099299980b9804980c1baa00114bd6f7b63009bab301c30193754002660146eacc06c00801cdd6180d180d980d980d980d800980d180d0011bac3018001301830180023758602c00260246ea802cdd7180a18089baa00716370e90011b874800088c8cc00400400c894ccc04c004530103d87a800013232323253330143372200e0042a66602866e3c01c0084c024cc060dd3000a5eb80530103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dd2a40004602000260146ea8004c034c038008c030004c030008c028004c018dd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15744ae91",
-      "hash": "6c10e19fb5e6669d8b542369d650bcffe72bad1368f50b83b30fb78c"
+      "compiledCode": "59041b0101003232323232323232232253330043232323232323232325323233300f300100613232323232325333015300830163754002264a66602c6010602e6ea80044c94ccc05cc028c060dd5003099b8732325333019300b301a37540022900009bad301e301b375400264a666032601660346ea8004530103d87a8000132330010013756603e60386ea8008894ccc078004530103d87a8000132323232533301f337220100042a66603e66e3c0200084c050cc08cdd4000a5eb80530103d87a8000133006006003375a60400066eb8c078008c088008c080004cc030014008dd7180e180c9baa0064800458dd7180d980c1baa00116301a301737546034602e6ea8c068c06cc05cdd5180d180b9baa0011632330010013758603400644a6660320022980103d87a80001323253330183375e601c60346ea80080204c034cc0700092f5c0266008008002603a00460360026eacc060c064c064c064c064004c050dd5006980b180b801180a80098089baa0071533300f3002006132323253330123005001132533301600116132533333301b0011616161325333018301b0031500516375a0022c603000260286ea802c54ccc048c01000454ccc054c050dd50058a8010b0b18091baa00a1323232323232325333017300a3018375402026464a66603266002008466e3c0600044c8c8cc004004014894ccc07c004528899191919299981019804004919b8f00100315333020323300100100e22533302500114a0264a6660466464a66604a66ebcc0a8c0acc0ac008cdd2a4008660526ea401d2f5c0266ebcc06cc09cdd50008060a50302900130253754605000429444cc00c00c004c0a000454ccc080c0480044cc01801800c5280b0b1bad3021003375c603e0046046004604200266e9520023301d375201497ae014a044646600200200644a66603e00229404c94ccc074c010dd718110010a5113300300300130220013232333001001375a603c60366ea80492f5c0444a666036601c0042002266600600666e0000920013301f37526e50cdc58010020009bb3300d30193754603800c2646600200200444a66603800229444c94ccc068cdc39bad301c301f002480044cc00c00c004528180f80099299980b9804980c1baa00114bd6f7b63009bab301c30193754002660146eacc06c00801cdd6180d180d980d980d980d800980d180d0011bac3018001301830180023758602c00260246ea802cdd7180a18089baa00716370e90011b874800088c8cc00400400c894ccc04c004530103d87a800013232323253330143372200e0042a66602866e3c01c0084c024cc060dd3000a5eb80530103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dd2a40004602000260146ea8004c034c038008c030004c030008c028004c018dd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15744ae91",
+      "hash": "06ffde77d3c5775acc98a1a6a00e6bd9870f22261210ae61f77190dd"
     },
     {
       "title": "multi.redeem.else",
@@ -65,8 +65,8 @@
           }
         }
       ],
-      "compiledCode": "59041b0100003232323232323232232253330043232323232323232325323233300f300100613232323232325333015300830163754002264a66602c6010602e6ea80044c94ccc05cc028c060dd5003099b8732325333019300b301a37540022900009bad301e301b375400264a666032601660346ea8004530103d87a8000132330010013756603e60386ea8008894ccc078004530103d87a8000132323232533301f337220100042a66603e66e3c0200084c050cc08cdd4000a5eb80530103d87a8000133006006003375a60400066eb8c078008c088008c080004cc030014008dd7180e180c9baa0064800458dd7180d980c1baa00116301a301737546034602e6ea8c068c06cc05cdd5180d180b9baa0011632330010013758603400644a6660320022980103d87a80001323253330183375e601c60346ea80080204c034cc0700092f5c0266008008002603a00460360026eacc060c064c064c064c064004c050dd5006980b180b801180a80098089baa0071533300f3002006132323253330123005001132533301600116132533333301b0011616161325333018301b0031500516375a0022c603000260286ea802c54ccc048c01000454ccc054c050dd50058a8010b0b18091baa00a1323232323232325333017300a3018375402026464a66603266002008466e3c0600044c8c8cc004004014894ccc07c004528899191919299981019804004919b8f00100315333020323300100100e22533302500114a0264a6660466464a66604a66ebcc0a8c0acc0ac008cdd2a4008660526ea401d2f5c0266ebcc06cc09cdd50008060a50302900130253754605000429444cc00c00c004c0a000454ccc080c0480044cc01801800c5280b0b1bad3021003375c603e0046046004604200266e9520023301d375201497ae014a044646600200200644a66603e00229404c94ccc074c010dd718110010a5113300300300130220013232333001001375a603c60366ea80492f5c0444a666036601c0042002266600600666e0000920013301f37526e50cdc58010020009bb3300d30193754603800c2646600200200444a66603800229444c94ccc068cdc39bad301c301f002480044cc00c00c004528180f80099299980b9804980c1baa00114bd6f7b63009bab301c30193754002660146eacc06c00801cdd6180d180d980d980d980d800980d180d0011bac3018001301830180023758602c00260246ea802cdd7180a18089baa00716370e90011b874800088c8cc00400400c894ccc04c004530103d87a800013232323253330143372200e0042a66602866e3c01c0084c024cc060dd3000a5eb80530103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dd2a40004602000260146ea8004c034c038008c030004c030008c028004c018dd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15744ae91",
-      "hash": "6c10e19fb5e6669d8b542369d650bcffe72bad1368f50b83b30fb78c"
+      "compiledCode": "59041b0101003232323232323232232253330043232323232323232325323233300f300100613232323232325333015300830163754002264a66602c6010602e6ea80044c94ccc05cc028c060dd5003099b8732325333019300b301a37540022900009bad301e301b375400264a666032601660346ea8004530103d87a8000132330010013756603e60386ea8008894ccc078004530103d87a8000132323232533301f337220100042a66603e66e3c0200084c050cc08cdd4000a5eb80530103d87a8000133006006003375a60400066eb8c078008c088008c080004cc030014008dd7180e180c9baa0064800458dd7180d980c1baa00116301a301737546034602e6ea8c068c06cc05cdd5180d180b9baa0011632330010013758603400644a6660320022980103d87a80001323253330183375e601c60346ea80080204c034cc0700092f5c0266008008002603a00460360026eacc060c064c064c064c064004c050dd5006980b180b801180a80098089baa0071533300f3002006132323253330123005001132533301600116132533333301b0011616161325333018301b0031500516375a0022c603000260286ea802c54ccc048c01000454ccc054c050dd50058a8010b0b18091baa00a1323232323232325333017300a3018375402026464a66603266002008466e3c0600044c8c8cc004004014894ccc07c004528899191919299981019804004919b8f00100315333020323300100100e22533302500114a0264a6660466464a66604a66ebcc0a8c0acc0ac008cdd2a4008660526ea401d2f5c0266ebcc06cc09cdd50008060a50302900130253754605000429444cc00c00c004c0a000454ccc080c0480044cc01801800c5280b0b1bad3021003375c603e0046046004604200266e9520023301d375201497ae014a044646600200200644a66603e00229404c94ccc074c010dd718110010a5113300300300130220013232333001001375a603c60366ea80492f5c0444a666036601c0042002266600600666e0000920013301f37526e50cdc58010020009bb3300d30193754603800c2646600200200444a66603800229444c94ccc068cdc39bad301c301f002480044cc00c00c004528180f80099299980b9804980c1baa00114bd6f7b63009bab301c30193754002660146eacc06c00801cdd6180d180d980d980d980d800980d180d0011bac3018001301830180023758602c00260246ea802cdd7180a18089baa00716370e90011b874800088c8cc00400400c894ccc04c004530103d87a800013232323253330143372200e0042a66602866e3c01c0084c024cc060dd3000a5eb80530103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dd2a40004602000260146ea8004c034c038008c030004c030008c028004c018dd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15744ae91",
+      "hash": "06ffde77d3c5775acc98a1a6a00e6bd9870f22261210ae61f77190dd"
     },
     {
       "title": "oneshot.gift_card.spend",
@@ -96,8 +96,8 @@
           }
         }
       ],
-      "compiledCode": "5902750100003232323232323223222533300532323232323232323232532333010300500613232323232325333016300730173754002264a66602e601860306ea80044c8c94ccc070c07c0084c94ccc068cdc39bad301c002480044cdc780080c0a50375c60340022c603a002660160066eb8c070c064dd50008b1804980c1baa3009301837546036603860306ea8c06cc060dd50008b198039bac301a00223375e601260306ea8004014dd5980c980d180d180d180d000980a9baa00d3017301800230160013012375400e2a666020600200c2646464a66602660080022a66602c602a6ea802c540085854ccc04cc02000454ccc058c054dd50058a8010b0b18099baa00a1323232325333018301b00213232533301730083018375401e2a66602e601060306ea8cc0240148cdd79805980d1baa00101515333017300c00113371e00402a29405854ccc05ccdc3800a4002266e3c0080545281bad3018002375c602c0022c60320026600e6eacc060c064c064c064c06400800cdd6180b80098099baa00b375c602a60246ea801c58dc3a400044646600200200644a66602a0022980103d87a8000132325333014300500213374a90001980c00125eb804cc010010004c064008c05c0048c04c00488c94ccc03cc010c040dd50008a5eb7bdb1804dd5980a18089baa001323300100100322533301300114c103d87a800013232323253330143372200e0042a66602866e3c01c0084cdd2a4000660306e980052f5c02980103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dc3a400460166ea8004c038c03c008c034004c034008c02c004c01cdd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15745",
-      "hash": "d5ac4a4aa7f04745655feaec25f3570d715b577052f5cd94585e3e43"
+      "compiledCode": "5902750101003232323232323223222533300532323232323232323232532333010300500613232323232325333016300730173754002264a66602e601860306ea80044c8c94ccc070c07c0084c94ccc068cdc39bad301c002480044cdc780080c0a50375c60340022c603a002660160066eb8c070c064dd50008b1804980c1baa3009301837546036603860306ea8c06cc060dd50008b198039bac301a00223375e601260306ea8004014dd5980c980d180d180d180d000980a9baa00d3017301800230160013012375400e2a666020600200c2646464a66602660080022a66602c602a6ea802c540085854ccc04cc02000454ccc058c054dd50058a8010b0b18099baa00a1323232325333018301b00213232533301730083018375401e2a66602e601060306ea8cc0240148cdd79805980d1baa00101515333017300c00113371e00402a29405854ccc05ccdc3800a4002266e3c0080545281bad3018002375c602c0022c60320026600e6eacc060c064c064c064c06400800cdd6180b80098099baa00b375c602a60246ea801c58dc3a400044646600200200644a66602a0022980103d87a8000132325333014300500213374a90001980c00125eb804cc010010004c064008c05c0048c04c00488c94ccc03cc010c040dd50008a5eb7bdb1804dd5980a18089baa001323300100100322533301300114c103d87a800013232323253330143372200e0042a66602866e3c01c0084cdd2a4000660306e980052f5c02980103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dc3a400460166ea8004c038c03c008c034004c034008c02c004c01cdd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15745",
+      "hash": "e8498b6e37da9406494b7512fab69256e7c25204130909fae35822a2"
     },
     {
       "title": "oneshot.gift_card.mint",
@@ -121,8 +121,8 @@
           }
         }
       ],
-      "compiledCode": "5902750100003232323232323223222533300532323232323232323232532333010300500613232323232325333016300730173754002264a66602e601860306ea80044c8c94ccc070c07c0084c94ccc068cdc39bad301c002480044cdc780080c0a50375c60340022c603a002660160066eb8c070c064dd50008b1804980c1baa3009301837546036603860306ea8c06cc060dd50008b198039bac301a00223375e601260306ea8004014dd5980c980d180d180d180d000980a9baa00d3017301800230160013012375400e2a666020600200c2646464a66602660080022a66602c602a6ea802c540085854ccc04cc02000454ccc058c054dd50058a8010b0b18099baa00a1323232325333018301b00213232533301730083018375401e2a66602e601060306ea8cc0240148cdd79805980d1baa00101515333017300c00113371e00402a29405854ccc05ccdc3800a4002266e3c0080545281bad3018002375c602c0022c60320026600e6eacc060c064c064c064c06400800cdd6180b80098099baa00b375c602a60246ea801c58dc3a400044646600200200644a66602a0022980103d87a8000132325333014300500213374a90001980c00125eb804cc010010004c064008c05c0048c04c00488c94ccc03cc010c040dd50008a5eb7bdb1804dd5980a18089baa001323300100100322533301300114c103d87a800013232323253330143372200e0042a66602866e3c01c0084cdd2a4000660306e980052f5c02980103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dc3a400460166ea8004c038c03c008c034004c034008c02c004c01cdd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15745",
-      "hash": "d5ac4a4aa7f04745655feaec25f3570d715b577052f5cd94585e3e43"
+      "compiledCode": "5902750101003232323232323223222533300532323232323232323232532333010300500613232323232325333016300730173754002264a66602e601860306ea80044c8c94ccc070c07c0084c94ccc068cdc39bad301c002480044cdc780080c0a50375c60340022c603a002660160066eb8c070c064dd50008b1804980c1baa3009301837546036603860306ea8c06cc060dd50008b198039bac301a00223375e601260306ea8004014dd5980c980d180d180d180d000980a9baa00d3017301800230160013012375400e2a666020600200c2646464a66602660080022a66602c602a6ea802c540085854ccc04cc02000454ccc058c054dd50058a8010b0b18099baa00a1323232325333018301b00213232533301730083018375401e2a66602e601060306ea8cc0240148cdd79805980d1baa00101515333017300c00113371e00402a29405854ccc05ccdc3800a4002266e3c0080545281bad3018002375c602c0022c60320026600e6eacc060c064c064c064c06400800cdd6180b80098099baa00b375c602a60246ea801c58dc3a400044646600200200644a66602a0022980103d87a8000132325333014300500213374a90001980c00125eb804cc010010004c064008c05c0048c04c00488c94ccc03cc010c040dd50008a5eb7bdb1804dd5980a18089baa001323300100100322533301300114c103d87a800013232323253330143372200e0042a66602866e3c01c0084cdd2a4000660306e980052f5c02980103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dc3a400460166ea8004c038c03c008c034004c034008c02c004c01cdd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15745",
+      "hash": "e8498b6e37da9406494b7512fab69256e7c25204130909fae35822a2"
     },
     {
       "title": "oneshot.gift_card.else",
@@ -140,8 +140,8 @@
           }
         }
       ],
-      "compiledCode": "5902750100003232323232323223222533300532323232323232323232532333010300500613232323232325333016300730173754002264a66602e601860306ea80044c8c94ccc070c07c0084c94ccc068cdc39bad301c002480044cdc780080c0a50375c60340022c603a002660160066eb8c070c064dd50008b1804980c1baa3009301837546036603860306ea8c06cc060dd50008b198039bac301a00223375e601260306ea8004014dd5980c980d180d180d180d000980a9baa00d3017301800230160013012375400e2a666020600200c2646464a66602660080022a66602c602a6ea802c540085854ccc04cc02000454ccc058c054dd50058a8010b0b18099baa00a1323232325333018301b00213232533301730083018375401e2a66602e601060306ea8cc0240148cdd79805980d1baa00101515333017300c00113371e00402a29405854ccc05ccdc3800a4002266e3c0080545281bad3018002375c602c0022c60320026600e6eacc060c064c064c064c06400800cdd6180b80098099baa00b375c602a60246ea801c58dc3a400044646600200200644a66602a0022980103d87a8000132325333014300500213374a90001980c00125eb804cc010010004c064008c05c0048c04c00488c94ccc03cc010c040dd50008a5eb7bdb1804dd5980a18089baa001323300100100322533301300114c103d87a800013232323253330143372200e0042a66602866e3c01c0084cdd2a4000660306e980052f5c02980103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dc3a400460166ea8004c038c03c008c034004c034008c02c004c01cdd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15745",
-      "hash": "d5ac4a4aa7f04745655feaec25f3570d715b577052f5cd94585e3e43"
+      "compiledCode": "5902750101003232323232323223222533300532323232323232323232532333010300500613232323232325333016300730173754002264a66602e601860306ea80044c8c94ccc070c07c0084c94ccc068cdc39bad301c002480044cdc780080c0a50375c60340022c603a002660160066eb8c070c064dd50008b1804980c1baa3009301837546036603860306ea8c06cc060dd50008b198039bac301a00223375e601260306ea8004014dd5980c980d180d180d180d000980a9baa00d3017301800230160013012375400e2a666020600200c2646464a66602660080022a66602c602a6ea802c540085854ccc04cc02000454ccc058c054dd50058a8010b0b18099baa00a1323232325333018301b00213232533301730083018375401e2a66602e601060306ea8cc0240148cdd79805980d1baa00101515333017300c00113371e00402a29405854ccc05ccdc3800a4002266e3c0080545281bad3018002375c602c0022c60320026600e6eacc060c064c064c064c06400800cdd6180b80098099baa00b375c602a60246ea801c58dc3a400044646600200200644a66602a0022980103d87a8000132325333014300500213374a90001980c00125eb804cc010010004c064008c05c0048c04c00488c94ccc03cc010c040dd50008a5eb7bdb1804dd5980a18089baa001323300100100322533301300114c103d87a800013232323253330143372200e0042a66602866e3c01c0084cdd2a4000660306e980052f5c02980103d87a80001330060060033756602a0066eb8c04c008c05c008c054004dc3a400460166ea8004c038c03c008c034004c034008c02c004c01cdd50008a4c26cac6eb80055cd2ab9d5573caae7d5d02ba15745",
+      "hash": "e8498b6e37da9406494b7512fab69256e7c25204130909fae35822a2"
     }
   ],
   "definitions": {
diff --git a/examples/hello_world/aiken.lock b/examples/hello_world/aiken.lock
index 0ba30677..91d0b6a5 100644
--- a/examples/hello_world/aiken.lock
+++ b/examples/hello_world/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1724791501, nanos_since_epoch = 824761000 }, "cdbbce58b61deb385e7ea787a2e0fc2dc8fe94db9999e0e6275bc9c70e5796be"]
+"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1725021976, nanos_since_epoch = 403974000 }, "cdbbce58b61deb385e7ea787a2e0fc2dc8fe94db9999e0e6275bc9c70e5796be"]
diff --git a/examples/hello_world/plutus.json b/examples/hello_world/plutus.json
index 5b34eff4..6cd12610 100644
--- a/examples/hello_world/plutus.json
+++ b/examples/hello_world/plutus.json
@@ -3,10 +3,10 @@
     "title": "aiken-lang/hello_world",
     "description": "Aiken contracts for project 'aiken-lang/hello_world'",
     "version": "1.0.0",
-    "plutusVersion": "v2",
+    "plutusVersion": "v3",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.31-alpha+9943c2c"
+      "version": "v1.1.0+9407b67"
     }
   },
   "validators": [
@@ -24,13 +24,13 @@
           "$ref": "#/definitions/hello_world~1Redeemer"
         }
       },
-      "compiledCode": "59011d0100003232323232323225333002323232323253330073370e900118041baa0011323232533300a3370e900018059baa005132533300e0011613253333330120011616161613253330103012003132533300e3370e900018079baa005132533300f002100114a06644646600200200644a66602a00229404c94ccc04ccdc79bae301700200414a2266006006002602e0026eb0c048c04cc04cc04cc04cc04cc04cc04cc04cc040dd50059bae301230103754602460206ea801458cdc79bae3011300f375401091010d48656c6c6f2c20576f726c64210016375c002601e00260186ea801458c034c038008c030004c024dd50008b1805180580118048009804801180380098021baa00114984d9595cd2ab9d5573caae7d5d0aba25749",
-      "hash": "a03ed5b0e902c0ab66948c9529cdc8e637b5f0cccce60d2e94904581"
+      "compiledCode": "59011d0101003232323232323225333002323232323253330073370e900118041baa0011323232533300a3370e900018059baa005132533300e0011613253333330120011616161613253330103012003132533300e3370e900018079baa005132533300f002100114a06644646600200200644a66602a00229404c94ccc04ccdc79bae301700200414a2266006006002602e0026eb0c048c04cc04cc04cc04cc04cc04cc04cc04cc040dd50059bae301230103754602460206ea801458cdc79bae3011300f375401091010d48656c6c6f2c20576f726c64210016375c002601e00260186ea801458c034c038008c030004c024dd50008b1805180580118048009804801180380098021baa00114984d9595cd2ab9d5573caae7d5d0aba25749",
+      "hash": "167f56e1b5de377df88962340a0461158e68d4b6caaea9d27c9d71e5"
     },
     {
       "title": "hello_world.hello_world.else",
-      "compiledCode": "59011d0100003232323232323225333002323232323253330073370e900118041baa0011323232533300a3370e900018059baa005132533300e0011613253333330120011616161613253330103012003132533300e3370e900018079baa005132533300f002100114a06644646600200200644a66602a00229404c94ccc04ccdc79bae301700200414a2266006006002602e0026eb0c048c04cc04cc04cc04cc04cc04cc04cc04cc040dd50059bae301230103754602460206ea801458cdc79bae3011300f375401091010d48656c6c6f2c20576f726c64210016375c002601e00260186ea801458c034c038008c030004c024dd50008b1805180580118048009804801180380098021baa00114984d9595cd2ab9d5573caae7d5d0aba25749",
-      "hash": "a03ed5b0e902c0ab66948c9529cdc8e637b5f0cccce60d2e94904581"
+      "compiledCode": "59011d0101003232323232323225333002323232323253330073370e900118041baa0011323232533300a3370e900018059baa005132533300e0011613253333330120011616161613253330103012003132533300e3370e900018079baa005132533300f002100114a06644646600200200644a66602a00229404c94ccc04ccdc79bae301700200414a2266006006002602e0026eb0c048c04cc04cc04cc04cc04cc04cc04cc04cc040dd50059bae301230103754602460206ea801458cdc79bae3011300f375401091010d48656c6c6f2c20576f726c64210016375c002601e00260186ea801458c034c038008c030004c024dd50008b1805180580118048009804801180380098021baa00114984d9595cd2ab9d5573caae7d5d0aba25749",
+      "hash": "167f56e1b5de377df88962340a0461158e68d4b6caaea9d27c9d71e5"
     }
   ],
   "definitions": {