diff --git a/arkoala-arkts/arkui/package.json b/arkoala-arkts/arkui/package.json
index 65c91aa8ff66340110f72371dc9610f645081601..60d32802b7093beab5511ad862a922b6664ce6cf 100644
--- a/arkoala-arkts/arkui/package.json
+++ b/arkoala-arkts/arkui/package.json
@@ -9,6 +9,6 @@
     "clean:arkui-no-common": "npm run clean",
     "build:arkui-no-common:inc": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-unmemoized.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name arkui-no-common && ninja ${NINJA_OPTIONS} -f build/build.ninja",
     "build:arkui-no-common": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-unmemoized.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name arkui-no-common && ninja ${NINJA_OPTIONS} -f build/build.ninja",
-    "unmemoize": "memo-tsc -b ./tsconfig-unmemoize.json && cp -r ./src/generated/arkts ./build/unmemoized/src/generated"
+    "unmemoize": "ets-tsc -b ./tsconfig-unmemoize.json && cp -r ./src/generated/arkts ./build/unmemoized/src/generated"
   }
 }
diff --git a/arkoala-arkts/libarkts/package.json b/arkoala-arkts/libarkts/package.json
index 92f587c9def219c06426cc61439f6ad9745ab9c8..c6d5d739451f1e161c2cd69c31eeb1b12223387d 100644
--- a/arkoala-arkts/libarkts/package.json
+++ b/arkoala-arkts/libarkts/package.json
@@ -18,9 +18,9 @@
         "compile:meson": "cd native && meson setup build && meson compile -C build",
         "copy:.node": "mkdir -p ./build/native/build && cp ./native/build/es2panda.node ./build/native/build",
         "compile:native": "npm run compile:koala:interop && npm run compile:meson && npm run copy:.node",
-        "compile:src": "npx memo-tsc -p ./tsconfig.json",
+        "compile:src": "npx ets-tsc -p ./tsconfig.json",
         "compile": "npm run compile:native && npm run compile:src",
-        "compile:plugin": "npx memo-tsc -p examples/tsconfig.json",
+        "compile:plugin": "npx ets-tsc -p examples/tsconfig.json",
         "run:js": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk node . --file ./examples/input/main.sts --arktsconfig ./arktsconfig.json --output ./build/abc/main.abc --dump-plugin-ast",
         "run": "npm run compile && npm run compile:plugin && npm run run:js",
         "mocha": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0",
diff --git a/arkoala-arkts/loader/webpack.config.node.js b/arkoala-arkts/loader/webpack.config.node.js
index a80246ddb47479dae293cb7cdda7bc396e91fda5..47c01bb6203361b6cd3d0cc593394a1bfafe76ec 100644
--- a/arkoala-arkts/loader/webpack.config.node.js
+++ b/arkoala-arkts/loader/webpack.config.node.js
@@ -40,7 +40,7 @@ const makeConfig = ({ os, arch, tsconfig }) => ({
                 options: {
                     "projectReferences": true,
                     configFile: tsconfig,
-                    compiler: "@koalaui/memo-tsc"
+                    compiler: "@koalaui/ets-tsc"
                 }
             },
         ]
diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json
index cdc4e2c9588c80ca09577ebca74cd1bf3c1e9f05..3eea7644a6672b550779f45dfce062bf9ce76738 100644
--- a/arkoala-arkts/package.json
+++ b/arkoala-arkts/package.json
@@ -17,7 +17,6 @@
     "devDependencies": {
         "@koalaui/ets-tsc": "4.9.5-r4",
         "@koalaui/fast-arktsc": "next",
-        "@koalaui/memo-tsc": "4.9.5",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.0",
         "bin-links": "^4.0.4",
diff --git a/arkoala-arkts/shopping/package.json b/arkoala-arkts/shopping/package.json
index 70904a3e97f317cce366a27bcd3290b74165b195..cb1b82ff71ca3df64f7aaa7235b4a7caa124ce96 100644
--- a/arkoala-arkts/shopping/package.json
+++ b/arkoala-arkts/shopping/package.json
@@ -6,7 +6,7 @@
         "clean": "rimraf build generated unmemoized js_output abc lib app/shopping/build app/shopping/libs",
         "compile:plugin": "cd ../../arkoala/ets-plugin && npm run compile",
         "compile:ets": "npm run compile:plugin && cd src/ets && ets-tsc -p ./etsconfig.json",
-        "unmemoize": "npm run compile:ets && memo-tsc -p tsconfig-unmemoize.json",
+        "unmemoize": "npm run compile:ets && ets-tsc -p tsconfig-unmemoize.json",
         "unmemoize:runtime": "npm run unmemoize --prefix ../../incremental/runtime",
         "unmemoize:arkui-no-common": "npm run unmemoize --prefix ../arkui",
         "unmemoize:arkui-common": "npm run unmemoize --prefix ../../arkoala/arkui-common",
diff --git a/arkoala-arkts/user/package.json b/arkoala-arkts/user/package.json
index 8fb7fe817f62ffc45f45b757f08a963a57609888..9fced01c0d1383376af88cecc2bf642fe4cd6b57 100644
--- a/arkoala-arkts/user/package.json
+++ b/arkoala-arkts/user/package.json
@@ -6,7 +6,7 @@
         "clean": "rimraf build generated unmemoized js_output abc lib app/user/build",
         "compile:plugin": "cd ../../arkoala/ets-plugin && npm run compile",
         "compile:ets": "npm run compile:plugin && cd src/ets && ets-tsc -p ./etsconfig.json",
-        "unmemoize": "npm run compile:ets && memo-tsc -p tsconfig-unmemoize.json",
+        "unmemoize": "npm run compile:ets && ets-tsc -p tsconfig-unmemoize.json",
         "unmemoize:runtime": "npm run unmemoize --prefix ../../incremental/runtime",
         "unmemoize:arkui-no-common": "npm run unmemoize --prefix ../arkui",
         "unmemoize:arkui-common": "npm run unmemoize --prefix ../../arkoala/arkui-common",
diff --git a/arkoala/arkui-common/package.json b/arkoala/arkui-common/package.json
index c6ccef336c1fd976a3acfdd3eec18c57d3826208..23277cbfa2424fb2c058e9b4fb12d41197049a5a 100644
--- a/arkoala/arkui-common/package.json
+++ b/arkoala/arkui-common/package.json
@@ -35,8 +35,8 @@
     "scripts": {
         "clean": "rimraf build dist; npm run ets:clean",
         "docs": "typedoc",
-        "unmemoize": "memo-tsc -b tsconfig-unmemoize.json",
-        "compile": "npm run ohos-sdk && memo-tsc -b .",
+        "unmemoize": "ets-tsc -b tsconfig-unmemoize.json",
+        "compile": "npm run ohos-sdk && ets-tsc -b .",
         "compile:arkts": "../../incremental/tools/panda/arkts/arktsc --ets-module --arktsconfig arktsconfig.json",
         "build:arkui-common": "npm run unmemoize && npm run build:arkui-common:inc",
         "build:arkui-common:inc": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name arkui-common && ninja ${NINJA_OPTIONS} -f build/build.ninja",
@@ -59,4 +59,4 @@
         "@koalaui/ets-tsc": "4.9.5-r4",
         "@koalaui/fast-arktsc": "next"
     }
-}
\ No newline at end of file
+}
diff --git a/arkoala/arkui/package.json b/arkoala/arkui/package.json
index 4e389bea4d4142c635fc9a7f0f3b7f77e7883994..0024f459c14ff04a4203a4b09f5c449a230dbc59 100644
--- a/arkoala/arkui/package.json
+++ b/arkoala/arkui/package.json
@@ -34,7 +34,7 @@
     ],
     "scripts": {
         "docs": "typedoc",
-        "compile": "npm run ohos-sdk --prefix ../arkui-common && memo-tsc -b .",
+        "compile": "npm run ohos-sdk --prefix ../arkui-common && ets-tsc -b .",
         "compile:arkts": "bash ../../incremental/tools/panda/arkts/arktsc --arktsconfig arktsconfig.json",
         "clean": "rimraf build dist ; npm run ets:clean",
         "ets:test": "cd test/ets; ets-tsc",
@@ -64,4 +64,4 @@
         "mocha": "^9.2.2",
         "source-map-support": "^0.5.21"
     }
