diff --git a/.github/workflows/cl_vault.yml b/.github/workflows/cl_vault.yml
index e281739f1..a622be662 100644
--- a/.github/workflows/cl_vault.yml
+++ b/.github/workflows/cl_vault.yml
@@ -15,7 +15,7 @@ jobs:
   unit-test:
     uses: ./.github/workflows/rust_basic.yml
     with:
-      contract: 'cl-vault'
+      target: 'contracts/cl-vault'
   test-tube:
     uses: ./.github/workflows/rust_test_tube.yml
     with:
diff --git a/.github/workflows/dex_router_osmosis.yml b/.github/workflows/dex_router_osmosis.yml
index c8aff0d7e..03b819eb5 100644
--- a/.github/workflows/dex_router_osmosis.yml
+++ b/.github/workflows/dex_router_osmosis.yml
@@ -15,7 +15,7 @@ jobs:
   unit-test:
     uses: ./.github/workflows/rust_basic.yml
     with:
-      contract: 'dex-router-osmosis'
+      target: 'contracts/dex-router-osmosis'
   test-tube:
     uses: ./.github/workflows/rust_test_tube.yml
     with:
diff --git a/.github/workflows/lst_adapter_osmosis.yml b/.github/workflows/lst_adapter_osmosis.yml
index 167bf4f58..e663392bd 100644
--- a/.github/workflows/lst_adapter_osmosis.yml
+++ b/.github/workflows/lst_adapter_osmosis.yml
@@ -15,4 +15,4 @@ jobs:
   unit-test:
     uses: ./.github/workflows/rust_basic.yml
     with:
-      contract: 'lst-adapter-osmosis'
+      target: 'contract/lst-adapter-osmosis'
diff --git a/.github/workflows/lst_dex_adapter_osmosis.yml b/.github/workflows/lst_dex_adapter_osmosis.yml
index 3af1ca633..62dd4162a 100644
--- a/.github/workflows/lst_dex_adapter_osmosis.yml
+++ b/.github/workflows/lst_dex_adapter_osmosis.yml
@@ -15,4 +15,4 @@ jobs:
   unit-test:
     uses: ./.github/workflows/rust_basic.yml
     with:
-      contract: 'lst-dex-adapter-osmosis'
+      target: 'contract/lst-dex-adapter-osmosis'
diff --git a/.github/workflows/merkle_incentives.yml b/.github/workflows/merkle_incentives.yml
index b4087363d..b59bb92f3 100644
--- a/.github/workflows/merkle_incentives.yml
+++ b/.github/workflows/merkle_incentives.yml
@@ -15,7 +15,7 @@ jobs:
   unit-test:
     uses: ./.github/workflows/rust_basic.yml
     with:
-      contract: 'merkle-incentives'
+      target: 'contract/merkle-incentives'
   test-tube:
     uses: ./.github/workflows/rust_test_tube.yml
     with:
diff --git a/.github/workflows/quasar_types.yml b/.github/workflows/quasar_types.yml
new file mode 100644
index 000000000..53f574e38
--- /dev/null
+++ b/.github/workflows/quasar_types.yml
@@ -0,0 +1,18 @@
+name: Test quasar-types
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'smart-contracts/packages/quasar-types/**'
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  unit-test:
+    uses: ./.github/workflows/rust_basic.yml
+    with:
+      target: 'packages/quasar-types'
diff --git a/.github/workflows/range_middleware.yml b/.github/workflows/range_middleware.yml
index 32dad1ca8..efa70d174 100644
--- a/.github/workflows/range_middleware.yml
+++ b/.github/workflows/range_middleware.yml
@@ -15,4 +15,4 @@ jobs:
   unit-test:
     uses: ./.github/workflows/rust_basic.yml
     with:
-      contract: 'range-middleware'
+      target: 'contract/range-middleware'
diff --git a/.github/workflows/rust_basic.yml b/.github/workflows/rust_basic.yml
index 68c2a2112..b79ad1d9b 100644
--- a/.github/workflows/rust_basic.yml
+++ b/.github/workflows/rust_basic.yml
@@ -3,7 +3,7 @@ name: Unit Test (rust)
 on:
   workflow_call:
     inputs:
-      contract:
+      target:
         required: true
         type: string
 
@@ -35,12 +35,12 @@ jobs:
       - name: Rust lint
         if: env.GIT_DIFF
         run: RUSTFLAGS="-Dwarnings" cargo clippy --workspace -- -D warnings --A deprecated
-        working-directory: smart-contracts/contracts/${{ inputs.contract }}
+        working-directory: smart-contracts/${{ inputs.target }}
       - name: Rust format check
         if: env.GIT_DIFF
         run: cargo fmt --all -- --check
-        working-directory: smart-contracts/contracts/${{ inputs.contract }}
+        working-directory: smart-contracts/${{ inputs.target }}
       - name: Run unit-tests
         if: env.GIT_DIFF
         run: cargo unit-test
-        working-directory: smart-contracts/contracts/${{ inputs.contract }}
+        working-directory: smart-contracts/${{ inputs.target }}
diff --git a/.github/workflows/token_burner.yml b/.github/workflows/token_burner.yml
index 217a44064..4be264919 100644
--- a/.github/workflows/token_burner.yml
+++ b/.github/workflows/token_burner.yml
@@ -15,4 +15,4 @@ jobs:
   unit-test:
     uses: ./.github/workflows/rust_basic.yml
     with:
-      contract: 'token-burner'
+      target: 'contract/token-burner'
diff --git a/smart-contracts/Cargo.lock b/smart-contracts/Cargo.lock
index d0bdec7f8..62a4a750d 100644
--- a/smart-contracts/Cargo.lock
+++ b/smart-contracts/Cargo.lock
@@ -4496,6 +4496,7 @@ dependencies = [
  "cosmwasm-schema 1.5.4",
  "cosmwasm-std",
  "cw-storage-plus 1.2.0",
+ "cw2 1.1.2",
  "cw20 1.1.2",
  "derive_more",
  "osmosis-std",
diff --git a/smart-contracts/packages/quasar-types/CHANGELOG.md b/smart-contracts/packages/quasar-types/CHANGELOG.md
deleted file mode 100644
index 790f1c64a..000000000
--- a/smart-contracts/packages/quasar-types/CHANGELOG.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# CHANGELOG
-
-## Unreleased
-
-## V0.1.0
-<!-- ### Initial version
-### Dependencies
-### API breaking
-### State breaking
-### Improvements
-### Features
-### Bugfixes -->
\ No newline at end of file
diff --git a/smart-contracts/packages/quasar-types/Cargo.toml b/smart-contracts/packages/quasar-types/Cargo.toml
index e7335776e..e3e1c4bf2 100644
--- a/smart-contracts/packages/quasar-types/Cargo.toml
+++ b/smart-contracts/packages/quasar-types/Cargo.toml
@@ -16,6 +16,7 @@ serde = { workspace = true }
 thiserror = { workspace = true }
 prost = { workspace = true }
 cw20 = { workspace = true }
+cw2 = { workspace = true }
 cosmos-sdk-proto = { workspace = true }
 serde-json-wasm = { workspace = true }
 serde_json = { workspace = true }