diff --git a/src/proto_alpha/lib_protocol/script_ir_unparser.ml b/src/proto_alpha/lib_protocol/script_ir_unparser.ml
index 2a911dd3b1f0c3c6738f035b5c737e3c6cc6391d..e7cad561e77d59339a1ec8c4db8603e994ccdd8d 100644
--- a/src/proto_alpha/lib_protocol/script_ir_unparser.ml
+++ b/src/proto_alpha/lib_protocol/script_ir_unparser.ml
@@ -2,6 +2,7 @@
 (*                                                                           *)
 (* Open Source License                                                       *)
 (* Copyright (c) 2022 Nomadic Labs <contact@nomadic-labs.com>                *)
+(* Copyright (c) 2024 Marigold, <contact@marigold.dev>                       *)
 (*                                                                           *)
 (* Permission is hereby granted, free of charge, to any person obtaining a   *)
 (* copy of this software and associated documentation files (the "Software"),*)
@@ -564,17 +565,33 @@ module Data_unparser (P : MICHELSON_PARSER) = struct
               items.elements
           in
           (Micheline.Seq (loc, List.rev items), ctxt)
-      | Ticket_t (t, _), {ticketer; contents; amount} ->
-          (* ideally we would like to allow a little overhead here because it is only used for unparsing *)
-          let*? t = P.opened_ticket_type loc t in
+      | Ticket_t (t, _), {ticketer; contents; amount} -> (
           let destination : Destination.t = Contract ticketer in
           let addr = {destination; entrypoint = Entrypoint.default} in
-          (unparse_data_rec [@tailcall])
-            ctxt
-            ~stack_depth
-            mode
-            t
-            (addr, (contents, (amount :> Script_int.n Script_int.num)))
+          let amount = (amount :> Script_int.n Script_int.num) in
+          match mode with
+          | Optimized_legacy ->
+              let*? t = P.opened_ticket_type loc t in
+              (unparse_data_rec [@tailcall])
+                ctxt
+                ~stack_depth
+                mode
+                t
+                (addr, (contents, amount))
+          | Optimized | Readable ->
+              let*? ticketer, ctxt = unparse_address ~loc ctxt mode addr in
+              let* contents, ctxt =
+                non_terminal_recursion ctxt mode t contents
+              in
+              let*? amount, ctxt = unparse_nat ~loc ctxt amount in
+              let*? contents_type, ctxt = unparse_ty ~loc ctxt t in
+              return
+                ( Prim
+                    ( loc,
+                      D_Ticket,
+                      [ticketer; contents_type; contents; amount],
+                      [] ),
+                  ctxt ))
       | Set_t (t, _), set ->
           let+ items, ctxt =
             List.fold_left_es
diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/test_ticket_balance.ml b/src/proto_alpha/lib_protocol/test/integration/michelson/test_ticket_balance.ml
index 5132a33a9b529d723834ca9852190d44b4dce2d6..96fbd59d2b56a5a6f5d46ab2905b7efd82792dbd 100644
--- a/src/proto_alpha/lib_protocol/test/integration/michelson/test_ticket_balance.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/michelson/test_ticket_balance.ml
@@ -2,6 +2,7 @@
 (*                                                                           *)
 (* Open Source License                                                       *)
 (* Copyright (c) 2022 Trili Tech, <contact@trili.tech>                       *)
+(* Copyright (c) 2024 Marigold, <contact@marigold.dev>                       *)
 (*                                                                           *)
 (* Permission is hereby granted, free of charge, to any person obtaining a   *)
 (* copy of this software and associated documentation files (the "Software"),*)
@@ -1660,12 +1661,12 @@ let test_storage_for_create_and_remove_tickets () =
   (* Add 1000 units of "A" tickets. *)
   let* block = add block 1000 "A" in
   (* After adding one block the new used and paid storage grows to accommodate
-     for the new ticket. The size is 141 + 40 (size of ticket) = 181. *)
+     for the new ticket. The size is 141 + 48 (size of ticket) = 189. *)
   let* () =
-    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 181
+    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 189
   in
   let* () =
-    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 181
+    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 189
   in
   (* The size of used and paid-for ticket storage is 67 bytes.  (65 for hash
      and 2 for amount). *)
@@ -1673,25 +1674,25 @@ let test_storage_for_create_and_remove_tickets () =
   let* () = assert_paid_ticket_storage ~loc:__LOC__ block 67 in
   (* Add 1000 units of "B" tickets. *)
   let* block = add block 1000 "B" in
-  (* The new used and paid for contract storage grow to 155 + 40 = 195. *)
+  (* The new used and paid for contract storage grow to 189 + 48 = 237. *)
   let* () =
-    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 221
+    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 237
   in
   let* () =
-    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 221
+    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 237
   in
   (* The new used and paid for ticket storage doubles (2 * 67 = 134). *)
   let* () = assert_used_ticket_storage ~loc:__LOC__ block 134 in
   let* () = assert_paid_ticket_storage ~loc:__LOC__ block 134 in
   (* Clear all tickets. *)
   let* block = clear block in