-}
\ No newline at end of file
+}
diff --git a/arkoala/ets-plugin/package.json b/arkoala/ets-plugin/package.json
index 5aac259a2f96805d2d891b7123f0ca34c8af5e92..a3b719fdee44b86ae423a9e247dfae951b9d0d3f 100644
--- a/arkoala/ets-plugin/package.json
+++ b/arkoala/ets-plugin/package.json
@@ -35,7 +35,7 @@
         "test:koala:spec": "npm run compile:koala:spec && mocha --config mocharc.koala.spec.json",
         "test:spec": "npm run test:arkoala:spec && npm run test:arkts:spec && npm run test:koala:spec",
         "test:all": "npm run compile && npm run test:ets && npm run sync:spec && npm run test:spec",
-        "compile:sync:spec": "cd test/scripts && memo-tsc -p tsconfig-sync-specification.json",
+        "compile:sync:spec": "cd test/scripts && ets-tsc -p tsconfig-sync-specification.json",
         "sync:spec": "npm run compile:sync:spec && cd build/test/scripts && node sync-specification.js",
         "clean": "rimraf build test/spec test/specification/ets2bundle"
     },
@@ -43,7 +43,6 @@
     "dependencies": {},
     "devDependencies": {
         "@koalaui/ets-tsc": "4.9.5-r4",
-        "@koalaui/memo-tsc": "4.9.5",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.0",
         "@typescript-eslint/eslint-plugin": "^5.20.0",
@@ -54,4 +53,4 @@
         "mocha": "^9.2.2",
         "source-map-support": "^0.5.21"
     }
-}
\ No newline at end of file
+}
diff --git a/arkoala/extension-component/package.json b/arkoala/extension-component/package.json
index 2fb3686f935f85851535c4be0befc0af3990be48..eee5e39c04424d44b8ace9252038e6b07635aeeb 100644
--- a/arkoala/extension-component/package.json
+++ b/arkoala/extension-component/package.json
@@ -11,8 +11,8 @@
   },
   "keywords": [],
   "scripts": {
-    "compile": "memo-tsc -b .",
-    "unmemoize": "memo-tsc && memo-tsc -b tsconfig-unmemoize.json"
+    "compile": "ets-tsc -b .",
+    "unmemoize": "ets-tsc && ets-tsc -b tsconfig-unmemoize.json"
   },
   "author": "",
   "license": "ISC"
diff --git a/arkoala/framework/package.json b/arkoala/framework/package.json
index 921ffde1918fed0dad952a3eb9b70c09e81d1ee0..8c774a74b5795517f527f2187af2a9aacf4f73be 100644
--- a/arkoala/framework/package.json
+++ b/arkoala/framework/package.json
@@ -28,7 +28,7 @@
         "prepare:arm32": "npm run prepare:compiler && npm run install:sysroot:arm32 --prefix ../tools/compiler",
         "prepare:wincrt:bz": "node ../ohos-sdk/scripts/openlab-cli.mjs download -p wincrt -f wincrt-14.33.173.tar.gz -v 14.33.173 -d prebuilt/wincrt",
         "prepare:wincrt:yz": "node ../ohos-sdk/scripts/gitlab-cli.mjs download -p wincrt -f wincrt-14.33.173.tar.gz -v 14.33.173 -d prebuilt/wincrt",
-        "clean": "memo-tsc -b . --clean && rimraf -g build dist lib generated native/build-* *.ini",
+        "clean": "ets-tsc -b . --clean && rimraf -g build dist lib generated native/build-* *.ini",
         "configure:native-node-host": "cd native && meson setup -D vm_kind=node build-node-host",
         "compile:native-node-host": "npm run configure:native-node-host && cd native && meson compile -C build-node-host && meson install -C build-node-host",
         "configure:native-hzvm-host": "cd native && meson setup -D vm_kind=hzvm build-hzvm-host",
@@ -54,7 +54,7 @@
         "configure:native-hzvm-ohos-arm32": "npm run prepare:arm32 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm32",
         "compile:native-hzvm-ohos-arm32": "npm run configure:native-hzvm-ohos-arm32 && cd native && meson compile -C build-hzvm-ohos-arm32 && meson install -C build-hzvm-ohos-arm32",
         "configure:native-hzvm-ohos": "npm run configure:native-hzvm-ohos-arm64",
-        "compile:native-hzvm-ohos": "memo-tsc -b . && npm run compile:native-hzvm-ohos-arm64",
+        "compile:native-hzvm-ohos": "ets-tsc -b . && npm run compile:native-hzvm-ohos-arm64",
         "configure:native-panda-ohos-arm64": "npm run prepare:arm64 && cd native && node ../scripts/configure.mjs panda-ohos-arm64",
         "compile:native-panda-ohos-arm64": "npm run configure:native-panda-ohos-arm64 && cd native && meson compile -C build-panda-ohos-arm64 && meson install -C build-panda-ohos-arm64",
         "configure:native-panda-ohos-arm32": "npm run prepare:arm32 && cd native && node ../scripts/configure.mjs panda-ohos-arm32",
