diff --git a/package-lock.json b/package-lock.json
index 6d13395..1c02f50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.36-rc1",
+  "version": "0.20.36-rc2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@orionprotocol/sdk",
-      "version": "0.20.36-rc1",
+      "version": "0.20.36-rc2",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
diff --git a/package.json b/package.json
index 16b84f0..8a44bfd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.36-rc1",
+  "version": "0.20.36-rc2",
   "description": "Orion Protocol SDK",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
diff --git a/src/Unit/Exchange/generateSwapCalldata.ts b/src/Unit/Exchange/generateSwapCalldata.ts
index b122f32..e75c8fe 100644
--- a/src/Unit/Exchange/generateSwapCalldata.ts
+++ b/src/Unit/Exchange/generateSwapCalldata.ts
@@ -28,11 +28,11 @@ export type GenerateSwapCalldataWithUnitParams = {
   minReturnAmount: BigNumberish
   initiatorAddress: string
   receiverAddress: string
-  matcher: AddressLike
-  feeToken: AddressLike
-  fee: BigNumberish
   path: ArrayLike<SingleSwap>
   unit: Unit
+  matcher?: AddressLike
+  feeToken?: AddressLike
+  fee?: BigNumberish
 };
 
 export type GenerateSwapCalldataParams = {