diff --git a/Cargo.lock b/Cargo.lock
index 0c06ed0..5ddffe0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -321,8 +321,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-casm"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-utils",
  "indoc",
@@ -337,8 +337,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-compiler"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "anyhow",
  "cairo-lang-defs",
@@ -354,24 +354,22 @@ dependencies = [
  "cairo-lang-syntax",
  "cairo-lang-utils",
  "itertools 0.11.0",
- "log",
  "salsa",
- "smol_str",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-debug"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-utils",
 ]
 
 [[package]]
 name = "cairo-lang-defs"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-diagnostics",
@@ -379,7 +377,6 @@ dependencies = [
  "cairo-lang-parser",
  "cairo-lang-syntax",
  "cairo-lang-utils",
- "indexmap 2.0.2",
  "itertools 0.11.0",
  "salsa",
  "smol_str",
@@ -387,31 +384,28 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-diagnostics"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
  "cairo-lang-utils",
  "itertools 0.11.0",
- "salsa",
 ]
 
 [[package]]
 name = "cairo-lang-eq-solver"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-utils",
  "good_lp",
- "indexmap 2.0.2",
- "itertools 0.11.0",
 ]
 
 [[package]]
 name = "cairo-lang-filesystem"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-utils",
@@ -426,8 +420,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-lowering"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -451,8 +445,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-parser"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
@@ -461,7 +455,6 @@ dependencies = [
  "cairo-lang-utils",
  "colored",
  "itertools 0.11.0",
- "log",
  "num-bigint",
  "num-traits 0.2.16",
  "salsa",
@@ -471,8 +464,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-plugins"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
@@ -483,15 +476,14 @@ dependencies = [
  "indent",
  "indoc",
  "itertools 0.11.0",
- "num-bigint",
  "salsa",
  "smol_str",
 ]
 
 [[package]]
 name = "cairo-lang-proc-macros"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-debug",
  "quote",
@@ -500,8 +492,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-project"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
@@ -513,8 +505,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-runner"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "anyhow",
  "ark-ff",
@@ -524,11 +516,8 @@ dependencies = [
  "cairo-felt",
  "cairo-lang-casm",
  "cairo-lang-compiler",
- "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
- "cairo-lang-lowering",
- "cairo-lang-semantic",
  "cairo-lang-sierra",
  "cairo-lang-sierra-ap-change",
  "cairo-lang-sierra-gas",
@@ -543,28 +532,25 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits 0.2.16",
- "salsa",
  "thiserror",
  "thiserror-no-std",
 ]
 
 [[package]]
 name = "cairo-lang-semantic"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-parser",
- "cairo-lang-plugins",
  "cairo-lang-proc-macros",
  "cairo-lang-syntax",
  "cairo-lang-utils",
  "id-arena",
  "itertools 0.11.0",
- "log",
  "num-bigint",
  "num-traits 0.2.16",
  "once_cell",
@@ -574,9 +560,10 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
+ "anyhow",
  "cairo-lang-utils",
  "const-fnv1a-hash",
  "convert_case",
@@ -589,6 +576,7 @@ dependencies = [
  "regex",
  "salsa",
  "serde",
+ "serde_json",
  "sha3",
  "smol_str",
  "thiserror",
@@ -596,8 +584,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-ap-change"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -609,8 +597,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-gas"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -622,8 +610,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-generator"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -631,13 +619,10 @@ dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-lowering",
  "cairo-lang-parser",
- "cairo-lang-plugins",
- "cairo-lang-proc-macros",
  "cairo-lang-semantic",
  "cairo-lang-sierra",
  "cairo-lang-syntax",
  "cairo-lang-utils",
- "id-arena",
  "indexmap 2.0.2",
  "itertools 0.11.0",
  "num-bigint",
@@ -648,8 +633,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-to-casm"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "assert_matches",
  "cairo-felt",
@@ -661,7 +646,6 @@ dependencies = [
  "cairo-lang-utils",
  "indoc",
  "itertools 0.11.0",
- "log",
  "num-bigint",
  "num-traits 0.2.16",
  "thiserror",
@@ -669,8 +653,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-type-size"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-sierra",
  "cairo-lang-utils",
@@ -678,8 +662,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-starknet"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "anyhow",
  "cairo-felt",
@@ -689,22 +673,17 @@ dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-lowering",
- "cairo-lang-parser",
- "cairo-lang-plugins",
  "cairo-lang-semantic",
  "cairo-lang-sierra",
- "cairo-lang-sierra-ap-change",
- "cairo-lang-sierra-gas",
  "cairo-lang-sierra-generator",
  "cairo-lang-sierra-to-casm",
  "cairo-lang-syntax",
  "cairo-lang-utils",
+ "const_format",
  "convert_case",
- "genco",
  "indent",
  "indoc",
  "itertools 0.11.0",
- "log",
  "num-bigint",
  "num-integer",
  "num-traits 0.2.16",
@@ -718,8 +697,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-syntax"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -728,14 +707,13 @@ dependencies = [
  "num-traits 0.2.16",
  "salsa",
  "smol_str",
- "thiserror",
  "unescaper",
 ]
 
 [[package]]
 name = "cairo-lang-syntax-codegen"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "genco",
  "xshell",
@@ -743,13 +721,12 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-utils"
-version = "2.2.0"
-source = "git+https://github.com/cryptonerdcn/cairo.git?rev=2103b35f35a5a99aa957ee4710e66e7b25eae28c#2103b35f35a5a99aa957ee4710e66e7b25eae28c"
+version = "2.3.1"
+source = "git+https://github.com/cryptonerdcn/cairo.git?rev=6f243538b8fbf14aa2cc8745ab13e7363a87ac8a#6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"
 dependencies = [
  "indexmap 2.0.2",
  "itertools 0.11.0",
  "num-bigint",
- "num-integer",
  "num-traits 0.2.16",
  "parity-scale-codec",
  "schemars",
@@ -887,6 +864,26 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
 
+[[package]]
+name = "const_format"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.6.0"
@@ -2379,7 +2376,7 @@ dependencies = [
 
 [[package]]
 name = "wasm-cairo"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
diff --git a/Cargo.toml b/Cargo.toml
index 900a971..0ca9086 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasm-cairo"
-version = "0.4.0"
+version = "0.5.1"
 authors = ["cryptonerdcn <cryptonerdcn@gmail.com>"]
 edition = "2018"
 
@@ -14,9 +14,9 @@ default = ["console_error_panic_hook", "wee_alloc"]
 clap = { version = "4.2.5", features = ["derive"] }
 serde_json = "1.0.91"
 wasm-bindgen = "0.2.87"
-cairo-lang-starknet = { package = "cairo-lang-starknet", git = "https://github.com/cryptonerdcn/cairo.git", rev = "2103b35f35a5a99aa957ee4710e66e7b25eae28c"}
-cairo-lang-compiler = { package = "cairo-lang-compiler", git = "https://github.com/cryptonerdcn/cairo.git", rev = "2103b35f35a5a99aa957ee4710e66e7b25eae28c"}
-cairo-lang-runner = { package = "cairo-lang-runner", git = "https://github.com/cryptonerdcn/cairo.git", rev = "2103b35f35a5a99aa957ee4710e66e7b25eae28c", features = ["alloc"], default-features = false}
+cairo-lang-starknet = { package = "cairo-lang-starknet", git = "https://github.com/cryptonerdcn/cairo.git", rev = "6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"}
+cairo-lang-compiler = { package = "cairo-lang-compiler", git = "https://github.com/cryptonerdcn/cairo.git", rev = "6f243538b8fbf14aa2cc8745ab13e7363a87ac8a"}
+cairo-lang-runner = { package = "cairo-lang-runner", git = "https://github.com/cryptonerdcn/cairo.git", rev = "6f243538b8fbf14aa2cc8745ab13e7363a87ac8a", features = ["alloc"], default-features = false}
 
 
 # The `console_error_panic_hook` crate provides better debugging of panics by