@@ -65,9 +65,9 @@
         "compile:native-panda-with-hzvm-ohos-arm64": "npm run configure:native-panda-with-hzvm-ohos-arm64 && npm run compile:native-panda-ohos-arm64 && cd native && meson compile -C build-hzvm-ohos-arm64-vmloader && meson install -C build-hzvm-ohos-arm64-vmloader && npm run copy:libcpp:arm64 --prefix ../../tools/compiler",
         "configure:native-panda-with-hzvm-ohos-arm32": "npm run configure:native-panda-ohos-arm32 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm32-vmloader",
         "compile:native-panda-with-hzvm-ohos-arm32": "npm run configure:native-panda-with-hzvm-ohos-arm32 && npm run compile:native-panda-ohos-arm32 && cd native && meson compile -C build-hzvm-ohos-arm32-vmloader && meson install -C build-hzvm-ohos-arm32-vmloader && npm run copy:libcpp:arm32 --prefix ../../tools/compiler",
-        "compile:node-host": "memo-tsc -b . && npm run compile:native-node-host",
+        "compile:node-host": "ets-tsc -b . && npm run compile:native-node-host",
         "compile": "npm run compile:node-host",
-        "compile:hzvm-host": "memo-tsc -b . && npm run compile:native-hzvm-host",
-        "compile:hzvm-ohos": "memo-tsc -b . && npm run compile:native-hzvm-ohos"
+        "compile:hzvm-host": "ets-tsc -b . && npm run compile:native-hzvm-host",
+        "compile:hzvm-ohos": "ets-tsc -b . && npm run compile:native-hzvm-ohos"
     }
 }
diff --git a/arkoala/loader/package.json b/arkoala/loader/package.json
index ffea321a4e8468f286b5b335b9dd20ac5d2a0bb4..67306b3725801e62c5ea91f4de4f01f8cf1354bf 100644
--- a/arkoala/loader/package.json
+++ b/arkoala/loader/package.json
@@ -16,13 +16,13 @@
         "plugins:compile": "cd ../; npm run compile -w koala-arkui && npm run compiler:plugin:compile && npm run ets:plugin:compile",
         "ets": "cd src/ets; ets-tsc",
         "test:hzvm:loader": "npm run compile:hzvm-host",
-        "clean": "memo-tsc -b . --clean && rimraf build dist lib generated unmemoized",
-        "compile:node-test-host": "npm run gen-resources && npm run -C ../framework compile:native-node-host && memo-tsc -b ../extension-component && npm run ets && npm run compile:node-test",
-        "compile:node-test-host:unmemoizing": "npm run gen-resources &&  npm run unmemoize --prefix ../extension-component && npm run ets && memo-tsc -b tsconfig-unmemoize.json &&  npm run compile:node-test:unmemoizing",
+        "clean": "ets-tsc -b . --clean && rimraf build dist lib generated unmemoized",
+        "compile:node-test-host": "npm run gen-resources && npm run -C ../framework compile:native-node-host && ets-tsc -b ../extension-component && npm run ets && npm run compile:node-test",
+        "compile:node-test-host:unmemoizing": "npm run gen-resources &&  npm run unmemoize --prefix ../extension-component && npm run ets && ets-tsc -b tsconfig-unmemoize.json &&  npm run compile:node-test:unmemoizing",
         "compile:node-test": "WEBPACK_NO_MINIMIZE=true webpack --config webpack.config.node-test.js",
         "compile:node-test:unmemoizing": "WEBPACK_NO_MINIMIZE=true webpack --config webpack.config.node-test.js  --env tsconfig=tsconfig-run-unmemoized.json --env unmemoized=unmemoized",
         "compile:node-test:unmemoizing:arkts": "bash ../external/incremental/tools/panda/arkts/arktsc --extension sts unmemoized/generated/ets/page.ts --arktsconfig arktsconfig-run-unmemoized.json",
-        "compile:perf-ets": "npm run plugins:compile && HOS_SDK_HOME='../ohos-sdk/ohos-sdk/HarmonyOS-NEXT-DB1/openharmony' npm run gen-resources && memo-tsc -p ../extension-component && npm run ets",
+        "compile:perf-ets": "npm run plugins:compile && HOS_SDK_HOME='../ohos-sdk/ohos-sdk/HarmonyOS-NEXT-DB1/openharmony' npm run gen-resources && ets-tsc -p ../extension-component && npm run ets",
         "compile:perf-node": "WEBPACK_NO_MINIMIZE=true webpack --config webpack.config.node-perf.js",
         "compile:web": "WEBPACK_NO_MINIMIZE=true webpack serve --open --config webpack.config.web.js",
         "pack:perf": "npm run compile:perf-ets && npm run compile:perf-node && webpack ./lib/index-perf.js && echo 'Packed to dist/main.js'",
