diff --git a/crates/runtime-ffi/tests/wasm/counter.wasm b/crates/runtime-ffi/tests/wasm/counter.wasm
index 69733369f..8eaa34f80 100755
Binary files a/crates/runtime-ffi/tests/wasm/counter.wasm and b/crates/runtime-ffi/tests/wasm/counter.wasm differ
diff --git a/crates/runtime-ffi/tests/wasm/counter/Cargo.lock b/crates/runtime-ffi/tests/wasm/counter/Cargo.lock
index 963939868..61d468028 100644
--- a/crates/runtime-ffi/tests/wasm/counter/Cargo.lock
+++ b/crates/runtime-ffi/tests/wasm/counter/Cargo.lock
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -32,6 +38,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.26"
@@ -56,6 +71,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
+[[package]]
+name = "seq-macro"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9f47faea3cad316faa914d013d24f471cd90bfca1a0c70f05a3f42c6441e99"
+
 [[package]]
 name = "serde"
 version = "1.0.125"
@@ -77,6 +98,7 @@ dependencies = [
 name = "svm-abi-decoder"
 version = "0.0.0"
 dependencies = [
+ "seq-macro",
  "svm-abi-layout",
  "svm-sdk-std",
  "svm-sdk-types",
@@ -86,6 +108,8 @@ dependencies = [
 name = "svm-abi-encoder"
 version = "0.0.0"
 dependencies = [
+ "num-traits",
+ "seq-macro",
  "svm-abi-layout",
  "svm-sdk-std",
  "svm-sdk-types",
diff --git a/crates/runtime-ffi/tests/wasm/counter/src/lib.rs b/crates/runtime-ffi/tests/wasm/counter/src/lib.rs
index 8a3b0b342..2a03ab47a 100644
--- a/crates/runtime-ffi/tests/wasm/counter/src/lib.rs
+++ b/crates/runtime-ffi/tests/wasm/counter/src/lib.rs
@@ -1,12 +1,12 @@
-use svm_sdk::app;
+use svm_sdk::template;
 
 #[link(wasm_import_module = "host")]
 extern "C" {
     fn counter_mul(var_id: u32, mul_by: u32) -> u32;
 }
 
-#[app]
-mod App {
+#[template]
+mod Template {
     #[storage]
     struct Storage {
         counter: u32, // var_id = 0
diff --git a/crates/runtime-ffi/tests/wasm/failure/Cargo.lock b/crates/runtime-ffi/tests/wasm/failure/Cargo.lock
index 9acdd9269..fa231fe8e 100644
--- a/crates/runtime-ffi/tests/wasm/failure/Cargo.lock
+++ b/crates/runtime-ffi/tests/wasm/failure/Cargo.lock
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -32,6 +38,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.26"
@@ -56,6 +71,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
+[[package]]
+name = "seq-macro"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9f47faea3cad316faa914d013d24f471cd90bfca1a0c70f05a3f42c6441e99"
+
 [[package]]
 name = "serde"
 version = "1.0.125"
@@ -77,6 +98,7 @@ dependencies = [
 name = "svm-abi-decoder"
 version = "0.0.0"
 dependencies = [
+ "seq-macro",
  "svm-abi-layout",
  "svm-sdk-std",
  "svm-sdk-types",
@@ -86,6 +108,8 @@ dependencies = [
 name = "svm-abi-encoder"
 version = "0.0.0"
 dependencies = [
+ "num-traits",
+ "seq-macro",
  "svm-abi-layout",
  "svm-sdk-std",
  "svm-sdk-types",
diff --git a/crates/runtime-ffi/tests/wasm/failure/src/lib.rs b/crates/runtime-ffi/tests/wasm/failure/src/lib.rs
index 4cd51cc9c..21b20680c 100644
--- a/crates/runtime-ffi/tests/wasm/failure/src/lib.rs
+++ b/crates/runtime-ffi/tests/wasm/failure/src/lib.rs
@@ -1,12 +1,12 @@
-use svm_sdk::app;
+use svm_sdk::template;
 
 #[link(wasm_import_module = "host")]
 extern "C" {
     fn host_fail();
 }
 
-#[app]
-mod App {
+#[template]
+mod Template {
     #[ctor]
     fn initialize() {}
 
diff --git a/crates/runtime/tests/wasm/calldata/Cargo.lock b/crates/runtime/tests/wasm/calldata/Cargo.lock
index 8f6ed900e..4c47eb6d5 100644
--- a/crates/runtime/tests/wasm/calldata/Cargo.lock
+++ b/crates/runtime/tests/wasm/calldata/Cargo.lock
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -32,6 +38,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.24"
@@ -56,6 +71,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
+[[package]]
+name = "seq-macro"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9f47faea3cad316faa914d013d24f471cd90bfca1a0c70f05a3f42c6441e99"
+
 [[package]]
 name = "serde"
 version = "1.0.124"
@@ -77,6 +98,7 @@ dependencies = [
 name = "svm-abi-decoder"
 version = "0.0.0"
 dependencies = [
+ "seq-macro",
  "svm-abi-layout",
  "svm-sdk-std",
  "svm-sdk-types",
@@ -86,6 +108,8 @@ dependencies = [
 name = "svm-abi-encoder"
 version = "0.0.0"
 dependencies = [
+ "num-traits",
+ "seq-macro",
  "svm-abi-layout",
  "svm-sdk-std",
  "svm-sdk-types",
diff --git a/crates/runtime/tests/wasm/calldata/src/lib.rs b/crates/runtime/tests/wasm/calldata/src/lib.rs
index ed31b059f..b5b6dee81 100644
--- a/crates/runtime/tests/wasm/calldata/src/lib.rs
+++ b/crates/runtime/tests/wasm/calldata/src/lib.rs
@@ -1,7 +1,7 @@
-use svm_sdk::{app, Address};
+use svm_sdk::{template, Address};
 
-#[app]
-mod App {
+#[template]
+mod Template {
     #[storage]
     struct Storage {
         addr: Address,
diff --git a/crates/runtime/tests/wasm/runtime_calldata.wasm b/crates/runtime/tests/wasm/runtime_calldata.wasm
index 7595b4f53..fa46483ed 100755
Binary files a/crates/runtime/tests/wasm/runtime_calldata.wasm and b/crates/runtime/tests/wasm/runtime_calldata.wasm differ