-  (* We're back to 115 base-line for the used contract storage and keep 195 for
+  (* We're back to 115 base-line for the used contract storage and keep 237 for
      paid. *)
   let* () =
     assert_used_contract_storage ~loc:__LOC__ block ticket_manager 141
   in
   let* () =
-    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 221
+    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 237
   in
   (* Since the ticket-table is empty it does not take up any space. However,
      we've already paid for 134 bytes. *)
@@ -1699,14 +1700,14 @@ let test_storage_for_create_and_remove_tickets () =
   let* () = assert_paid_ticket_storage ~loc:__LOC__ block 134 in
   (* Add one unit of "C" tickets. *)
   let* block = add block 1 "C" in
-  (* The new used storage is 141 + 39 (size of ticket) = 180. The size is 39
-      rather than 40 because it carries a smaller amount payload. *)
+  (* The new used storage is 141 + 47 (size of ticket) = 188. The size is 47
+      rather than 48 because it carries a smaller amount payload. *)
   let* () =
-    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 180
+    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 188
   in
-  (* We still have paid for 221 contract storage. *)
+  (* We still have paid for 237 contract storage. *)
   let* () =
-    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 221
+    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 237
   in
   (* There is one row in the ticket table with size 65 (for the hash) + 1
      (for the amount) = 65 bytes. *)
@@ -1715,13 +1716,13 @@ let test_storage_for_create_and_remove_tickets () =
   let* () = assert_paid_ticket_storage ~loc:__LOC__ block 134 in
   (* Add yet another "C" ticket. *)
   let* block = add block 1 "C" in
-  (* The new used storage is 180 + 39 (size of ticket) = 219. *)
+  (* The new used storage is 188 + 47 (size of ticket) = 235. *)
   let* () =
-    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 219
+    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 235
   in
-  (* We still have paid for 221 contract storage. *)
+  (* We still have paid for 237 contract storage. *)
   let* () =
-    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 221
+    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 237
   in
   (* There is still only one row in the ticket table with size 66. *)
   let* () = assert_used_ticket_storage ~loc:__LOC__ block 66 in
@@ -1729,26 +1730,26 @@ let test_storage_for_create_and_remove_tickets () =
   let* () = assert_paid_ticket_storage ~loc:__LOC__ block 134 in
   (* Add a "D" ticket. *)
   let* block = add block 1 "D" in
-  (* The new used storage is 219 + 39 (size of ticket) = 258. *)
+  (* The new used storage is 235 + 47 (size of ticket) = 282. *)
   let* () =
-    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 258
+    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 282
   in
-  (* The paid storage also increases to 258. *)
+  (* The paid storage also increases to 282. *)
   let* () =
-    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 258
+    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 282
   in
   (* There are now two rows in the ticket table: 2 x 66 = 132 *)
   let* () = assert_used_ticket_storage ~loc:__LOC__ block 132 in
   (* And we've still paid for 134 bytes. *)
   let* () = assert_paid_ticket_storage ~loc:__LOC__ block 134 in
   let* block = add block 1 "E" in
-  (* The new used storage is 258 + 39 (size of ticket) = 297. *)
+  (* The new used storage is 282 + 47 (size of ticket) = 297. *)
   let* () =
-    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 297
+    assert_used_contract_storage ~loc:__LOC__ block ticket_manager 329
   in
-  (* The paid storage also increases to 297. *)
+  (* The paid storage also increases to 329. *)
   let* () =
-    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 297
+    assert_paid_contract_storage ~loc:__LOC__ block ticket_manager 329
   in
   (* There are now three rows in the ticket table: 3 x 66 = 198. *)
   let* () = assert_used_ticket_storage ~loc:__LOC__ block 198 in
diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_join.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_join.out
index 9b2173a0c4f327ff0d387fc082863437f378cccd..4770d2a5ced8e24c4b3d84f44ed8eee3e06a7767 100644
--- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_join.out
+++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_join.out
@@ -1,42 +1,42 @@
 
 trace
   - UNPAIR (interp) @ location: 10
-    [ (Pair (Pair "[CONTRACT_HASH]" 17 3) None) ]
+    [ (Pair (Ticket "[CONTRACT_HASH]" nat 17 3) None) ]
   - UNPAIR (entry) @ location: 10
-    [ (Pair (Pair "[CONTRACT_HASH]" 17 3) None) ]
+    [ (Pair (Ticket "[CONTRACT_HASH]" nat 17 3) None) ]
     - log/SWAP (exit) @ location: 10
-      [ (Pair "[CONTRACT_HASH]" 17 3)
+      [ (Ticket "[CONTRACT_HASH]" nat 17 3)
         None ]
   - SWAP (entry) @ location: 11
-    [ (Pair "[CONTRACT_HASH]" 17 3)
+    [ (Ticket "[CONTRACT_HASH]" nat 17 3)
       None ]
     - log/IF_NONE (exit) @ location: 11
       [ None
-        (Pair "[CONTRACT_HASH]" 17 3) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 3) ]
   - IF_NONE (entry) @ location: 12
     [ None
-      (Pair "[CONTRACT_HASH]" 17 3) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 3) ]
     - log/[halt] (exit) @ location: 12
-      [ (Pair "[CONTRACT_HASH]" 17 3) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 3) ]
   - [halt] (entry) @ location: 24
-    [ (Pair "[CONTRACT_HASH]" 17 3) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 3) ]
     - control: KCons
     - log/SOME (exit) @ location: 12
-      [ (Pair "[CONTRACT_HASH]" 17 3) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 3) ]
   - SOME (entry) @ location: 24
-    [ (Pair "[CONTRACT_HASH]" 17 3) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 3) ]
     - log/NIL (exit) @ location: 24
-      [ (Some (Pair "[CONTRACT_HASH]" 17 3)) ]
+      [ (Some (Ticket "[CONTRACT_HASH]" nat 17 3)) ]
   - NIL (entry) @ location: 25
-    [ (Some (Pair "[CONTRACT_HASH]" 17 3)) ]
+    [ (Some (Ticket "[CONTRACT_HASH]" nat 17 3)) ]
     - log/PAIR (exit) @ location: 25
       [ {}
-        (Some (Pair "[CONTRACT_HASH]" 17 3)) ]
+        (Some (Ticket "[CONTRACT_HASH]" nat 17 3)) ]
   - PAIR (entry) @ location: 27
     [ {}
-      (Some (Pair "[CONTRACT_HASH]" 17 3)) ]
+      (Some (Ticket "[CONTRACT_HASH]" nat 17 3)) ]
     - log/[halt] (exit) @ location: 27
-      [ (Pair {} (Some (Pair "[CONTRACT_HASH]" 17 3))) ]
+      [ (Pair {} (Some (Ticket "[CONTRACT_HASH]" nat 17 3))) ]
   - [halt] (entry) @ location: 9
-    [ (Pair {} (Some (Pair "[CONTRACT_HASH]" 17 3))) ]
+    [ (Pair {} (Some (Ticket "[CONTRACT_HASH]" nat 17 3))) ]
     - control: KNil
diff --git a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out
index ae449fe91b48e6372c56fc00fb9a6dd8fc25b1d5..5e90aa81ca71b874b604a537785dc98e69dd7ada 100644
--- a/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out
+++ b/src/proto_alpha/lib_protocol/test/regression/expected/test_logging.ml/ticket_split.out
@@ -1,164 +1,164 @@
 
 trace
   - CAR (interp) @ location: 8
-    [ (Pair (Pair "[CONTRACT_HASH]" 17 3) Unit) ]
+    [ (Pair (Ticket "[CONTRACT_HASH]" nat 17 3) Unit) ]
   - CAR (entry) @ location: 8
-    [ (Pair (Pair "[CONTRACT_HASH]" 17 3) Unit) ]
+    [ (Pair (Ticket "[CONTRACT_HASH]" nat 17 3) Unit) ]
     - log/PUSH (exit) @ location: 8
-      [ (Pair "[CONTRACT_HASH]" 17 3) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 3) ]
   - PUSH (entry) @ location: 9
-    [ (Pair "[CONTRACT_HASH]" 17 3) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 3) ]
     - log/SWAP (exit) @ location: 9
       [ (Pair 1 2)
-        (Pair "[CONTRACT_HASH]" 17 3) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 3) ]
   - SWAP (entry) @ location: 16
     [ (Pair 1 2)
-      (Pair "[CONTRACT_HASH]" 17 3) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 3) ]
     - log/SPLIT_TICKET (exit) @ location: 16