diff --git a/arkoala/loader/webpack.config.base.js b/arkoala/loader/webpack.config.base.js
index 50c15d6d0f0cbf1bd316bc99bb5dc846557391d4..b6bc35d15d26d769d6ce186dff7209120934dc7e 100644
--- a/arkoala/loader/webpack.config.base.js
+++ b/arkoala/loader/webpack.config.base.js
@@ -42,7 +42,7 @@ const makeConfig = ({ os, arch }) => ({
                 loader: "ts-loader",
                 options: {
                     "projectReferences": true,
-                    compiler: "@koalaui/memo-tsc"
+                    compiler: "@koalaui/ets-tsc"
                 }
             },
             // Bundle already existing source maps for dependencies
diff --git a/arkoala/loader/webpack.config.node-perf.js b/arkoala/loader/webpack.config.node-perf.js
index 5cd5429a743a706f7e2a6e0bd6fa9936d0393466..93993fcb4e772487c58e3d8fe524b506fb9fb248 100644
--- a/arkoala/loader/webpack.config.node-perf.js
+++ b/arkoala/loader/webpack.config.node-perf.js
@@ -43,7 +43,7 @@ const makeConfig = ({ os, arch }) => ({
                 loader: "ts-loader",
                 options: {
                     "projectReferences": true,
-                    compiler: "@koalaui/memo-tsc"
+                    compiler: "@koalaui/ets-tsc"
                 }
             },
             // Bundle already existing source maps for dependencies
diff --git a/arkoala/loader/webpack.config.node-test.js b/arkoala/loader/webpack.config.node-test.js
index 8d8d5641e2fff8fad7ea32064c1d4f2156fe1e0f..b3b788852cb41848d3be99562e7f369bfa3be54f 100644
--- a/arkoala/loader/webpack.config.node-test.js
+++ b/arkoala/loader/webpack.config.node-test.js
@@ -52,7 +52,7 @@ const makeConfig = ({ os, arch, tsconfig, unmemoized }) => ({
                 options: {
                     "projectReferences": true,
                     configFile: tsconfig,
-                    compiler: "@koalaui/memo-tsc"
+                    compiler: "@koalaui/ets-tsc"
                 }
             },
             { test: /\.node$/, loader: "node-loader",
diff --git a/arkoala/package.json b/arkoala/package.json
index bc4c1cd9d47e67e594eb1c045906c1e9cf6da2fe..f525dbd05b40daada12545c89eb7c0dcf5472fff 100644
--- a/arkoala/package.json
+++ b/arkoala/package.json
@@ -22,7 +22,6 @@
     ],
     "devDependencies": {
         "@koalaui/ets-tsc": "4.9.5-r4",
-        "@koalaui/memo-tsc": "4.9.5",
         "typescript": "4.9.5",
         "bin-links": "^4.0.4",
         "read-package-json-fast": "^3.0.2",
diff --git a/arkoala/tests/webpack.config.node-test.js b/arkoala/tests/webpack.config.node-test.js
index ef492286f5c2552557926610f64eeba9a18078bd..2c408ea17d2c09fecf6fc4acd1a8e60b3d01cee4 100644
--- a/arkoala/tests/webpack.config.node-test.js
+++ b/arkoala/tests/webpack.config.node-test.js
@@ -42,7 +42,7 @@ const makeConfig = ({ os, arch }) => ({
                 loader: "ts-loader",
                 options: {
                     configFile: "tsconfig-test.json",
-                    compiler: "@koalaui/memo-tsc",
+                    compiler: "@koalaui/ets-tsc",
                     "projectReferences": true,
                 }
             },
diff --git a/arkoala/tools/arkoala-transformer/rollup.config.js b/arkoala/tools/arkoala-transformer/rollup.config.js
index 826457f02383cc863931003558a7213b52eda455..252beb996dd12d5427d38a7114349cdf02cb75a1 100644
--- a/arkoala/tools/arkoala-transformer/rollup.config.js
+++ b/arkoala/tools/arkoala-transformer/rollup.config.js
@@ -11,7 +11,7 @@ module.exports = {
         format: "commonjs",
         exports: "default",
     },
-    external: ["typescript", "ohos-typescript", "@koalaui/ets-tsc", "@koalaui/memo-tsc"],
+    external: ["typescript", "ohos-typescript", "@koalaui/ets-tsc", "@koalaui/ets-tsc"],
     plugins: [
         replace({
             values: {
diff --git a/arkoala/tools/ets-memo-tsc/package.json b/arkoala/tools/ets-memo-tsc/package.json
index 420e4545b95e5f7e8cad83a022395b633bc8e199..7b740574e53fef5406167979c5783d9ff26fd7a2 100644
--- a/arkoala/tools/ets-memo-tsc/package.json
+++ b/arkoala/tools/ets-memo-tsc/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "ets-memo-tsc",
+    "name": "ets-ets-tsc",
     "private": true,
     "devDependencies": {
         "ohos-typescript": "4.9.5-r4",
@@ -13,11 +13,11 @@
         "patch:ts-patch": "node ./scripts/patch-ts-patch.mjs ./node_modules/ts-patch",
         "patch:typescript": "cd prebuilt/typescript && ts-patch install -s",
         "patch:ohos-typescript": "npm run patch:ts-patch && cd prebuilt/ohos-typescript && ts-patch install -s",
-        "pack:memo-tsc": "npm run copy:typescript && npm run patch:typescript && node scripts/pack.mjs memo-tsc",
+        "pack:ets-tsc": "npm run copy:typescript && npm run patch:typescript && node scripts/pack.mjs ets-tsc",
         "pack:ets-tsc": "npm run copy:ohos-typescript && npm run patch:ohos-typescript && node scripts/pack.mjs ets-tsc",
-        "pack:all": "npm run pack:memo-tsc && npm run pack:ets-tsc",
-        "publish:memo-tsc": "npm run pack:memo-tsc && cd prebuilt/typescript && npm publish",
+        "pack:all": "npm run pack:ets-tsc && npm run pack:ets-tsc",
+        "publish:ets-tsc": "npm run pack:ets-tsc && cd prebuilt/typescript && npm publish",
         "publish:ets-tsc": "npm run pack:ets-tsc && cd prebuilt/ohos-typescript && npm publish",
-        "publish:all": "npm run publish:memo-tsc && npm run publish:ets-tsc"
+        "publish:all": "npm run publish:ets-tsc && npm run publish:ets-tsc"
     }
   }
\ No newline at end of file
diff --git a/arkoala/tools/ets-memo-tsc/scripts/pack.mjs b/arkoala/tools/ets-memo-tsc/scripts/pack.mjs
index 70b6fa92893e00dcfcf83a461ec2c4f30b771669..3939a0d91584f7ccf2489324e71fed1fac940646 100644
--- a/arkoala/tools/ets-memo-tsc/scripts/pack.mjs
+++ b/arkoala/tools/ets-memo-tsc/scripts/pack.mjs
@@ -39,4 +39,4 @@ function main() {
 
 }
 
-main()
\ No newline at end of file
+main()
diff --git a/incremental/common/package.json b/incremental/common/package.json
index 4e1f4b778baadade58b8fa7be2c5e226828527f6..94a1617f8ff3201687de9ca777cc466d13b5e37d 100644
--- a/incremental/common/package.json
+++ b/incremental/common/package.json
@@ -31,7 +31,7 @@
         }
     },
     "scripts": {
-        "compile": "memo-tsc -b .",
+        "compile": "ets-tsc -b .",
         "clean": "rimraf build",
         "test": "mocha",
         "test:coverage": "nyc mocha",
@@ -56,4 +56,4 @@
         "mocha": "^9.2.2",
         "source-map-support": "^0.5.21"
     }
-}
\ No newline at end of file
+}
diff --git a/incremental/compat/package.json b/incremental/compat/package.json
index cbadced82c3be2901d92e7de859e430a89682e7f..4c487c2e44189656dcdf40ac6080cb29e32aa470 100644
--- a/incremental/compat/package.json
+++ b/incremental/compat/package.json
@@ -22,8 +22,8 @@
     },
     "scripts": {
         "clean": "rimraf build dist",
-        "compile": "memo-tsc -b .",
-        "compile:ohos": "memo-tsc -b ./tsconfig-ohos.json",
+        "compile": "ets-tsc -b .",
+        "compile:ohos": "ets-tsc -b ./tsconfig-ohos.json",
         "compile:all": "npm run compile && npm run compile:ohos",
         "build:compat": "npm run build:compat:inc",
         "build:compat:inc": "fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc --link-name compat && ninja ${NINJA_OPTIONS} -f build/build.ninja",
@@ -43,4 +43,4 @@
         "mocha": "^9.2.2",
         "source-map-support": "^0.5.21"
     }
-}
\ No newline at end of file
+}
diff --git a/incremental/compiler-plugin/oh-package.json5 b/incremental/compiler-plugin/oh-package.json5
index 40e5742a6de99c4cda05c0b5f54bf8042a9ca924..eaac79d1ba3ec3292efb5cfdc5f9d6a7234dc95d 100644
--- a/incremental/compiler-plugin/oh-package.json5
+++ b/incremental/compiler-plugin/oh-package.json5
@@ -24,9 +24,9 @@
     "source-map-support": "^0.5.21"
   },
   "scripts": {
-    "compile": "memo-tsc -b .",
+    "compile": "ets-tsc -b .",
     "clean": "rimraf build dist test/dump",
-    "unmemoize:tests": "cd test && memo-tsc -p tsconfig-unmemoize.json && rimraf build",
+    "unmemoize:tests": "cd test && ets-tsc -p tsconfig-unmemoize.json && rimraf build",
     "test": "npm run unmemoize:tests && npm run compile && mocha",
     "test:coverage": "nyc mocha"
   }
diff --git a/incremental/compiler-plugin/package.json b/incremental/compiler-plugin/package.json
index 146106309bda546ccac3cf68b5b3d21baeae96a3..d623af7870954570ff186f021c3a516b0cf66411 100644
--- a/incremental/compiler-plugin/package.json
+++ b/incremental/compiler-plugin/package.json
@@ -24,11 +24,11 @@
         "source-map-support": "^0.5.21"
     },
     "scripts": {
-        "compile": "memo-tsc -b .",
+        "compile": "ets-tsc -b .",
         "clean": "rimraf build dist test/dump",
-        "unmemoize:tests": "npm run compile && cd test && memo-tsc -p tsconfig-unmemoize.json && rimraf build",
+        "unmemoize:tests": "npm run compile && cd test && ets-tsc -p tsconfig-unmemoize.json && rimraf build",
         "test": "npm run unmemoize:tests && mocha",
         "test:coverage": "nyc mocha",
         "canonize": "npm run unmemoize:tests && cp -r ./test/unmemoized/examples ./test/golden/"
     }
-}
\ No newline at end of file
+}
diff --git a/incremental/compiler-plugin/src/AbstractVisitor.ts b/incremental/compiler-plugin/src/AbstractVisitor.ts
index b0e7e279d54f596fe78031e11b3a6a30da226912..d17edb6be0319ea83b5eeb9774f95df47f7af019 100644
--- a/incremental/compiler-plugin/src/AbstractVisitor.ts
+++ b/incremental/compiler-plugin/src/AbstractVisitor.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 
 export abstract class AbstractVisitor {
     constructor(
diff --git a/incremental/compiler-plugin/src/MemoArgumentDetector.ts b/incremental/compiler-plugin/src/MemoArgumentDetector.ts
index 8f35a302116c76295ce1f65122ac4fda4dff4967..fc963e49a9a3faa1b75ae6eed8cf9487d64b3182 100644
--- a/incremental/compiler-plugin/src/MemoArgumentDetector.ts
+++ b/incremental/compiler-plugin/src/MemoArgumentDetector.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript'
+import * as ts from '@koalaui/ets-tsc'
 import { Rewrite } from './transformation-context';
 import { AbstractVisitor } from './AbstractVisitor'
 import { FunctionKind, isAnyMemoKind } from './util';
diff --git a/incremental/compiler-plugin/src/ScopedVisitor.ts b/incremental/compiler-plugin/src/ScopedVisitor.ts
index 5df96aff615cf38abb23feac0b483407d07e7799..50d90e5a505872a9b3c31241c29e76509a7cd35c 100644
--- a/incremental/compiler-plugin/src/ScopedVisitor.ts
+++ b/incremental/compiler-plugin/src/ScopedVisitor.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import { AbstractVisitor } from "./AbstractVisitor"
 import { FunctionKind, isAnyMemoKind, isMemoKind } from "./util"
 
diff --git a/incremental/compiler-plugin/src/analysis-visitor.ts b/incremental/compiler-plugin/src/analysis-visitor.ts
index bc2b723243143674e2438539c029c00a542646ef..7b59319f86ed681ddf9f4e6415dccbca12133e89 100644
--- a/incremental/compiler-plugin/src/analysis-visitor.ts
+++ b/incremental/compiler-plugin/src/analysis-visitor.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import { AbstractVisitor } from "./AbstractVisitor"
 import { Rewrite } from './transformation-context';
 import {
@@ -30,6 +30,7 @@ import {
     findFunctionDeclaration,
     isMemoEntry,
     skipParenthesizedExpression,
+    hasMemoDecorator,
 } from "./util"
 import { ImportExport } from './import-export';
 
@@ -71,9 +72,23 @@ export class AnalysisVisitor extends AbstractVisitor {
         }
     }
 
-    immediateFunctionKind(source: ts.SourceFile, node: ts.Node, name: string): FunctionKind {
+    functionKindFromDecorator(node: ts.Node): FunctionKind {
+        if (hasMemoDecorator(node)) return FunctionKind.MEMO
+        return FunctionKind.REGULAR
+    }
+
+    functionKindFromComment(source: ts.SourceFile, node: ts.Node): FunctionKind {
         const comment = getComment(source, node)
-        let kind = parseComment(comment)
+        return parseComment(comment)
+    }
+
+    immediateFunctionKind(source: ts.SourceFile, node: ts.Node, name: string): FunctionKind {
+        const decoratorKind = this.functionKindFromDecorator(node)
+        const commentKind = this.functionKindFromDecorator(node)
+
+        // Decorator has a precedence
+        const kind = decoratorKind ? decoratorKind : commentKind
+
         this.traceAnnotation(name, kind, node)
         return kind
     }
diff --git a/incremental/compiler-plugin/src/diagnostics-visitor.ts b/incremental/compiler-plugin/src/diagnostics-visitor.ts
index 10d1f943c4f357e3be9fcf4a3801753fbf5ddd76..314ffeb0aebbbf316f816a659ad27db451f33f7d 100644
--- a/incremental/compiler-plugin/src/diagnostics-visitor.ts
+++ b/incremental/compiler-plugin/src/diagnostics-visitor.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import { MemoArgumentDetector } from './MemoArgumentDetector';
 import { ScopedVisitor } from './ScopedVisitor';
 import { Rewrite } from './transformation-context';
diff --git a/incremental/compiler-plugin/src/dump-visitor.ts b/incremental/compiler-plugin/src/dump-visitor.ts
index 4aafe22783cf7b7fef33e62ec26a45009c7ff452..5ef2fac63ec199328472e62636d42ad0ddf0dbc2 100644
--- a/incremental/compiler-plugin/src/dump-visitor.ts
+++ b/incremental/compiler-plugin/src/dump-visitor.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from "typescript"
+import * as ts from '@koalaui/ets-tsc'
 import { AbstractVisitor } from "./AbstractVisitor";
 import { FunctionKind, FunctionTable, isAnyMemoKind, isFunctionOrMethod, Tracer } from "./util";
 
diff --git a/incremental/compiler-plugin/src/function-transformer.ts b/incremental/compiler-plugin/src/function-transformer.ts
index 780bed617d18659fb5bda1f53ea271df023cbac9..7f37a8b6a210ee77501d52784dd90b26e939df35 100644
--- a/incremental/compiler-plugin/src/function-transformer.ts
+++ b/incremental/compiler-plugin/src/function-transformer.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import { AbstractVisitor } from "./AbstractVisitor"
 import { Rewrite } from './transformation-context';
 import {
diff --git a/incremental/compiler-plugin/src/import-export.ts b/incremental/compiler-plugin/src/import-export.ts
index 6ead6179130071fd60f5a8b4b99a4686ae759c2b..92b619d0871bc838b57bc490115f2ffb21fc091f 100644
--- a/incremental/compiler-plugin/src/import-export.ts
+++ b/incremental/compiler-plugin/src/import-export.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import {
     arrayAt,
     error,
diff --git a/incremental/compiler-plugin/src/koala-transformer.ts b/incremental/compiler-plugin/src/koala-transformer.ts
index 38a12939f4bdc6bd9dc0bf3c4a8657981388d2dd..f00817ffed5671bc7b3245087abed877dab92ddb 100644
--- a/incremental/compiler-plugin/src/koala-transformer.ts
+++ b/incremental/compiler-plugin/src/koala-transformer.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import * as path from "path"
 import { AnalysisVisitor } from './analysis-visitor';
 import { DiagnosticsVisitor } from './diagnostics-visitor';
@@ -63,9 +63,40 @@ export function memoTransform(
     return variableTransformer.visitor(transformedReturn) as ts.SourceFile
 }
 
+
+function isAnnotationIssue(sourceFile: ts.SourceFile, message: ts.Diagnostic, text: string): boolean {
+    if (message.file == sourceFile &&
+        // TODO: how stable are typescript message codes?
+        message.code == 1206 &&
+        text.startsWith("Decorators are not valid here")
+    ) {
+        return true
+    }
+    return false
+}
+
+
+export function filterOutDiagnostics(sourceFile: ts.SourceFile, extras?: ts.TransformerExtras) {
+    const indicesToRemove: number[] = []
+
+    extras?.diagnostics.forEach((message, index) => {
+        const messageText = message.messageText
+        const text: string = typeof messageText === "string" ? messageText : messageText.messageText
+
+        if (isAnnotationIssue(sourceFile, message, text)) {
+            indicesToRemove.unshift(index)
+        }
+    })
+
+    indicesToRemove.forEach(index => {
+        extras?.removeDiagnostic(index)
+    })
+}
+
 export default function koala_transformer(program: ts.Program, pluginOptions: TransformerOptions, extras: ts.TransformerExtras) {
     const printer = ts.createPrinter()
     const tracer = new Tracer(pluginOptions, printer)
+    console.log(extras.diagnostics)
     return (ctx: ts.TransformationContext) => {
         const typechecker = program.getTypeChecker();
         return (sourceFile: ts.SourceFile) => {
@@ -73,6 +104,7 @@ export default function koala_transformer(program: ts.Program, pluginOptions: Tr
             const rewrite = new Rewrite(sourceFile, pluginOptions)
             const dumpVisitor = new DumpVisitor(tracer, sourceFile, rewrite.functionTable, ctx)
             const result = memoTransform(sourceFile, typechecker, ctx, extras, tracer, rewrite)
+            filterOutDiagnostics(sourceFile, extras)
             dumpVisitor.visitor(result)
             if (pluginOptions.only_unmemoize) {
                 const content = tracer.printer.printNode(ts.EmitHint.Unspecified, result, sourceFile)
@@ -83,6 +115,8 @@ export default function koala_transformer(program: ts.Program, pluginOptions: Tr
             } else if (pluginOptions.trace) {
                 tracer.trace("OUTPUT:\n" + printer.printNode(ts.EmitHint.SourceFile, result, sourceFile))
             }
+            console.log(extras.diagnostics)
+            filterOutDiagnostics(sourceFile, extras)
             return result
         }
     }
diff --git a/incremental/compiler-plugin/src/parameter-transformer.ts b/incremental/compiler-plugin/src/parameter-transformer.ts
index 6bc8bf28ce167a936a92de81a4cea9dda77c5f26..3cd1651e45667684825ed2d745110ddd7ef458ee 100644
--- a/incremental/compiler-plugin/src/parameter-transformer.ts
+++ b/incremental/compiler-plugin/src/parameter-transformer.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import { ScopedVisitor } from './ScopedVisitor';
 import {
     FunctionKind,
diff --git a/incremental/compiler-plugin/src/return-transformer.ts b/incremental/compiler-plugin/src/return-transformer.ts
index 9a3e9c630d7729d09e0903d6dbefa495c1a2c7f9..74df10cd38e928f1fe5e682d1b9e132af61470d3 100644
--- a/incremental/compiler-plugin/src/return-transformer.ts
+++ b/incremental/compiler-plugin/src/return-transformer.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import { ScopedVisitor } from "./ScopedVisitor"
 import { FunctionKind, isFunctionOrMethod, isMemoKind, isThis, isThisStable, isVoidOrNotSpecified, runtimeIdentifier, RuntimeNames } from './util'
 
diff --git a/incremental/compiler-plugin/src/this-transformer.ts b/incremental/compiler-plugin/src/this-transformer.ts
index b2d7f92632b1b65940bdd3fe90070f6f14d6b5b6..d7f6c348fe37c14752f07b70961bfb8ad01a3f29 100644
--- a/incremental/compiler-plugin/src/this-transformer.ts
+++ b/incremental/compiler-plugin/src/this-transformer.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import { ScopedVisitor } from './ScopedVisitor';
 import {
     FunctionKind,
diff --git a/incremental/compiler-plugin/src/transformation-context.ts b/incremental/compiler-plugin/src/transformation-context.ts
index 73c7ae48bf5f976e4d515e7c791a10645aeebe60..78909e1fbc10a3c49260290af414060fb4c05ae0 100644
--- a/incremental/compiler-plugin/src/transformation-context.ts
+++ b/incremental/compiler-plugin/src/transformation-context.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from "typescript"
+import * as ts from '@koalaui/ets-tsc'
 import { CallTable, EntryTable, FunctionKind, FunctionTable, PositionalIdTracker, TransformerOptions, VariableTable } from "./util"
 
 export class Rewrite {
diff --git a/incremental/compiler-plugin/src/util.ts b/incremental/compiler-plugin/src/util.ts
index 7f8fe0fd1322e77fcf4aa69e41e1c0444e648ba8..cfd81eb72259806161731c41b9d1d111bb7e3db8 100644
--- a/incremental/compiler-plugin/src/util.ts
+++ b/incremental/compiler-plugin/src/util.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from 'typescript';
+import * as ts from '@koalaui/ets-tsc';
 import * as fs from "fs"
 import { UniqueId } from "@koalaui/common"
 import { Rewrite } from './transformation-context';
@@ -460,6 +460,11 @@ export function hasStaticModifier(node: ts.MethodDeclaration): boolean {
     return node.modifiers?.find(it => it.kind == ts.SyntaxKind.StaticKeyword) != undefined
 }
 
+export function hasMemoDecorator(node: ts.Node): boolean {
+    const decorators = ts.getAllDecorators(node)
+    return !!decorators.find(it => ts.isIdentifier(it.expression) && ts.idText(it.expression) == "memo")
+}
+
 export function error(message: any): any {
     console.log(message)
     console.trace()
diff --git a/incremental/compiler-plugin/src/variable-type-transformer.ts b/incremental/compiler-plugin/src/variable-type-transformer.ts
index 64e8369544f687215ccc068efe26733b4bd47b69..a8cb74eb5f7d12da7cad3e6635947759a40ce7c8 100644
--- a/incremental/compiler-plugin/src/variable-type-transformer.ts
+++ b/incremental/compiler-plugin/src/variable-type-transformer.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import * as ts from "typescript"
+import * as ts from '@koalaui/ets-tsc'
 import { AbstractVisitor } from "./AbstractVisitor";
 import { Rewrite } from "./transformation-context";
 import { createContextTypeImport, FunctionKind, hiddenParameters, skipParenthesizedType, Tracer } from "./util";
diff --git a/incremental/compiler-plugin/test/diagnostics/diagnostics.test.ts b/incremental/compiler-plugin/test/diagnostics/diagnostics.test.ts
index e1236265eadfc23fc76e03158de881420d1b8a3a..f7bf8a98101f59e369cb282b4325d34926da13d4 100644
--- a/incremental/compiler-plugin/test/diagnostics/diagnostics.test.ts
+++ b/incremental/compiler-plugin/test/diagnostics/diagnostics.test.ts
@@ -19,7 +19,7 @@ import * as path from "path"
 
 function runTsc(file: string) {
     let npx = process.platform === "win32" ? "npx.cmd" : "npx"
-    return child.spawnSync(npx, ["tsc", path.join('test', 'diagnostics', 'input', file)])
+    return child.spawnSync(npx, ["ets-tsc", path.join('test', 'diagnostics', 'input', file)])
 }
 
 function diagnostics(name: string, file: string, message: string) {
diff --git a/incremental/demo-playground/package.json b/incremental/demo-playground/package.json
index 6b06290c116dd759d7a144590ca6e9495b996441..2a01209b250619c1957be0abdf2b68c5fb521567 100644
--- a/incremental/demo-playground/package.json
+++ b/incremental/demo-playground/package.json
@@ -16,11 +16,11 @@
   },
   "scripts": {
     "compile": "WEBPACK_NO_MINIMIZE=true webpack --config webpack.config.node.js",
-    "compile:unmemoize": "memo-tsc -b tsconfig-unmemoize.json",
+    "compile:unmemoize": "ets-tsc -b tsconfig-unmemoize.json",
     "compile:run-unmemoized": "npm run compile -- --env tsconfig=tsconfig-run-unmemoized.json --env unmemoized=unmemoized",
     "compile:unmemoizing": "npm run compile:unmemoize && npm run compile:run-unmemoized",
     "compile:arkts": "bash ../tools/panda/arkts/arktsc --arktsconfig arktsconfig.json",
-    "compile:arkts:unmemoize": "memo-tsc -b tsconfig-unmemoize.json",
+    "compile:arkts:unmemoize": "ets-tsc -b tsconfig-unmemoize.json",
     "compile:arkts:unmemoized": "bash ../tools/panda/arkts/arktsc --arktsconfig arktsconfig-run-unmemoized.json build/unmemoized/src/main.ts --output build/unmemoized/src/main.abc",
     "compile:arkts:unmemoizing": "npm run compile:unmemoize && npm run compile:arkts:unmemoized",
     "panda:sdk:install": "cd ../tools/panda && npm run panda:sdk:install",
diff --git a/incremental/demo-playground/webpack.config.node.js b/incremental/demo-playground/webpack.config.node.js
index fabae42912eb2672d6a2fcfa1a6cb155521482fc..e88918692ad86c2f1d5c2504396a8f3ef8e6d480 100644
--- a/incremental/demo-playground/webpack.config.node.js
+++ b/incremental/demo-playground/webpack.config.node.js
@@ -43,6 +43,7 @@ const makeConfig = ({ os, arch, tsconfig, unmemoized }) => ({
                 test: /\.ts$/,
                 loader: "ts-loader",
                 options: {
+                    compiler: "@koalaui/ets-tsc",
                     "projectReferences": true,
                     configFile: tsconfig
                 }
diff --git a/incremental/package.json b/incremental/package.json
index f698a4de54b07e078849fb94cd06d4b91413c8e0..aa7ae3006938b1df4bdd1bd587aa1c96396b4df0 100644
--- a/incremental/package.json
+++ b/incremental/package.json
@@ -25,7 +25,7 @@
     },
     "dependencies": {
         "@koalaui/fast-arktsc": "next",
-        "@koalaui/memo-tsc": "4.9.5",
+        "@koalaui/ets-tsc": "4.9.5-r4",
         "circular-dependency-plugin": "^5.2.2",
         "copy-webpack-plugin": "^12.0.2",
         "source-map-loader": "^5.0.0",
diff --git a/incremental/runtime/package.json b/incremental/runtime/package.json
index 546f115e7b367e6d35cadc69b3094617627b3564..73cdc7e89cd7fe39fd39030a69c4c5e8e37fd1b3 100644
--- a/incremental/runtime/package.json
+++ b/incremental/runtime/package.json
@@ -10,9 +10,9 @@
         "oh-package.json5"
     ],
     "scripts": {
-        "compile": "memo-tsc -p .",
-        "compile:unmemoize": "memo-tsc -p tsconfig-unmemoize.json",
-        "compile:test": "memo-tsc -b tsconfig-test.json",
+    "compile": "ets-tsc -p .",
+    "compile:unmemoize": "ets-tsc -p tsconfig-unmemoize.json",
+    "compile:test": "ets-tsc -b tsconfig-test.json",
         "clean": "rimraf build",
         "test": "mocha",
         "test:coverage": "nyc mocha",
@@ -22,7 +22,7 @@
         "arkts:run:test:harness": "find build/test/app -name test.abc -exec bash ../tools/panda/arkts/ark --ark-boot-files $(find ../compat/build/abc ../common/build/abc ./build/test/lib -name '*.abc' | paste -sd ':' -) {} \\;",
         "arkts:compile:test": "npm run compile:arkts && npm run arkts:compile:test:lib && npm run arkts:compile:test:app",
         "arkts:run:test": "npm run clean && npm run panda:sdk:install && npm run arkts:compile:test && npm run arkts:run:test:harness",
-        "unmemoize": "memo-tsc -b arktsconfig-unmemoize.json",
+    "unmemoize": "ets-tsc -b arktsconfig-unmemoize.json",
         "compile:arkts": "npm run unmemoize && ../tools/panda/arkts/arktsc --arktsconfig arktsconfig-run-unmemoized.json --ets-module",
         "build:compat": "npm run build:compat --prefix ../compat",
         "build:compat:inc": "npm run build:compat:inc --prefix ../compat",
diff --git a/incremental/runtime/src/memo/remember.ts b/incremental/runtime/src/memo/remember.ts
index 090c1a8b98e921b68755b5f7688c5ba3a0b7f437..1c86c826fedcd729a962a2fe2cdf5e4a484b94d6 100644
--- a/incremental/runtime/src/memo/remember.ts
+++ b/incremental/runtime/src/memo/remember.ts
@@ -18,6 +18,9 @@ import { __context, __id } from "../internals"
 import { scheduleCallback } from "../states/GlobalStateManager"
 import { ArrayState, ControlledScope, MutableState } from "../states/State"
 
+@memo
+function foo() {}
+
 /**
  * It calculates the value of the given lambda and caches its result.
  * In contrast to the `remember` function, the given lambda can be recalculated
diff --git a/incremental/runtime/test/tsconfig.json b/incremental/runtime/test/tsconfig.json
index 88cfa1678b44ba23484419c31c3a5fd78df0376f..dcc472ea03e9cdb7f2feb11466fc84f53244944d 100644
--- a/incremental/runtime/test/tsconfig.json
+++ b/incremental/runtime/test/tsconfig.json
@@ -1,6 +1,10 @@
 {
     "extends": "../tsconfig.json",
     "compilerOptions": {
+        "experimentalDecorators": true,
+        "noEmitOnError": false,
+        "composite": false,
+        "incremental": false,
         "baseUrl": "./",
         "outDir": "build/test",
         "module": "CommonJS",
diff --git a/incremental/runtime/tsconfig.json b/incremental/runtime/tsconfig.json
index 1cbc06787c4e68b73847026053fc2a25ef77abb1..46d8d8a9496b9a04f1e7a52dc377779a6b4a5944 100644
--- a/incremental/runtime/tsconfig.json
+++ b/incremental/runtime/tsconfig.json
@@ -5,8 +5,11 @@
         "rootDir": ".",
         "rootDirs": ["src", "test"],
         "module": "CommonJS",
+        "noEmitOnError": false,
+        "composite": false,
+        "incremental": false,
         "plugins": [
-            { "transform": "@koalaui/compiler-plugin/build/lib/src/koala-transformer.js", "contextImport": "../../src/internals", "trace": false }
+            { "transform": "../compiler-plugin/build/lib/src/koala-transformer.js", "contextImport": "../../src/internals", "trace": false }
         ]
     },
     "include": ["src/**/*"],
diff --git a/incremental/test-utils/scripts/register.js b/incremental/test-utils/scripts/register.js
index 63c14bc6a07c770c10c05eb4815d6b8c8079c1b5..6e7df5f8c20a96d306c280e336d6cfd17c74df2f 100644
--- a/incremental/test-utils/scripts/register.js
+++ b/incremental/test-utils/scripts/register.js
@@ -29,4 +29,5 @@ tsNode.register({
     // If uncommented, running tests doesn't perform type checks.
     // transpileOnly: true,
     project: path.resolve(`test`, `tsconfig${unmemoized_suffix}.json`),
+    compiler: "@koalaui/ets-tsc"
 })
diff --git a/incremental/tools/panda/arkts/std-lib/global.d.ts b/incremental/tools/panda/arkts/std-lib/global.d.ts
index d19270e331c7bd01e38af36fe4db85bf5fde828a..d455eef06175829f2c7158cd0d34a8d5823cbbcb 100644
--- a/incremental/tools/panda/arkts/std-lib/global.d.ts
+++ b/incremental/tools/panda/arkts/std-lib/global.d.ts
@@ -3,7 +3,7 @@ declare type int8 = number
 declare type float32 = number
 
 // This is to allow symbols of arkts stdlib
-// to be visible during memo-tsc preprocessing
+// to be visible during ets-tsc preprocessing
 
 declare class StringBuilder {
     constructor(value: string)
diff --git a/interop/package.json b/interop/package.json
index 50327dcde56c9936196431ffb29996476b8d0a07..909462aa0f90543243af577eddb92e3575a8c0c6 100644
--- a/interop/package.json
+++ b/interop/package.json
@@ -41,7 +41,7 @@
     },
     "scripts": {
         "clean": "rimraf dist build types",
-        "compile": "memo-tsc -b .",
+        "compile": "ets-tsc -b .",
         "build:interop": "npm run build:interop:inc",
         "build:interop:inc": "fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../incremental/tools/panda/arkts/arktsc --link-name interop && ninja ${NINJA_OPTIONS} -f build/build.ninja",
         "clean:interop": "npm run clean",
@@ -71,7 +71,7 @@
         "eslint-plugin-unused-imports": "^2.0.0",
         "mocha": "^9.2.2",
         "source-map-support": "^0.5.21",
-        "@koalaui/memo-tsc": "4.9.5",
+        "@koalaui/ets-tsc": "4.9.5-r4",
         "@koalaui/fast-arktsc": "next"
     }
-}
\ No newline at end of file
+}