-      [ (Pair "[CONTRACT_HASH]" 17 3)
+      [ (Ticket "[CONTRACT_HASH]" nat 17 3)
         (Pair 1 2) ]
   - SPLIT_TICKET (entry) @ location: 17
-    [ (Pair "[CONTRACT_HASH]" 17 3)
+    [ (Ticket "[CONTRACT_HASH]" nat 17 3)
       (Pair 1 2) ]
     - log/IF_NONE (exit) @ location: 17
-      [ (Some (Pair (Pair "[CONTRACT_HASH]" 17 1)
-                    (Pair "[CONTRACT_HASH]" 17 2))) ]
+      [ (Some (Pair (Ticket "[CONTRACT_HASH]" nat 17 1)
+                    (Ticket "[CONTRACT_HASH]" nat 17 2))) ]
   - IF_NONE (entry) @ location: 19
-    [ (Some (Pair (Pair "[CONTRACT_HASH]" 17 1)
-                  (Pair "[CONTRACT_HASH]" 17 2))) ]
+    [ (Some (Pair (Ticket "[CONTRACT_HASH]" nat 17 1)
+                  (Ticket "[CONTRACT_HASH]" nat 17 2))) ]
     - log/[halt] (exit) @ location: 19
-      [ (Pair (Pair "[CONTRACT_HASH]" 17 1)
-              (Pair "[CONTRACT_HASH]" 17 2)) ]
+      [ (Pair (Ticket "[CONTRACT_HASH]" nat 17 1)
+              (Ticket "[CONTRACT_HASH]" nat 17 2)) ]
   - [halt] (entry) @ location: 25
-    [ (Pair (Pair "[CONTRACT_HASH]" 17 1)
-            (Pair "[CONTRACT_HASH]" 17 2)) ]
+    [ (Pair (Ticket "[CONTRACT_HASH]" nat 17 1)
+            (Ticket "[CONTRACT_HASH]" nat 17 2)) ]
     - control: KCons
     - log/UNPAIR (exit) @ location: 19
-      [ (Pair (Pair "[CONTRACT_HASH]" 17 1)
-              (Pair "[CONTRACT_HASH]" 17 2)) ]
+      [ (Pair (Ticket "[CONTRACT_HASH]" nat 17 1)
+              (Ticket "[CONTRACT_HASH]" nat 17 2)) ]
   - UNPAIR (entry) @ location: 25
-    [ (Pair (Pair "[CONTRACT_HASH]" 17 1)
-            (Pair "[CONTRACT_HASH]" 17 2)) ]
+    [ (Pair (Ticket "[CONTRACT_HASH]" nat 17 1)
+            (Ticket "[CONTRACT_HASH]" nat 17 2)) ]
     - log/READ_TICKET (exit) @ location: 25
-      [ (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - READ_TICKET (entry) @ location: 26
-    [ (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/CDR (exit) @ location: 26
       [ (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - CDR (entry) @ location: 28
     [ (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/CDR (exit) @ location: 28
       [ (Pair 17 1)
-        (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - CDR (entry) @ location: 29
     [ (Pair 17 1)
-      (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/PUSH (exit) @ location: 29
       [ 1
-        (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - PUSH (entry) @ location: 30
     [ 1
-      (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/COMPARE (exit) @ location: 30
       [ 1
         1
-        (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - COMPARE (entry) @ location: 35
     [ 1
       1
-      (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/EQ (exit) @ location: 35
       [ 0
-        (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - EQ (entry) @ location: 36
     [ 0
-      (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/IF (exit) @ location: 36
       [ True
-        (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - IF (entry) @ location: 37
     [ True
-      (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/[halt] (exit) @ location: 37
-      [ (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - [halt] (entry) @ location: 43
-    [ (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - control: KCons
     - log/DROP (exit) @ location: 37
-      [ (Pair "[CONTRACT_HASH]" 17 1)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 1)
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - DROP (entry) @ location: 43
-    [ (Pair "[CONTRACT_HASH]" 17 1)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 1)
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/READ_TICKET (exit) @ location: 43
-      [ (Pair "[CONTRACT_HASH]" 17 2) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - READ_TICKET (entry) @ location: 44
-    [ (Pair "[CONTRACT_HASH]" 17 2) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/CDR (exit) @ location: 44
       [ (Pair "[CONTRACT_HASH]" 17 2)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - CDR (entry) @ location: 46
     [ (Pair "[CONTRACT_HASH]" 17 2)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/CDR (exit) @ location: 46
       [ (Pair 17 2)
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - CDR (entry) @ location: 47
     [ (Pair 17 2)
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/PUSH (exit) @ location: 47
       [ 2
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - PUSH (entry) @ location: 48
     [ 2
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/COMPARE (exit) @ location: 48
       [ 2
         2
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - COMPARE (entry) @ location: 53
     [ 2
       2
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/EQ (exit) @ location: 53
       [ 0
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - EQ (entry) @ location: 54
     [ 0
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/IF (exit) @ location: 54
       [ True
-        (Pair "[CONTRACT_HASH]" 17 2) ]
+        (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - IF (entry) @ location: 55
     [ True
-      (Pair "[CONTRACT_HASH]" 17 2) ]
+      (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/[halt] (exit) @ location: 55
-      [ (Pair "[CONTRACT_HASH]" 17 2) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - [halt] (entry) @ location: 61
-    [ (Pair "[CONTRACT_HASH]" 17 2) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - control: KCons
     - log/DROP (exit) @ location: 55
-      [ (Pair "[CONTRACT_HASH]" 17 2) ]
+      [ (Ticket "[CONTRACT_HASH]" nat 17 2) ]
   - DROP (entry) @ location: 61
-    [ (Pair "[CONTRACT_HASH]" 17 2) ]
+    [ (Ticket "[CONTRACT_HASH]" nat 17 2) ]
     - log/UNIT (exit) @ location: 61
       [  ]
   - UNIT (entry) @ location: 62
diff --git a/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out b/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out
index 3e1bc9c2e94a140bfca0ce7ec0cf1ffcdf15b63d..2cd873964cce4b11d1ffe7cde67aade4b2d72e5d 100644
--- a/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out	
+++ b/tezt/tests/expected/ticket_receipt_and_rpc.ml/Alpha- Ticket updates in receipt.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --arg '(Pair "[CONTRACT_HASH]" "[CONTRACT_HASH]")'
 Node is bootstrapped.
-Estimated gas: 7899.569 units (will add 100 for safety)
-Estimated storage: 475 bytes added (will add 20 for safety)
+Estimated gas: 7897.809 units (will add 100 for safety)
+Estimated storage: 515 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -14,8 +14,8 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.001138
     Expected counter: 1
-    Gas limit: 8000
-    Storage limit: 495 bytes
+    Gas limit: 7998
+    Storage limit: 535 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.001138
       payload fees(the block proposer) ....... +ꜩ0.001138
@@ -26,15 +26,15 @@ This sequence of operations was run:
       Parameter: (Pair "[CONTRACT_HASH]" "[CONTRACT_HASH]")
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "red" 1) ;
-          Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "green" 1) ;
-          Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "green" 1) }
-      Storage size: 525 bytes
-      Paid storage size diff: 325 bytes
-      Consumed gas: 3193.024
+        { Ticket 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 string "red" 1 ;
+          Ticket 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 string "green" 1 ;
+          Ticket 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 string "green" 1 }
+      Storage size: 549 bytes
+      Paid storage size diff: 349 bytes
+      Consumed gas: 3191.920
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ0.08125
-        storage fees ........................... +ꜩ0.08125
+        [PUBLIC_KEY_HASH] ... -ꜩ0.08725
+        storage fees ........................... +ꜩ0.08725
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
@@ -51,18 +51,18 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [CONTRACT_HASH]
-          Parameter: (Pair (Pair (Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "blue" 1))
-                                 (Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "blue" 1)))
+          Parameter: (Pair (Pair (Ticket 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 string "blue" 1)
+                                 (Ticket 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 string "blue" 1))
                            0x0192ce5ac8f542c49e64c7b6c73c445515ddc20f9400)
           This transaction was successfully applied
           Updated storage:
-            (Some (Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "blue" 1)))
-          Storage size: 169 bytes
-          Paid storage size diff: 108 bytes
-          Consumed gas: 2818.019
+            (Some (Ticket 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 string "blue" 1))
+          Storage size: 177 bytes
+          Paid storage size diff: 116 bytes
+          Consumed gas: 2817.571
           Balance updates:
-            [PUBLIC_KEY_HASH] ... -ꜩ0.027
-            storage fees ........................... +ꜩ0.027
+            [PUBLIC_KEY_HASH] ... -ꜩ0.029
+            storage fees ........................... +ꜩ0.029
           Ticket updates:
             Ticketer: [CONTRACT_HASH]
             Content type: string
@@ -73,16 +73,16 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [CONTRACT_HASH]
-          Parameter: (Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "blue" 1))
+          Parameter: (Ticket 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 string "blue" 1)
           This transaction was successfully applied
           Updated storage:
-            (Some (Pair 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 (Pair "blue" 1)))
-          Storage size: 88 bytes
-          Paid storage size diff: 42 bytes
-          Consumed gas: 1889.697
+            (Some (Ticket 0x01c97ff8e547ecb335bdf832511361d68e928c6ec300 string "blue" 1))
+          Storage size: 96 bytes
+          Paid storage size diff: 50 bytes
+          Consumed gas: 1889.489
           Balance updates:
-            [PUBLIC_KEY_HASH] ... -ꜩ0.0105
-            storage fees ........................... +ꜩ0.0105
+            [PUBLIC_KEY_HASH] ... -ꜩ0.0125
+            storage fees ........................... +ꜩ0.0125
           Ticket updates:
             Ticketer: [CONTRACT_HASH]
             Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out b/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out
index fb805354308b29ebc6f9e04e8f2a489584367dc3..502325f007545807a2e4d657fe68405ca41efdd8 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Create and remove tickets.out	
@@ -58,8 +58,8 @@ Contract memorized as add_clear_tickets.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "A"'
 Node is bootstrapped.
-Estimated gas: 1751.651 units (will add 100 for safety)
-Estimated storage: 105 bytes added (will add 20 for safety)
+Estimated gas: 1751.443 units (will add 100 for safety)
+Estimated storage: 113 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -69,13 +69,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000453
+    Fee to the baker: ꜩ0.000454
     Expected counter: 1
     Gas limit: 1852
-    Storage limit: 125 bytes
+    Storage limit: 133 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000453
-      payload fees(the block proposer) ....... +ꜩ0.000453
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000454
+      payload fees(the block proposer) ....... +ꜩ0.000454
     Transaction:
       Amount: ꜩ0
       From: [PUBLIC_KEY_HASH]
@@ -84,13 +84,13 @@ This sequence of operations was run:
       Parameter: (Pair 1 "A")
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "A" 1) }
-      Storage size: 180 bytes
-      Paid storage size diff: 105 bytes
-      Consumed gas: 1752.186
+        { Ticket 0x01435e1f410af86271d7c8c3c98a8708157a45269200 string "A" 1 }
+      Storage size: 188 bytes
+      Paid storage size diff: 113 bytes
+      Consumed gas: 1752.012
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ0.02625
-        storage fees ........................... +ꜩ0.02625
+        [PUBLIC_KEY_HASH] ... -ꜩ0.02825
+        storage fees ........................... +ꜩ0.02825
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
@@ -101,7 +101,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint clear --arg Unit
 Node is bootstrapped.
-Estimated gas: 1941.323 units (will add 100 for safety)
+Estimated gas: 1941.576 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -127,7 +127,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: {}
       Storage size: 141 bytes
-      Consumed gas: 1941.859
+      Consumed gas: 1942.112
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
@@ -138,7 +138,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "B"'
 Node is bootstrapped.
-Estimated gas: 1751.651 units (will add 100 for safety)
+Estimated gas: 1751.443 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -164,9 +164,9 @@ This sequence of operations was run:
       Parameter: (Pair 1 "B")
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "B" 1) }
-      Storage size: 180 bytes
-      Consumed gas: 1752.186
+        { Ticket 0x01435e1f410af86271d7c8c3c98a8708157a45269200 string "B" 1 }
+      Storage size: 188 bytes
+      Consumed gas: 1751.978
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
@@ -177,8 +177,8 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 2 --entrypoint add --arg 'Pair 1 "C"'
 Node is bootstrapped.
-Estimated gas: 2433.661 units (will add 100 for safety)
-Estimated storage: 105 bytes added (will add 20 for safety)
+Estimated gas: 2433.498 units (will add 100 for safety)
+Estimated storage: 113 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -188,13 +188,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000521
+    Fee to the baker: ꜩ0.000522
     Expected counter: 4
     Gas limit: 2534
-    Storage limit: 125 bytes
+    Storage limit: 133 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000521
-      payload fees(the block proposer) ....... +ꜩ0.000521
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000522
+      payload fees(the block proposer) ....... +ꜩ0.000522
     Transaction:
       Amount: ꜩ0
       From: [PUBLIC_KEY_HASH]
@@ -203,14 +203,14 @@ This sequence of operations was run:
       Parameter: (Pair 1 "C")
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "C" 1) ;
-          Pair 0x01435e1f410af86271d7c8c3c98a8708157a45269200 (Pair "B" 1) }
-      Storage size: 219 bytes
-      Paid storage size diff: 105 bytes
-      Consumed gas: 2434.196
+        { Ticket 0x01435e1f410af86271d7c8c3c98a8708157a45269200 string "C" 1 ;
+          Ticket 0x01435e1f410af86271d7c8c3c98a8708157a45269200 string "B" 1 }
+      Storage size: 235 bytes
+      Paid storage size diff: 113 bytes
+      Consumed gas: 2434.067
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ0.02625
-        storage fees ........................... +ꜩ0.02625
+        [PUBLIC_KEY_HASH] ... -ꜩ0.02825
+        storage fees ........................... +ꜩ0.02825
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out
index fbda5ce5a18b6e9e029f52dd849e19f02d2ceedf..8486ecaa12806c30877c630c51ca2c3a703fed12 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Overdrafting ticket from implicit accounts must be rejected.out	
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.650 units (will add 100 for safety)
+Estimated gas: 1858.410 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.787
+      Consumed gas: 1758.547
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -96,7 +96,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Consumed gas: 100.398
           Ticket updates:
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets (with complex parameters) from implicit account to orig.out b/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets (with complex parameters) from implicit account to orig.out
index 2f058a677b5e96f2b59e318340b11278147bb000..be3a373cdeab24ab6c092cb167b89b00fa9d777a 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets (with complex parameters) from implicit account to orig.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets (with complex parameters) from implicit account to orig.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint store --arg 'Pair 99 {Pair "garbage" (Ticket "[CONTRACT_HASH]" string "Ticket1" 1) ; Pair "garbage" (Ticket "[CONTRACT_HASH]" string "Ticket2" 2)}'
 Node is bootstrapped.
-Estimated gas: 4002.105 units (will add 100 for safety)
-Estimated storage: 222 bytes added (will add 20 for safety)
+Estimated gas: 4001.689 units (will add 100 for safety)
+Estimated storage: 238 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -14,8 +14,8 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000843
     Expected counter: 4
-    Gas limit: 4103
-    Storage limit: 242 bytes
+    Gas limit: 4102
+    Storage limit: 258 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000843
       payload fees(the block proposer) ....... +ꜩ0.000843
@@ -29,14 +29,14 @@ This sequence of operations was run:
                          Pair "garbage" (Ticket "[CONTRACT_HASH]" string "Ticket2" 2) })
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 (Pair "Ticket2" 2) ;
-          Pair 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 (Pair "Ticket1" 1) }
-      Storage size: 287 bytes
-      Paid storage size diff: 222 bytes
-      Consumed gas: 4002.072
+        { Ticket 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 string "Ticket2" 2 ;
+          Ticket 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 string "Ticket1" 1 }
+      Storage size: 303 bytes
+      Paid storage size diff: 238 bytes
+      Consumed gas: 4001.656
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ0.0555
-        storage fees ........................... +ꜩ0.0555
+        [PUBLIC_KEY_HASH] ... -ꜩ0.0595
+        storage fees ........................... +ꜩ0.0595
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets from implicit account to originated directly.out b/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets from implicit account to originated directly.out
index 389d746909821248ebed51a617d4d1f592040a16..9ded0d955dd70b630058ae3b4365f978821b70cb 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets from implicit account to originated directly.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send Pair tickets from implicit account to originated directly.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint save --arg 'Pair "[CONTRACT_HASH]" (Pair "Ticket" 1)'
 Node is bootstrapped.
-Estimated gas: 3081.619 units (will add 100 for safety)
-Estimated storage: 44 bytes added (will add 20 for safety)
+Estimated gas: 3081.411 units (will add 100 for safety)
+Estimated storage: 52 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -15,7 +15,7 @@ This sequence of operations was run:
     Fee to the baker: ꜩ0.000635
     Expected counter: 4
     Gas limit: 3182
-    Storage limit: 64 bytes
+    Storage limit: 72 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000635
       payload fees(the block proposer) ....... +ꜩ0.000635
@@ -27,13 +27,13 @@ This sequence of operations was run:
       Parameter: (Pair "[CONTRACT_HASH]" (Pair "Ticket" 1))
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x01fb08747351ab3652f772910c4565880d8df616f800 (Pair "Ticket" 1) }
-      Storage size: 238 bytes
-      Paid storage size diff: 44 bytes
-      Consumed gas: 3081.553
+        { Ticket 0x01fb08747351ab3652f772910c4565880d8df616f800 string "Ticket" 1 }
+      Storage size: 246 bytes
+      Paid storage size diff: 52 bytes
+      Consumed gas: 3081.345
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ0.011
-        storage fees ........................... +ꜩ0.011
+        [PUBLIC_KEY_HASH] ... -ꜩ0.013
+        storage fees ........................... +ꜩ0.013
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out
index 6b8e235c5ded092539f76afb3345197f3c5f1c23..923705a237eb4040f088b933f79f6935e4f16e7b 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets between originated contracts and implicit accounts.out	
@@ -163,7 +163,7 @@ Contract memorized as tickets_blackhole.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 3'
 Node is bootstrapped.
-Estimated gas: 1858.650 units (will add 100 for safety)
+Estimated gas: 1858.410 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -190,7 +190,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.787
+      Consumed gas: 1758.547
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -199,7 +199,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 3))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 3)
           This transaction was successfully applied
           Consumed gas: 100.398
           Ticket updates:
@@ -263,8 +263,8 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 1 tickets from bootstrap2 to '[CONTRACT_HASH]' with entrypoint save and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 3206.843 units (will add 100 for safety)
-Estimated storage: 110 bytes added (will add 20 for safety)
+Estimated gas: 3206.395 units (will add 100 for safety)
+Estimated storage: 118 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -277,7 +277,7 @@ This sequence of operations was run:
     Fee to the baker: ꜩ0.00063
     Expected counter: 1
     Gas limit: 3307
-    Storage limit: 130 bytes
+    Storage limit: 138 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.00063
       payload fees(the block proposer) ....... +ꜩ0.00063
@@ -297,7 +297,7 @@ This sequence of operations was run:
         Content: "Ticket"
         Account updates:
           [PUBLIC_KEY_HASH] ... -1
-      Consumed gas: 1296.552
+      Consumed gas: 1296.312
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -307,16 +307,16 @@ This sequence of operations was run:
           From: [PUBLIC_KEY_HASH]
           To: [CONTRACT_HASH]
           Entrypoint: save
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Updated storage:
-            { Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1) }
-          Storage size: 238 bytes
-          Paid storage size diff: 44 bytes
-          Consumed gas: 1910.859
+            { Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1 }
+          Storage size: 246 bytes
+          Paid storage size diff: 52 bytes
+          Consumed gas: 1910.651
           Balance updates:
-            [PUBLIC_KEY_HASH] ... -ꜩ0.011
-            storage fees ........................... +ꜩ0.011
+            [PUBLIC_KEY_HASH] ... -ꜩ0.013
+            storage fees ........................... +ꜩ0.013
           Ticket updates:
             Ticketer: [CONTRACT_HASH]
             Content type: string
@@ -333,7 +333,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 4716.890 units (will add 100 for safety)
+Estimated gas: 4716.903 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -360,7 +360,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: {}
       Storage size: 194 bytes
-      Consumed gas: 2864.303
+      Consumed gas: 2864.316
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
@@ -373,7 +373,7 @@ This sequence of operations was run:
           From: [CONTRACT_HASH]
           To: [CONTRACT_HASH]
           Entrypoint: ticket
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Updated storage: Unit
           Storage size: 51 bytes
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out
index ae7d4d6f731b952ff7454fc0ffa7f3a3b215e1ae..7cec27e2a650320f4fe85371ff0e7897e7e144dc 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with some Tez along.out	
@@ -61,7 +61,7 @@ Contract memorized as tickets_send_with_tez.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[PUBLIC_KEY_HASH]"'
 Node is bootstrapped.
-Estimated gas: 1857.132 units (will add 100 for safety)
+Estimated gas: 1856.892 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -74,7 +74,7 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.00049
     Expected counter: 2
-    Gas limit: 1958
+    Gas limit: 1957
     Storage limit: 86 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.00049
@@ -88,7 +88,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 154 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1757.270
+      Consumed gas: 1757.030
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -97,7 +97,7 @@ This sequence of operations was run:
           Amount: ꜩ0.000001
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x017c8454eff9ad796cd8baba365d2592ad1b60efb100 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x017c8454eff9ad796cd8baba365d2592ad1b60efb100 string "Ticket" 1)
           This transaction was successfully applied
           Consumed gas: 100.398
           Balance updates:
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out
index 5d919fc8d60f02746cab5b6cdf0e43ab9fa31fef..8bce47b091d50729215e5e2a7e1d6521d7c2a13a 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts with the wrong type must.out	
@@ -109,7 +109,7 @@ Contract memorized as tickets_list_blackhole.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 4063.855 units (will add 100 for safety)
+Estimated gas: 4063.615 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -136,7 +136,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 145 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 2211.251
+      Consumed gas: 2211.011
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -145,7 +145,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [CONTRACT_HASH]
-          Parameter: { Pair 0x011213b3979289bef70dc1d1a4fb7574f306bf7f2400 (Pair "Ticket" 1) }
+          Parameter: { Ticket 0x011213b3979289bef70dc1d1a4fb7574f306bf7f2400 string "Ticket" 1 }
           This transaction was successfully applied
           Updated storage: Unit
           Storage size: 42 bytes
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out
index 4c081c37cc6d3bb2a3ca8399830bbbc244c0a340..5813cffa968b86235c61b380cff71e659bbbb326 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets from contracts to implicit accounts.out	
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.650 units (will add 100 for safety)
+Estimated gas: 1858.410 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.787
+      Consumed gas: 1758.547
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -96,7 +96,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Consumed gas: 100.398
           Ticket updates:
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out
index 74ef597a6ef7d87af7dccdf7979454f7332d5864..83bc41409e10dc95cf1b0b2eb72551d9ee2ef311 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets in bigmap.out	
@@ -137,8 +137,8 @@ Contract memorized as send_tickets_in_big_map.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap2 to '[CONTRACT_HASH]' --burn-cap 30 --storage-limit 1000000 --arg '"[CONTRACT_HASH]"'
 Node is bootstrapped.
-Estimated gas: 98835.369 units (will add 100 for safety)
-Estimated storage: 10767 bytes added (will add 20 for safety)
+Estimated gas: 98994.469 units (will add 100 for safety)
+Estimated storage: 11567 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -148,13 +148,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.01019
+    Fee to the baker: ꜩ0.010206
     Expected counter: 1
-    Gas limit: 98936
-    Storage limit: 10787 bytes
+    Gas limit: 99095
+    Storage limit: 11587 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.01019
-      payload fees(the block proposer) ....... +ꜩ0.01019
+      [PUBLIC_KEY_HASH] ... -ꜩ0.010206
+      payload fees(the block proposer) ....... +ꜩ0.010206
     Transaction:
       Amount: ꜩ0
       From: [PUBLIC_KEY_HASH]
@@ -164,109 +164,109 @@ This sequence of operations was run:
       Updated storage: Unit
       Updated big_maps:
         New temp(1) of type (big_map int (ticket string))
-        Set temp(1)[22] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[48] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[20] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[67] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[30] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[33] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[42] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[13] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[50] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[84] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[44] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[41] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[4] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[73] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[5] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[28] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[19] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[9] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[86] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[76] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[8] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[97] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[80] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[45] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[87] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[1] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[26] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[38] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[65] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[99] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[69] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[2] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[81] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[82] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[64] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[92] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[90] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[98] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[37] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[66] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[32] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[71] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[51] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[56] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[14] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[12] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[85] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[47] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[74] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[18] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[10] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[35] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[96] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[27] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[77] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[62] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[58] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[25] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[94] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[60] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[7] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[53] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[11] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[17] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[83] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[72] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[6] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[88] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[75] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[3] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[70] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[52] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[95] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[68] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[78] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[23] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[79] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[59] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[100] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[24] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[21] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[49] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[93] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[39] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[63] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[55] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[15] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[16] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[31] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[43] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[29] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[54] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[89] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[36] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[46] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[91] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[61] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[34] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[57] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
-        Set temp(1)[40] to (Pair 0x010d30dc625f57274f300abc4af284934bc05fc46c00 (Pair "BLUE" 1))
+        Set temp(1)[22] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[48] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[20] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[67] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[30] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[33] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[42] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[13] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[50] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[84] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[44] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[41] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[4] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[73] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[5] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[28] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[19] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[9] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[86] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[76] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[8] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[97] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[80] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[45] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[87] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[1] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[26] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[38] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[65] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[99] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[69] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[2] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[81] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[82] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[64] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[92] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[90] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[98] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[37] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[66] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[32] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[71] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[51] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[56] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[14] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[12] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[85] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[47] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[74] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[18] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[10] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[35] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[96] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[27] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[77] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[62] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[58] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[25] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[94] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[60] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[7] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[53] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[11] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[17] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[83] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[72] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[6] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[88] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[75] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[3] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[70] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[52] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[95] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[68] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[78] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[23] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[79] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[59] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[100] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[24] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[21] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[49] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[93] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[39] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[63] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[55] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[15] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[16] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[31] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[43] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[29] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[54] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[89] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[36] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[46] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[91] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[61] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[34] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[57] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
+        Set temp(1)[40] to (Ticket 0x010d30dc625f57274f300abc4af284934bc05fc46c00 string "BLUE" 1)
       Storage size: 320 bytes
       Paid storage size diff: 67 bytes
-      Consumed gas: 49909.937
+      Consumed gas: 50082.437
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.01675
         storage fees ........................... +ꜩ0.01675
@@ -281,12 +281,12 @@ This sequence of operations was run:
           Updated big_maps:
             Clear map(4)
             Copy temp(1) to map(5)
-          Storage size: 10783 bytes
-          Paid storage size diff: 10700 bytes
-          Consumed gas: 48926.421
+          Storage size: 11583 bytes
+          Paid storage size diff: 11500 bytes
+          Consumed gas: 48913.021
           Balance updates:
-            [PUBLIC_KEY_HASH] ... -ꜩ2.675
-            storage fees ........................... +ꜩ2.675
+            [PUBLIC_KEY_HASH] ... -ꜩ2.875
+            storage fees ........................... +ꜩ2.875
           Ticket updates:
             Ticketer: [CONTRACT_HASH]
             Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor (with complex parameters) from impli.out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor (with complex parameters) from impli.out
index e26b3fd990682d6c9890320b95703cf56b0e3e9d..0104fd22eabac358eb495355207677e7b3217506 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor (with complex parameters) from impli.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor (with complex parameters) from impli.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint store --arg 'Pair 99 {Pair "garbage" (Pair "[CONTRACT_HASH]" (Pair "Ticket1" 1)) ; Pair "garbage" (Pair "[CONTRACT_HASH]" (Pair "Ticket2" 2))}'
 Node is bootstrapped.
-Estimated gas: 4001.421 units (will add 100 for safety)
-Estimated storage: 222 bytes added (will add 20 for safety)
+Estimated gas: 4001.005 units (will add 100 for safety)
+Estimated storage: 238 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -15,7 +15,7 @@ This sequence of operations was run:
     Fee to the baker: ꜩ0.000827
     Expected counter: 4
     Gas limit: 4102
-    Storage limit: 242 bytes
+    Storage limit: 258 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000827
       payload fees(the block proposer) ....... +ꜩ0.000827
@@ -29,14 +29,14 @@ This sequence of operations was run:
                          Pair "garbage" (Pair "[CONTRACT_HASH]" (Pair "Ticket2" 2)) })
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 (Pair "Ticket2" 2) ;
-          Pair 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 (Pair "Ticket1" 1) }
-      Storage size: 287 bytes
-      Paid storage size diff: 222 bytes
-      Consumed gas: 4001.388
+        { Ticket 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 string "Ticket2" 2 ;
+          Ticket 0x01b9ce1609aab1100170d2ea4f94e3407244090b1000 string "Ticket1" 1 }
+      Storage size: 303 bytes
+      Paid storage size diff: 238 bytes
+      Consumed gas: 4000.972
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ0.0555
-        storage fees ........................... +ꜩ0.0555
+        [PUBLIC_KEY_HASH] ... -ꜩ0.0595
+        storage fees ........................... +ꜩ0.0595
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor from implicit account to originated .out b/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor from implicit account to originated .out
index f228d2fbf1efa99679990fd69a22d312414d5e8f..d2e55e163aba902f23af3784116750877cdef015 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor from implicit account to originated .out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Send tickets with Ticket constructor from implicit account to originated .out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint save --arg 'Ticket "[CONTRACT_HASH]" string "Ticket" 1'
 Node is bootstrapped.
-Estimated gas: 3081.961 units (will add 100 for safety)
-Estimated storage: 44 bytes added (will add 20 for safety)
+Estimated gas: 3081.753 units (will add 100 for safety)
+Estimated storage: 52 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -15,7 +15,7 @@ This sequence of operations was run:
     Fee to the baker: ꜩ0.000643
     Expected counter: 4
     Gas limit: 3182
-    Storage limit: 64 bytes
+    Storage limit: 72 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000643
       payload fees(the block proposer) ....... +ꜩ0.000643
@@ -27,13 +27,13 @@ This sequence of operations was run:
       Parameter: (Ticket "[CONTRACT_HASH]" string "Ticket" 1)
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x01fb08747351ab3652f772910c4565880d8df616f800 (Pair "Ticket" 1) }
-      Storage size: 238 bytes
-      Paid storage size diff: 44 bytes
-      Consumed gas: 3081.895
+        { Ticket 0x01fb08747351ab3652f772910c4565880d8df616f800 string "Ticket" 1 }
+      Storage size: 246 bytes
+      Paid storage size diff: 52 bytes
+      Consumed gas: 3081.687
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ0.011
-        storage fees ........................... +ꜩ0.011
+        [PUBLIC_KEY_HASH] ... -ꜩ0.013
+        storage fees ........................... +ꜩ0.013
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out
index aeeee4d4a8761777fbefb208b283bd98312a683c..0010c2b15d1b1caebfcb002439cf3f68d89f9bfe 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket from contract storage to implicit accounts.out	
@@ -119,7 +119,7 @@ Contract memorized as tickets_bag_implicit.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.650 units (will add 100 for safety)
+Estimated gas: 1858.410 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -146,7 +146,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.787
+      Consumed gas: 1758.547
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -155,7 +155,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Consumed gas: 100.398
           Ticket updates:
@@ -171,8 +171,8 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 1 tickets from bootstrap1 to '[CONTRACT_HASH]' with entrypoint save and contents '"Ticket"' and type string and ticketer '[CONTRACT_HASH]' --burn-cap 1
 Node is bootstrapped.
-Estimated gas: 3176.332 units (will add 100 for safety)
-Estimated storage: 44 bytes added (will add 20 for safety)
+Estimated gas: 3175.884 units (will add 100 for safety)
+Estimated storage: 52 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -184,8 +184,8 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000626
     Expected counter: 4
-    Gas limit: 3277
-    Storage limit: 64 bytes
+    Gas limit: 3276
+    Storage limit: 72 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000626
       payload fees(the block proposer) ....... +ꜩ0.000626
@@ -204,23 +204,23 @@ This sequence of operations was run:
         Content: "Ticket"
         Account updates:
           [PUBLIC_KEY_HASH] ... -1
-      Consumed gas: 1266.515
+      Consumed gas: 1266.275
       Internal operations:
         Internal Transaction:
           Amount: ꜩ0
           From: [PUBLIC_KEY_HASH]
           To: [CONTRACT_HASH]
           Entrypoint: save
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Updated storage:
-            { Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1) }
-          Storage size: 227 bytes
-          Paid storage size diff: 44 bytes
-          Consumed gas: 1910.352
+            { Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1 }
+          Storage size: 235 bytes
+          Paid storage size diff: 52 bytes
+          Consumed gas: 1910.144
           Balance updates:
-            [PUBLIC_KEY_HASH] ... -ꜩ0.011
-            storage fees ........................... +ꜩ0.011
+            [PUBLIC_KEY_HASH] ... -ꜩ0.013
+            storage fees ........................... +ꜩ0.013
           Ticket updates:
             Ticketer: [CONTRACT_HASH]
             Content type: string
@@ -237,7 +237,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[PUBLIC_KEY_HASH]"'
 Node is bootstrapped.
-Estimated gas: 2511.210 units (will add 100 for safety)
+Estimated gas: 2511.223 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -264,7 +264,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: {}
       Storage size: 183 bytes
-      Consumed gas: 2411.347
+      Consumed gas: 2411.360
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
@@ -276,7 +276,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Consumed gas: 100.398
           Ticket updates:
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out
index 24c16086d26f5338a365078a2d1401ba977b1013..85786efa96d0ba35d79c4c589c9076189938d350 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending ticket of wrong type from implicit accounts must be rejected.out	
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.650 units (will add 100 for safety)
+Estimated gas: 1858.410 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.787
+      Consumed gas: 1758.547
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -96,7 +96,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Consumed gas: 100.398
           Ticket updates:
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out
index d916565f422a604dc631a1568dcfc892b11a1996..3f839163ca5f1cc322ebbca60f89d25512b8a6d4 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint mint
 Node is bootstrapped.
-Estimated gas: 2222.033 units (will add 100 for safety)
-Estimated storage: 221 bytes added (will add 20 for safety)
+Estimated gas: 2221.617 units (will add 100 for safety)
+Estimated storage: 237 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -14,8 +14,8 @@ This sequence of operations was run:
     From: [PUBLIC_KEY_HASH]
     Fee to the baker: ꜩ0.000494
     Expected counter: 3
-    Gas limit: 2323
-    Storage limit: 241 bytes
+    Gas limit: 2322
+    Storage limit: 257 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.000494
       payload fees(the block proposer) ....... +ꜩ0.000494
@@ -26,14 +26,14 @@ This sequence of operations was run:
       Entrypoint: mint
       This transaction was successfully applied
       Updated storage:
-        { Pair 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 (Pair "Ticket2" 1) ;
-          Pair 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 (Pair "Ticket" 1) }
-      Storage size: 309 bytes
-      Paid storage size diff: 221 bytes
-      Consumed gas: 2222
+        { Ticket 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 string "Ticket2" 1 ;
+          Ticket 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 string "Ticket" 1 }
+      Storage size: 325 bytes
+      Paid storage size diff: 237 bytes
+      Consumed gas: 2221.584
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ0.05525
-        storage fees ........................... +ꜩ0.05525
+        [PUBLIC_KEY_HASH] ... -ꜩ0.05925
+        storage fees ........................... +ꜩ0.05925
       Ticket updates:
         Ticketer: [CONTRACT_HASH]
         Content type: string
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out
index 68e808e16d820e9f70b26ef3a4f2e123be3779be..7cec55ba2c79abe3b64ae415c758598606d1fd59 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets to either implicit accounts or originated contracts accep.out	
@@ -104,7 +104,7 @@ Contract memorized as tickets_blackhole.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.650 units (will add 100 for safety)
+Estimated gas: 1858.410 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -131,7 +131,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.787
+      Consumed gas: 1758.547
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -140,7 +140,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Consumed gas: 100.398
           Ticket updates:
@@ -153,7 +153,7 @@ This sequence of operations was run:
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[CONTRACT_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 4063.823 units (will add 100 for safety)
+Estimated gas: 4063.583 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -180,7 +180,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 2211.236
+      Consumed gas: 2210.996
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -189,7 +189,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [CONTRACT_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Updated storage: Unit
           Storage size: 51 bytes
diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out b/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out
index ca58a93b53c632eff2c213cc9e40e7e6ef7332f1..21c90e982d4445252fc0cf2ca2aa32f7d00620bb 100644
--- a/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out	
+++ b/tezt/tests/expected/tickets.ml/Alpha- Sending zero ticket from implicit accounts must be rejected.out	
@@ -60,7 +60,7 @@ Contract memorized as tickets_send.
 
 ./octez-client --mode mockup --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg 'Pair "[PUBLIC_KEY_HASH]" 1'
 Node is bootstrapped.
-Estimated gas: 1858.650 units (will add 100 for safety)
+Estimated gas: 1858.410 units (will add 100 for safety)
 Estimated storage: 66 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
@@ -87,7 +87,7 @@ This sequence of operations was run:
       Updated storage: Unit
       Storage size: 158 bytes
       Paid storage size diff: 66 bytes
-      Consumed gas: 1758.787
+      Consumed gas: 1758.547
       Balance updates:
         [PUBLIC_KEY_HASH] ... -ꜩ0.0165
         storage fees ........................... +ꜩ0.0165
@@ -96,7 +96,7 @@ This sequence of operations was run:
           Amount: ꜩ0
           From: [CONTRACT_HASH]
           To: [PUBLIC_KEY_HASH]
-          Parameter: (Pair 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 (Pair "Ticket" 1))
+          Parameter: (Ticket 0x01fca241ad513615858a813a6019c5a5b3977c27dc00 string "Ticket" 1)
           This transaction was successfully applied
           Consumed gas: 100.398
           Ticket updates:
diff --git a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out
index e028e12b35ab22da1d93af2c321ead5da7d9ba40..6a4bb0d1e45a7efc8e875f494fb45fe06308e3ed 100644
--- a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out	
+++ b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out	
@@ -110,8 +110,8 @@ GET http://[HOST]:[PORT]/global/block/12/total_ticks
 
 ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from bootstrap1 for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 6269.903 units (will add 100 for safety)
-Estimated storage: 125 bytes added (will add 20 for safety)
+Estimated gas: 6269.695 units (will add 100 for safety)
+Estimated storage: 133 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -124,7 +124,7 @@ This sequence of operations was run:
     Fee to the baker: ꜩ0.001625
     Expected counter: 8
     Gas limit: 6370
-    Storage limit: 145 bytes
+    Storage limit: 153 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.001625
       payload fees(the block proposer) ....... +ꜩ0.001625
@@ -152,13 +152,13 @@ This sequence of operations was run:
           Parameter: (Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 220))
           This transaction was successfully applied
           Updated storage:
-            { Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 220) }
-          Storage size: 175 bytes
-          Paid storage size diff: 53 bytes
-          Consumed gas: 1208.974
+            { Ticket [MICHELINE_KT1_BYTES] string "Hello, Ticket!" 220 }
+          Storage size: 183 bytes
+          Paid storage size diff: 61 bytes
+          Consumed gas: 1208.766
           Balance updates:
-            [PUBLIC_KEY_HASH] ... -ꜩ0.01325
-            storage fees ........................... +ꜩ0.01325
+            [PUBLIC_KEY_HASH] ... -ꜩ0.01525
+            storage fees ........................... +ꜩ0.01525
           Ticket updates:
             Ticketer: [CONTRACT_HASH]
             Content type: string
@@ -169,8 +169,8 @@ This sequence of operations was run:
 
 ./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from bootstrap1 for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof '[SMART_ROLLUP_BYTES]' --burn-cap 10
 Node is bootstrapped.
-Estimated gas: 5818.472 units (will add 100 for safety)
-Estimated storage: 52 bytes added (will add 20 for safety)
+Estimated gas: 5818.056 units (will add 100 for safety)
+Estimated storage: 60 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -183,7 +183,7 @@ This sequence of operations was run:
     Fee to the baker: ꜩ0.001577
     Expected counter: 9
     Gas limit: 5919
-    Storage limit: 72 bytes
+    Storage limit: 80 bytes
     Balance updates:
       [PUBLIC_KEY_HASH] ... -ꜩ0.001577
       payload fees(the block proposer) ....... +ꜩ0.001577
@@ -207,14 +207,14 @@ This sequence of operations was run:
           Parameter: (Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 40))
           This transaction was successfully applied
           Updated storage:
-            { Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 40) ;
-              Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 220) }
-          Storage size: 227 bytes
-          Paid storage size diff: 52 bytes
-          Consumed gas: 1217.197
+            { Ticket [MICHELINE_KT1_BYTES] string "Hello, Ticket!" 40 ;
+              Ticket [MICHELINE_KT1_BYTES] string "Hello, Ticket!" 220 }
+          Storage size: 243 bytes
+          Paid storage size diff: 60 bytes
+          Consumed gas: 1216.781
           Balance updates:
-            [PUBLIC_KEY_HASH] ... -ꜩ0.013
-            storage fees ........................... +ꜩ0.013
+            [PUBLIC_KEY_HASH] ... -ꜩ0.015
+            storage fees ........................... +ꜩ0.015
           Ticket updates:
             Ticketer: [CONTRACT_HASH]
             Content type: string
diff --git a/tezt/tests/expected/tzt_regression.ml/Alpha- Run TZT.out b/tezt/tests/expected/tzt_regression.ml/Alpha- Run TZT.out
index 67dc6299e018f033a9d6d22cd8d675f85e918c23..d61440d9f7881ee21980d082f97a9055ba443353 100644
--- a/tezt/tests/expected/tzt_regression.ml/Alpha- Run TZT.out	
+++ b/tezt/tests/expected/tzt_regression.ml/Alpha- Run TZT.out	
@@ -22,7 +22,7 @@ tzt_reference_test_suite/ticket_00.tzt:
 Got output: StaticError "Error:\n  Contract_storage.Failure \"get_balance\"\n"
 Expected: { Stack_elt
     (option (ticket string))
-    (Some (Pair "KT1Q36KWPSba7dHsH5E4ZsQHehrChc51e19d" "Blue" 42)) }
+    (Some (Ticket "KT1Q36KWPSba7dHsH5E4ZsQHehrChc51e19d" string "Blue" 42)) }
 
 tzt_reference_test_suite/setdelegate_00.tzt:
 Got output: { Stack_elt