diff --git a/.github/workflows/release-new-version.yml b/.github/workflows/release-new-version.yml
index b54e240d96fc..2f8ae7e4819f 100644
--- a/.github/workflows/release-new-version.yml
+++ b/.github/workflows/release-new-version.yml
@@ -23,19 +23,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Generate a token
-        if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
-        id: generate_token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ secrets.HYPERSWITCH_BOT_APP_ID }}
-          private-key: ${{ secrets.HYPERSWITCH_BOT_APP_PRIVATE_KEY }}
-
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.AUTO_RELEASE_PAT }}
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
@@ -51,8 +43,8 @@ jobs:
       - name: Set Git Configuration
         shell: bash
         run: |
-          git config --local user.name 'hyperswitch-bot[bot]'
-          git config --local user.email '148525504+hyperswitch-bot[bot]@users.noreply.github.com'
+          git config --local user.name 'github-actions'
+          git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
 
       - name: Update Postman collection files from Postman directories
         shell: bash
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6197598e564..f2966b238bba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,104 @@ All notable changes to HyperSwitch will be documented here.
 
 - - -
 
+## 1.92.0 (2023-11-29)
+
+### Features
+
+- **analytics:** Add Clickhouse based analytics ([#2988](https://github.com/juspay/hyperswitch/pull/2988)) ([`9df4e01`](https://github.com/juspay/hyperswitch/commit/9df4e0193ffeb6d1cc323bdebb7e2bdfb2a375e2))
+- **ses_email:** Add email services to hyperswitch ([#2977](https://github.com/juspay/hyperswitch/pull/2977)) ([`5f5e895`](https://github.com/juspay/hyperswitch/commit/5f5e895f638701a0e6ab3deea9101ef39033dd16))
+
+### Bug Fixes
+
+- **router:** Make use of warning to log errors when apple pay metadata parsing fails ([#3010](https://github.com/juspay/hyperswitch/pull/3010)) ([`2e57745`](https://github.com/juspay/hyperswitch/commit/2e57745352c547323ac2df2554f6bc2dbd6da37f))
+
+**Full Changelog:** [`v1.91.1...v1.92.0`](https://github.com/juspay/hyperswitch/compare/v1.91.1...v1.92.0)
+
+- - -
+
+
+## 1.91.1 (2023-11-29)
+
+### Bug Fixes
+
+- Remove `dummy_connector` from `default` features in `common_enums` ([#3005](https://github.com/juspay/hyperswitch/pull/3005)) ([`bb593ab`](https://github.com/juspay/hyperswitch/commit/bb593ab0cd1a30190b6c305f2432de83ac7fde93))
+- Remove error propagation if card name not found in locker in case of temporary token ([#3006](https://github.com/juspay/hyperswitch/pull/3006)) ([`5c32b37`](https://github.com/juspay/hyperswitch/commit/5c32b3739e2c5895fe7f5cf8cc92f917c2639eac))
+- Few fields were not getting updated in apply_changeset function ([#3002](https://github.com/juspay/hyperswitch/pull/3002)) ([`d289524`](https://github.com/juspay/hyperswitch/commit/d289524869f0c3835db9cf90d57ebedf560e0291))
+
+### Miscellaneous Tasks
+
+- **deps:** Bump openssl from 0.10.57 to 0.10.60 ([#3004](https://github.com/juspay/hyperswitch/pull/3004)) ([`1c2f35a`](https://github.com/juspay/hyperswitch/commit/1c2f35af92608fca5836448710eca9f9c23a776a))
+
+**Full Changelog:** [`v1.91.0...v1.91.1`](https://github.com/juspay/hyperswitch/compare/v1.91.0...v1.91.1)
+
+- - -
+
+
+## 1.91.0 (2023-11-28)
+
+### Features
+
+- **core:**
+  - [Paypal] Add Preprocessing flow to CompleteAuthorize for Card 3DS Auth Verification ([#2757](https://github.com/juspay/hyperswitch/pull/2757)) ([`77fc92c`](https://github.com/juspay/hyperswitch/commit/77fc92c99a99aaf76d270ba5b981928183a05768))
+  - Enable payment refund when payment is partially captured ([#2991](https://github.com/juspay/hyperswitch/pull/2991)) ([`837480d`](https://github.com/juspay/hyperswitch/commit/837480d935cce8cc35f07c5ccb3560285909bc52))
+- **currency_conversion:** Add currency conversion feature ([#2948](https://github.com/juspay/hyperswitch/pull/2948)) ([`c0116db`](https://github.com/juspay/hyperswitch/commit/c0116db271f6afc1b93c04705209bfc346228c68))
+- **payment_methods:** Receive `card_holder_name` in confirm flow when using token for payment ([#2982](https://github.com/juspay/hyperswitch/pull/2982)) ([`e7ad3a4`](https://github.com/juspay/hyperswitch/commit/e7ad3a4db8823f3ae8d381771739670d8350e6da))
+
+### Bug Fixes
+
+- **connector:** [Adyen] `ErrorHandling` in case of Balance Check for Gift Cards ([#1976](https://github.com/juspay/hyperswitch/pull/1976)) ([`bd889c8`](https://github.com/juspay/hyperswitch/commit/bd889c834dd5e201b055233016f7226fa2187aea))
+- **core:** Replace euclid enum with RoutableConnectors enum ([#2994](https://github.com/juspay/hyperswitch/pull/2994)) ([`ff6a0dd`](https://github.com/juspay/hyperswitch/commit/ff6a0dd0b515778b64a3e28ef905154eee85ec78))
+- Remove error propagation if card name not found in locker ([#2998](https://github.com/juspay/hyperswitch/pull/2998)) ([`1c5a9b5`](https://github.com/juspay/hyperswitch/commit/1c5a9b5452afc33b18f45389bf3bdfd80820f476))
+
+### Refactors
+
+- **events:** Adding changes to type of API events to Kafka ([#2992](https://github.com/juspay/hyperswitch/pull/2992)) ([`d63f6f7`](https://github.com/juspay/hyperswitch/commit/d63f6f7224f35018e7c707353508bbacc2baed5c))
+- **masking:** Use empty enums as masking:Strategy<T> types ([#2874](https://github.com/juspay/hyperswitch/pull/2874)) ([`0e66b1b`](https://github.com/juspay/hyperswitch/commit/0e66b1b5dcce6dd87c9d743c9eb73d0cd8e330b2))
+- **router:** Add openapi spec support for merchant_connector apis ([#2997](https://github.com/juspay/hyperswitch/pull/2997)) ([`cdbb385`](https://github.com/juspay/hyperswitch/commit/cdbb3853cd44443f8487abc16a9ba5d99f22e475))
+- Added min idle and max lifetime for database config ([#2900](https://github.com/juspay/hyperswitch/pull/2900)) ([`b3c51e6`](https://github.com/juspay/hyperswitch/commit/b3c51e6eb55c58adc024ee32b59c3910b2b72131))
+
+### Testing
+
+- **postman:** Update postman collection files ([`af6b05c`](https://github.com/juspay/hyperswitch/commit/af6b05c504b6fdbec7db77fa7f71535d7fea3e7a))
+
+**Full Changelog:** [`v1.90.0...v1.91.0`](https://github.com/juspay/hyperswitch/compare/v1.90.0...v1.91.0)
+
+- - -
+
+
+## 1.90.0 (2023-11-27)
+
+### Features
+
+- **auth:** Add Authorization for JWT Authentication types ([#2973](https://github.com/juspay/hyperswitch/pull/2973)) ([`03c0a77`](https://github.com/juspay/hyperswitch/commit/03c0a772a99000acf4676db8ca2ce916036281d1))
+- **user:** Implement change password for user ([#2959](https://github.com/juspay/hyperswitch/pull/2959)) ([`bfa1645`](https://github.com/juspay/hyperswitch/commit/bfa1645b847fb881eb2370d5dbfef6fd0b53725d))
+
+### Bug Fixes
+
+- **router:** Added validation to check total orderDetails amount equal to amount in request ([#2965](https://github.com/juspay/hyperswitch/pull/2965)) ([`37532d4`](https://github.com/juspay/hyperswitch/commit/37532d46f599a99e0e021b0455a6f02381005dd7))
+- Add prefix to connector_transaction_id ([#2981](https://github.com/juspay/hyperswitch/pull/2981)) ([`107c3b9`](https://github.com/juspay/hyperswitch/commit/107c3b99417dd7bca7b62741ad601485700f37be))
+
+### Refactors
+
+- **connector:** [Nuvei] update error message ([#2867](https://github.com/juspay/hyperswitch/pull/2867)) ([`04b7c03`](https://github.com/juspay/hyperswitch/commit/04b7c0384dc9290bd60f49033fd35732527720f1))
+
+### Testing
+
+- **postman:** Update postman collection files ([`aee59e0`](https://github.com/juspay/hyperswitch/commit/aee59e088a8e7c1b81aca1015c90c7b4fd07511d))
+
+### Documentation
+
+- **try_local_system:** Add instructions to run using Docker Compose by pulling standalone images ([#2984](https://github.com/juspay/hyperswitch/pull/2984)) ([`0fa8ad1`](https://github.com/juspay/hyperswitch/commit/0fa8ad1b7c27010bf83e4035de9881d29e192e8a))
+
+### Miscellaneous Tasks
+
+- **connector:** Update connector addition script ([#2801](https://github.com/juspay/hyperswitch/pull/2801)) ([`34953a0`](https://github.com/juspay/hyperswitch/commit/34953a046429fe0341e8469bd9b036e176bda205))
+
+**Full Changelog:** [`v1.89.0...v1.90.0`](https://github.com/juspay/hyperswitch/compare/v1.89.0...v1.90.0)
+
+- - -
+
+
 ## 1.89.0 (2023-11-24)
 
 ### Features
diff --git a/Cargo.lock b/Cargo.lock
index bf0ee2d110c7..e8719b29f51d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -332,6 +332,36 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
+[[package]]
+name = "analytics"
+version = "0.1.0"
+dependencies = [
+ "actix-web",
+ "api_models",
+ "async-trait",
+ "aws-config",
+ "aws-sdk-lambda",
+ "aws-smithy-types",
+ "bigdecimal",
+ "common_utils",
+ "diesel_models",
+ "error-stack",
+ "external_services",
+ "futures 0.3.28",
+ "masking",
+ "once_cell",
+ "reqwest",
+ "router_env",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "storage_impl",
+ "strum 0.25.0",
+ "thiserror",
+ "time",
+ "tokio 1.32.0",
+]
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -381,7 +411,7 @@ dependencies = [
  "router_derive",
  "serde",
  "serde_json",
- "strum 0.24.1",
+ "strum 0.25.0",
  "time",
  "url",
  "utoipa",
@@ -729,6 +759,31 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "aws-sdk-lambda"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3ad176ffaa3aafa532246eb6a9f18a7d68da19950704ecc95d33d9dc3c62a9b"
+dependencies = [
+ "aws-credential-types",
+ "aws-endpoint",
+ "aws-http",
+ "aws-sig-auth",
+ "aws-smithy-async",
+ "aws-smithy-client",
+ "aws-smithy-http",
+ "aws-smithy-http-tower",
+ "aws-smithy-json",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes 1.5.0",
+ "http",
+ "regex",
+ "tokio-stream",
+ "tower",
+ "tracing",
+]
+
 [[package]]
 name = "aws-sdk-s3"
 version = "0.28.0"
@@ -1148,6 +1203,7 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1186,6 +1242,18 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
 [[package]]
 name = "blake2"
 version = "0.10.6"
@@ -1227,6 +1295,30 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 2.0.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "syn_derive",
+]
+
 [[package]]
 name = "brotli"
 version = "3.4.0"
@@ -1264,6 +1356,28 @@ version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
+[[package]]
+name = "bytecheck"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "bytecount"
 version = "0.6.4"
@@ -1415,6 +1529,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "checked_int_cast"
 version = "1.0.0"
@@ -1858,6 +1978,17 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "currency_conversion"
+version = "0.1.0"
+dependencies = [
+ "common_enums",
+ "rust_decimal",
+ "rusty-money",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.3"
@@ -2264,6 +2395,8 @@ name = "euclid_wasm"
 version = "0.1.0"
 dependencies = [
  "api_models",
+ "common_enums",
+ "currency_conversion",
  "euclid",
  "getrandom 0.2.10",
  "kgraph_utils",
@@ -2289,11 +2422,14 @@ dependencies = [
  "aws-config",
  "aws-sdk-kms",
  "aws-sdk-sesv2",
+ "aws-sdk-sts",
  "aws-smithy-client",
  "base64 0.21.4",
  "common_utils",
  "dyn-clone",
  "error-stack",
+ "hyper",
+ "hyper-proxy",
  "masking",
  "once_cell",
  "router_env",
@@ -2501,6 +2637,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
 [[package]]
 name = "futures"
 version = "0.1.31"
@@ -2784,6 +2926,30 @@ dependencies = [
  "hashbrown 0.14.1",
 ]
 
+[[package]]
+name = "headers"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+dependencies = [
+ "base64 0.21.4",
+ "bytes 1.5.0",
+ "headers-core",
+ "http",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+dependencies = [
+ "http",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -2911,6 +3077,24 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-proxy"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
+dependencies = [
+ "bytes 1.5.0",
+ "futures 0.3.28",
+ "headers",
+ "http",
+ "hyper",
+ "hyper-tls",
+ "native-tls",
+ "tokio 1.32.0",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.23.2"
@@ -3224,6 +3408,7 @@ name = "kgraph_utils"
 version = "0.1.0"
 dependencies = [
  "api_models",
+ "common_enums",
  "criterion",
  "euclid",
  "masking",
@@ -3612,6 +3797,12 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "mutually_exclusive_features"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d02c0b00610773bb7fc61d85e13d86c7858cbdf00e1a120bfc41bc055dbaa0e"
+
 [[package]]
 name = "nanoid"
 version = "0.4.0"
@@ -3733,6 +3924,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "object"
 version = "0.32.1"
@@ -3777,9 +3989,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.57"
+version = "0.10.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
+checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800"
 dependencies = [
  "bitflags 2.4.0",
  "cfg-if 1.0.0",
@@ -3809,9 +4021,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.93"
+version = "0.9.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
+checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f"
 dependencies = [
  "cc",
  "libc",
@@ -4266,6 +4478,25 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.10",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.2",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -4342,6 +4573,26 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "pulldown-cmark"
 version = "0.9.3"
@@ -4415,6 +4666,12 @@ dependencies = [
  "scheduled-thread-pool",
 ]
 
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -4524,6 +4781,36 @@ dependencies = [
  "crossbeam-utils 0.8.16",
 ]
 
+[[package]]
+name = "rdkafka"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54f02a5a40220f8a2dfa47ddb38ba9064475a5807a69504b6f91711df2eea63"
+dependencies = [
+ "futures-channel",
+ "futures-util",
+ "libc",
+ "log",
+ "rdkafka-sys",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "slab",
+ "tokio 1.32.0",
+]
+
+[[package]]
+name = "rdkafka-sys"
+version = "4.7.0+2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55e0d2f9ba6253f6ec72385e453294f8618e9e15c2c6aba2a5c01ccf9622d615"
+dependencies = [
+ "libc",
+ "libz-sys",
+ "num_enum",
+ "pkg-config",
+]
+
 [[package]]
 name = "redis-protocol"
 version = "4.1.0"
@@ -4643,6 +4930,15 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
+[[package]]
+name = "rend"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
+dependencies = [
+ "bytecheck",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.11.22"
@@ -4705,6 +5001,34 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "rkyv"
+version = "0.7.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "ron"
 version = "0.7.1"
@@ -4738,6 +5062,7 @@ dependencies = [
  "actix-multipart",
  "actix-rt",
  "actix-web",
+ "analytics",
  "api_models",
  "argon2",
  "async-bb8-diesel",
@@ -4755,6 +5080,7 @@ dependencies = [
  "common_enums",
  "common_utils",
  "config",
+ "currency_conversion",
  "data_models",
  "derive_deref",
  "diesel",
@@ -4786,6 +5112,7 @@ dependencies = [
  "qrcode",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
+ "rdkafka",
  "redis_interface",
  "regex",
  "reqwest",
@@ -4793,6 +5120,7 @@ dependencies = [
  "router_derive",
  "router_env",
  "roxmltree",
+ "rust_decimal",
  "rustc-hash",
  "scheduler",
  "serde",
@@ -4805,7 +5133,7 @@ dependencies = [
  "sha-1 0.9.8",
  "sqlx",
  "storage_impl",
- "strum 0.24.1",
+ "strum 0.25.0",
  "tera",
  "test_utils",
  "thiserror",
@@ -4917,6 +5245,32 @@ dependencies = [
  "ordered-multimap",
 ]
 
+[[package]]
+name = "rust_decimal"
+version = "1.33.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4"
+dependencies = [
+ "arrayvec",
+ "borsh",
+ "bytes 1.5.0",
+ "num-traits",
+ "rand 0.8.5",
+ "rkyv",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "rust_decimal_macros"
+version = "1.33.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e43721f4ef7060ebc2c3ede757733209564ca8207f47674181bcd425dd76945"
+dependencies = [
+ "quote",
+ "rust_decimal",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -5056,6 +5410,16 @@ dependencies = [
  "wait-timeout",
 ]
 
+[[package]]
+name = "rusty-money"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b28f881005eac7ad8d46b6f075da5f322bd7f4f83a38720fc069694ddadd683"
+dependencies = [
+ "rust_decimal",
+ "rust_decimal_macros",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -5136,6 +5500,12 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
 [[package]]
 name = "security-framework"
 version = "2.9.2"
@@ -5448,6 +5818,12 @@ dependencies = [
  "tokio 1.32.0",
 ]
 
+[[package]]
+name = "simdutf8"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+
 [[package]]
 name = "simple_asn1"
 version = "0.6.2"
@@ -5777,6 +6153,18 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@@ -5822,6 +6210,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
 
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "tempfile"
 version = "3.8.0"
@@ -6329,7 +6723,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.19.10",
 ]
 
 [[package]]
@@ -6351,7 +6745,18 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.4.11",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+dependencies = [
+ "indexmap 2.0.2",
+ "toml_datetime",
+ "winnow 0.5.19",
 ]
 
 [[package]]
@@ -6433,11 +6838,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-actix-web"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a512ec11fae6c666707625e84f83e5d58f941e9ab15723289c0d380edfe48f09"
+checksum = "1fe0d5feac3f4ca21ba33496bcb1ccab58cca6412b1405ae80f0581541e0ca78"
 dependencies = [
  "actix-web",
+ "mutually_exclusive_features",
  "opentelemetry",
  "pin-project",
  "tracing",
@@ -7114,6 +7520,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -7156,6 +7571,15 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
 [[package]]
 name = "x509-parser"
 version = "0.15.1"
diff --git a/Dockerfile b/Dockerfile
index 8eb321dd2afd..e9591e5e9f27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:slim-bookworm as builder
+FROM rust:bookworm as builder
 
 ARG EXTRA_FEATURES=""
 
@@ -36,7 +36,7 @@ RUN cargo build --release --features release ${EXTRA_FEATURES}
 
 
 
-FROM debian:bookworm-slim
+FROM debian:bookworm
 
 # Placing config and binary executable in different directories
 ARG CONFIG_DIR=/local/config
diff --git a/README.md b/README.md
index e820b93e63cc..db8e820ef142 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
   <img src="./docs/imgs/hyperswitch-logo-light.svg#gh-light-mode-only" alt="Hyperswitch-Logo" width="40%" />
 </p>
 
-
 <h1 align="center">The open-source payments switch</h1>
 
 <div align="center" >
@@ -35,7 +34,6 @@ The single API to access payment ecosystems across 130+ countries</div>
   </a>
 </p>
 
-
 <hr>
 <img src="./docs/imgs/switch.png" />
 
@@ -57,14 +55,14 @@ Using Hyperswitch, you can:
   <h2 id="Quick Start Guide">⚡️ Quick Start Guide</h2>
 </a>
 
-<h3> One-click deployment on AWS cloud </h3>
+### One-click deployment on AWS cloud
 
-The fastest and easiest way to try hyperswitch is via our CDK scripts
+The fastest and easiest way to try Hyperswitch is via our CDK scripts
 
 1. Click on the following button for a quick standalone deployment on AWS, suitable for prototyping.
    No code or setup is required in your system and the deployment is covered within the AWS free-tier setup.
 
-&emsp;&emsp; <a href="https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=HyperswitchBootstarp&templateURL=https://hyperswitch-synth.s3.eu-central-1.amazonaws.com/hs-starter-config.yaml"><img src="./docs/imgs/aws_button.png" height="35"></a>
+   <a href="https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=HyperswitchBootstarp&templateURL=https://hyperswitch-synth.s3.eu-central-1.amazonaws.com/hs-starter-config.yaml"><img src="./docs/imgs/aws_button.png" height="35"></a>
 
 2. Sign-in to your AWS console.
 
@@ -72,12 +70,27 @@ The fastest and easiest way to try hyperswitch is via our CDK scripts
 
 For an early access to the production-ready setup fill this <a href="https://forms.gle/v6ru55XDZFufVPnu9">Early Access Form</a>
 
+### Run it on your system
+
+You can run Hyperswitch on your system using Docker Compose after cloning this repository:
+
+```shell
+docker compose up -d
+```
+
+This will start the payments router, the primary component within Hyperswitch.
+
+Check out the [local setup guide][local-setup-guide] for a more comprehensive
+setup, which includes the [scheduler and monitoring services][docker-compose-scheduler-monitoring].
+
+[local-setup-guide]: /docs/try_local_system.md
+[docker-compose-scheduler-monitoring]: /docs/try_local_system.md#run-the-scheduler-and-monitoring-services
+
 <a href="#Fast-Integration-for-Stripe-Users">
   <h2 id="Fast Integration for Stripe Users">🔌 Fast Integration for Stripe Users</h2>
 </a>
 
-If you are already using Stripe, integrating with Hyperswitch is fun, fast &
-easy.
+If you are already using Stripe, integrating with Hyperswitch is fun, fast & easy.
 Try the steps below to get a feel for how quick the setup is:
 
 1. Get API keys from our [dashboard].
@@ -96,9 +109,7 @@ Try the steps below to get a feel for how quick the setup is:
 As of Sept 2023, we support 50+ payment processors and multiple global payment methods.
 In addition, we are continuously integrating new processors based on their reach and community requests.
 Our target is to support 100+ processors by H2 2023.
-You can find the latest list of payment processors, supported methods, and
-features
-[here][supported-connectors-and-features].
+You can find the latest list of payment processors, supported methods, and features [here][supported-connectors-and-features].
 
 [supported-connectors-and-features]: https://hyperswitch.io/pm-list
 
@@ -252,12 +263,11 @@ We welcome contributions from the community. Please read through our
 Included are directions for opening issues, coding standards, and notes on
 development.
 
-- We appreciate all types of contributions: code, documentation, demo creation, or something new way you want to contribute to us. We will reward every contribution with a Hyperswitch branded t-shirt. 
-- 🦀 **Important note for Rust developers**: We aim for contributions from the community
-across a broad range of tracks. Hence, we have prioritised simplicity and code
-readability over purely idiomatic code. For example, some of the code in core
-functions (e.g., `payments_core`) is written to be more readable than
-pure-idiomatic.
+- We appreciate all types of contributions: code, documentation, demo creation, or some new way you want to contribute to us.
+  We will reward every contribution with a Hyperswitch branded t-shirt.
+- 🦀 **Important note for Rust developers**: We aim for contributions from the community across a broad range of tracks.
+  Hence, we have prioritised simplicity and code readability over purely idiomatic code.
+  For example, some of the code in core functions (e.g., `payments_core`) is written to be more readable than pure-idiomatic.
 
 <a href="#Community">
   <h2 id="Community">👥 Community</h2>
@@ -269,7 +279,6 @@ Get updates on Hyperswitch development and chat with the community:
 - [Slack workspace][slack] for questions related to integrating hyperswitch, integrating a connector in hyperswitch, etc.
 - [GitHub Discussions][github-discussions] to drop feature requests or suggest anything payments-related you need for your stack.
 
-[blog]: https://hyperswitch.io/blog
 [discord]: https://discord.gg/wJZ7DVW8mm
 [slack]: https://join.slack.com/t/hyperswitch-io/shared_invite/zt-1k6cz4lee-SAJzhz6bjmpp4jZCDOtOIg
 [github-discussions]: https://github.com/juspay/hyperswitch/discussions
@@ -314,7 +323,6 @@ Check the [CHANGELOG.md](./CHANGELOG.md) file for details.
 
 This product is licensed under the [Apache 2.0 License](LICENSE).
 
-
 <a href="#Thanks to all contributors">
   <h2 id="Thanks to all contributors">✨ Thanks to all contributors</h2>
 </a>
diff --git a/config/config.example.toml b/config/config.example.toml
index 7815f2400d04..d935a4e7f20d 100644
--- a/config/config.example.toml
+++ b/config/config.example.toml
@@ -53,6 +53,16 @@ default_hash_ttl = 900     # Default TTL for hashes entries, in seconds
 use_legacy_version = false # Resp protocol for fred crate (set this to true if using RESPv2 or redis version < 6)
 stream_read_count = 1      # Default number of entries to read from stream if not provided in stream read options
 
+# This section provides configs for currency conversion api
+[forex_api]
+call_delay = 21600                # Api calls are made after every 6 hrs
+local_fetch_retry_count = 5       # Fetch from Local cache has retry count as 5
+local_fetch_retry_delay = 1000    # Retry delay for checking write condition
+api_timeout = 20000               # Api timeouts once it crosses 2000 ms
+api_key = "YOUR API KEY HERE"     # Api key for making request to foreign exchange Api
+fallback_api_key = "YOUR API KEY" # Api key for the fallback service
+redis_lock_timeout = 26000        # Redis remains write locked for 26000 ms once the acquire_redis_lock is called
+
 # Logging configuration. Logging can be either to file or console or both.
 
 # Logging configuration for file logging
@@ -312,9 +322,17 @@ region = "" # The AWS region used by the KMS SDK for decrypting data.
 
 # EmailClient configuration. Only applicable when the `email` feature flag is enabled.
 [email]
-from_email = "notify@example.com" # Sender email
-aws_region = ""                   # AWS region used by AWS SES
-base_url = ""                     # Base url used when adding links that should redirect to self
+sender_email = "example@example.com" # Sender email
+aws_region = ""                      # AWS region used by AWS SES
+base_url = ""                        # Base url used when adding links that should redirect to self
+allowed_unverified_days = 1          # Number of days the api calls ( with jwt token ) can be made without verifying the email
+active_email_client = "SES"          # The currently active email client
+
+# Configuration for aws ses, applicable when the active email client is SES
+[email.aws_ses]
+email_role_arn = ""        # The amazon resource name ( arn ) of the role which has permission to send emails
+sts_role_session_name = "" # An identifier for the assumed role session, used to uniquely identify a session.
+
 
 #tokenization configuration which describe token lifetime and payment method for specific connector
 [tokenization]
@@ -417,9 +435,6 @@ credit = { currency = "USD" }
 debit = { currency = "USD" }
 ach = { currency = "USD" }
 
-[pm_filters.stripe]
-cashapp = { country = "US", currency = "USD" }
-
 [pm_filters.prophetpay]
 card_redirect = { currency = "USD" }
 
diff --git a/config/development.toml b/config/development.toml
index c82607a704c3..fa5fddb0d60a 100644
--- a/config/development.toml
+++ b/config/development.toml
@@ -20,6 +20,7 @@ port = 5432
 dbname = "hyperswitch_db"
 pool_size = 5
 connection_timeout = 10
+min_idle = 2
 
 [replica_database]
 username = "db_user"
@@ -52,6 +53,15 @@ host_rs = ""
 mock_locker = true
 basilisk_host = ""
 
+[forex_api]
+call_delay = 21600
+local_fetch_retry_count = 5
+local_fetch_retry_delay = 1000
+api_timeout = 20000
+api_key = "YOUR API KEY HERE"
+fallback_api_key = "YOUR API KEY HERE"
+redis_lock_timeout = 26000
+
 [jwekey]
 locker_key_identifier1 = ""
 locker_key_identifier2 = ""
@@ -202,9 +212,15 @@ disabled = false
 consumer_group = "SCHEDULER_GROUP"
 
 [email]
-from_email = "notify@example.com"
+sender_email = "example@example.com"
 aws_region = ""
-base_url = ""
+base_url = "http://localhost:8080"
+allowed_unverified_days = 1
+active_email_client = "SES"
+
+[email.aws_ses]
+email_role_arn = ""
+sts_role_session_name = ""
 
 [bank_config.eps]
 stripe = { banks = "arzte_und_apotheker_bank,austrian_anadi_bank_ag,bank_austria,bankhaus_carl_spangler,bankhaus_schelhammer_und_schattera_ag,bawag_psk_ag,bks_bank_ag,brull_kallmus_bank_ag,btv_vier_lander_bank,capital_bank_grawe_gruppe_ag,dolomitenbank,easybank_ag,erste_bank_und_sparkassen,hypo_alpeadriabank_international_ag,hypo_noe_lb_fur_niederosterreich_u_wien,hypo_oberosterreich_salzburg_steiermark,hypo_tirol_bank_ag,hypo_vorarlberg_bank_ag,hypo_bank_burgenland_aktiengesellschaft,marchfelder_bank,oberbank_ag,raiffeisen_bankengruppe_osterreich,schoellerbank_ag,sparda_bank_wien,volksbank_gruppe,volkskreditbank_ag,vr_bank_braunau" }
@@ -459,3 +475,33 @@ delay_between_retries_in_milliseconds = 500
 
 [kv_config]
 ttl = 900 # 15 * 60 seconds
+
+[events]
+source = "logs"
+
+[events.kafka]
+brokers = ["localhost:9092"]
+intent_analytics_topic = "hyperswitch-payment-intent-events"
+attempt_analytics_topic = "hyperswitch-payment-attempt-events"
+refund_analytics_topic = "hyperswitch-refund-events"
+api_logs_topic = "hyperswitch-api-log-events"
+connector_events_topic = "hyperswitch-connector-api-events"
+
+[analytics]
+source = "sqlx"
+
+[analytics.clickhouse]
+username = "default"
+# password = ""
+host = "http://localhost:8123"
+database_name = "default"
+
+[analytics.sqlx]
+username = "db_user"
+password = "db_pass"
+host = "localhost"
+port = 5432
+dbname = "hyperswitch_db"
+pool_size = 5
+connection_timeout = 10
+queue_strategy = "Fifo"
\ No newline at end of file
diff --git a/config/docker_compose.toml b/config/docker_compose.toml
index 986240f0a36b..4d50600e1bf8 100644
--- a/config/docker_compose.toml
+++ b/config/docker_compose.toml
@@ -28,6 +28,15 @@ port = 5432
 dbname = "hyperswitch_db"
 pool_size = 5
 
+[forex_api]
+call_delay = 21600
+local_fetch_retry_count = 5
+local_fetch_retry_delay = 1000
+api_timeout = 20000
+api_key = "YOUR API KEY HERE"
+fallback_api_key = "YOUR API KEY HERE"
+redis_lock_timeout = 26000
+
 [replica_database]
 username = "db_user"
 password = "db_pass"
@@ -324,16 +333,32 @@ supported_connectors = "braintree"
 redis_lock_expiry_seconds = 180 # 3 * 60 seconds
 delay_between_retries_in_milliseconds = 500
 
+[events.kafka]
+brokers = ["localhost:9092"]
+intent_analytics_topic = "hyperswitch-payment-intent-events"
+attempt_analytics_topic = "hyperswitch-payment-attempt-events"
+refund_analytics_topic = "hyperswitch-refund-events"
+api_logs_topic = "hyperswitch-api-log-events"
+connector_events_topic = "hyperswitch-connector-api-events"
+
 [analytics]
 source = "sqlx"
 
+[analytics.clickhouse]
+username = "default"
+# password = ""
+host = "http://localhost:8123"
+database_name = "default"
+
 [analytics.sqlx]
 username = "db_user"
 password = "db_pass"
-host = "pg"
+host = "localhost"
 port = 5432
 dbname = "hyperswitch_db"
 pool_size = 5
+connection_timeout = 10
+queue_strategy = "Fifo"
 
 [kv_config]
 ttl = 900 # 15 * 60 seconds
diff --git a/connector-template/mod.rs b/connector-template/mod.rs
index e441b0e5879a..e9945a726a95 100644
--- a/connector-template/mod.rs
+++ b/connector-template/mod.rs
@@ -106,6 +106,7 @@ impl ConnectorCommon for {{project-name | downcase | pascal_case}} {
             message: response.message,
             reason: response.reason,
             attempt_status: None,
+            connector_transaction_id: None,
         })
     }
 }
@@ -485,7 +486,7 @@ impl api::IncomingWebhook for {{project-name | downcase | pascal_case}} {
     fn get_webhook_resource_object(
         &self,
         _request: &api::IncomingWebhookRequestDetails<'_>,
-    ) -> CustomResult<Box<dyn erased_serde::Serialize>, errors::ConnectorError> {
+    ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {
         Err(errors::ConnectorError::WebhooksNotImplemented).into_report()
     }
 }
diff --git a/connector-template/test.rs b/connector-template/test.rs
index 5bbf761dea19..7b093ddb6efa 100644
--- a/connector-template/test.rs
+++ b/connector-template/test.rs
@@ -17,6 +17,7 @@ impl utils::Connector for {{project-name | downcase | pascal_case}}Test {
             connector: Box::new(&{{project-name | downcase | pascal_case}}),
             connector_name: types::Connector::{{project-name | downcase | pascal_case}},
             get_token: types::api::GetToken::Connector,
+            merchant_connector_id: None,
         }
     }
 
diff --git a/connector-template/transformers.rs b/connector-template/transformers.rs
index 3ed53a906a2e..bdbfb2e45672 100644
--- a/connector-template/transformers.rs
+++ b/connector-template/transformers.rs
@@ -130,6 +130,7 @@ impl<F,T> TryFrom<types::ResponseRouterData<F, {{project-name | downcase | pasca
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/analytics/Cargo.toml b/crates/analytics/Cargo.toml
new file mode 100644
index 000000000000..f49fe322ae3b
--- /dev/null
+++ b/crates/analytics/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "analytics"
+version = "0.1.0"
+description = "Analytics / Reports related functionality"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+
+[dependencies]
+# First party crates
+api_models = { version = "0.1.0", path = "../api_models" , features = ["errors"]}
+storage_impl = { version = "0.1.0", path = "../storage_impl", default-features = false }
+common_utils = { version = "0.1.0", path = "../common_utils"}
+external_services = { version = "0.1.0", path = "../external_services", default-features = false}
+masking = { version = "0.1.0", path = "../masking" }
+router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] }
+diesel_models = { version = "0.1.0", path = "../diesel_models", features = ["kv_store"] }
+
+#Third Party dependencies
+actix-web = "4.3.1"
+async-trait = "0.1.68"
+aws-config = { version = "0.55.3" }
+aws-sdk-lambda = { version = "0.28.0" }
+aws-smithy-types = { version = "0.55.3" }
+bigdecimal = { version = "0.3.1", features = ["serde"] }
+error-stack = "0.3.1"
+futures = "0.3.28"
+once_cell = "1.18.0"
+reqwest = { version = "0.11.18", features = ["serde_json"] }
+serde = { version = "1.0.163", features = ["derive", "rc"] }
+serde_json = "1.0.96"
+sqlx = { version = "0.6.3", features = ["postgres", "runtime-actix", "runtime-actix-native-tls", "time", "bigdecimal"] }
+strum = { version = "0.25.0", features = ["derive"] }
+thiserror = "1.0.43"
+time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
+tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] }
diff --git a/crates/analytics/docs/clickhouse/README.md b/crates/analytics/docs/clickhouse/README.md
new file mode 100644
index 000000000000..2fd48a30c29f
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/README.md
@@ -0,0 +1,45 @@
+#### Starting the containers
+
+In our use case we rely on kafka for ingesting events.
+hence we can use docker compose to start all the components
+
+```
+docker compose up -d clickhouse-server kafka-ui
+```
+
+> kafka-ui is a visual tool for inspecting kafka on localhost:8090
+
+#### Setting up Clickhouse
+
+Once clickhouse is up & running you need to create the required tables for it
+
+you can either visit the url (http://localhost:8123/play) in which the clickhouse-server is running to get a playground
+Alternatively you can bash into the clickhouse container & execute commands manually
+```
+# On your local terminal
+docker compose exec clickhouse-server bash
+
+# Inside the clickhouse-server container shell
+clickhouse-client --user default
+
+# Inside the clickhouse-client shell
+SHOW TABLES;
+CREATE TABLE ......
+```
+
+The table creation scripts are provided [here](./scripts)
+
+#### Running/Debugging your application
+Once setup you can run your application either via docker compose or normally via cargo run
+
+Remember to enable the kafka_events via development.toml/docker_compose.toml files
+
+Inspect the [kafka-ui](http://localhost:8090) to check the messages being inserted in queue
+
+If the messages/topic are available then you can run select queries on your clickhouse table to ensure data is being populated...
+
+If the data is not being populated in clickhouse, you can check the error logs in clickhouse server via
+```
+# Inside the clickhouse-server container shell
+tail -f /var/log/clickhouse-server/clickhouse-server.err.log
+```
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/README.md b/crates/analytics/docs/clickhouse/cluster_setup/README.md
new file mode 100644
index 000000000000..cd5f2dfeb023
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/README.md
@@ -0,0 +1,347 @@
+# Tutorial for set up clickhouse server
+
+
+## Single server with docker
+
+
+- Run server
+
+```
+docker run -d --name clickhouse-server -p 9000:9000 --ulimit nofile=262144:262144 yandex/clickhouse-server
+
+```
+
+- Run client
+
+```
+docker run -it --rm --link clickhouse-server:clickhouse-server yandex/clickhouse-client  --host clickhouse-server
+```
+
+Now you can see if it success setup or not.
+
+
+## Setup Cluster
+
+
+This part we will setup
+
+- 1 cluster, with 3 shards
+- Each shard has 2 replica server
+- Use ReplicatedMergeTree & Distributed table to setup our table.
+
+
+### Cluster
+
+Let's see our docker-compose.yml first.
+
+```
+version: '3'
+
+services:
+    clickhouse-zookeeper:
+        image: zookeeper
+        ports:
+            - "2181:2181"
+            - "2182:2182"
+        container_name: clickhouse-zookeeper
+        hostname: clickhouse-zookeeper
+
+    clickhouse-01:
+        image: yandex/clickhouse-server
+        hostname: clickhouse-01
+        container_name: clickhouse-01
+        ports:
+            - 9001:9000
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-01.xml:/etc/clickhouse-server/config.d/macros.xml
+                # - ./data/server-01:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-02:
+        image: yandex/clickhouse-server
+        hostname: clickhouse-02
+        container_name: clickhouse-02
+        ports:
+            - 9002:9000
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-02.xml:/etc/clickhouse-server/config.d/macros.xml
+                # - ./data/server-02:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-03:
+        image: yandex/clickhouse-server
+        hostname: clickhouse-03
+        container_name: clickhouse-03
+        ports:
+            - 9003:9000
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-03.xml:/etc/clickhouse-server/config.d/macros.xml
+                # - ./data/server-03:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-04:
+        image: yandex/clickhouse-server
+        hostname: clickhouse-04
+        container_name: clickhouse-04
+        ports:
+            - 9004:9000
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-04.xml:/etc/clickhouse-server/config.d/macros.xml
+                # - ./data/server-04:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-05:
+        image: yandex/clickhouse-server
+        hostname: clickhouse-05
+        container_name: clickhouse-05
+        ports:
+            - 9005:9000
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-05.xml:/etc/clickhouse-server/config.d/macros.xml
+                # - ./data/server-05:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-06:
+        image: yandex/clickhouse-server
+        hostname: clickhouse-06
+        container_name: clickhouse-06
+        ports:
+            - 9006:9000
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-06.xml:/etc/clickhouse-server/config.d/macros.xml
+                # - ./data/server-06:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+networks:
+    default:
+        external:
+            name: clickhouse-net
+```
+
+
+We have 6 clickhouse server container and one zookeeper container.
+
+
+**To enable replication ZooKeeper is required. ClickHouse will take care of data consistency on all replicas and run restore procedure after failure automatically. It's recommended to deploy ZooKeeper cluster to separate servers.**
+
+**ZooKeeper is not a requirement — in some simple cases you can duplicate the data by writing it into all the replicas from your application code. This approach is not recommended — in this case ClickHouse is not able to guarantee data consistency on all replicas. This remains the responsibility of your application.**
+
+
+Let's see config file.
+
+`./config/clickhouse_config.xml` is the default config file in docker, we copy it out and add this line
+
+```
+    <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
+         By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
+         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+      -->
+    <include_from>/etc/clickhouse-server/metrika.xml</include_from>
+```
+
+
+So lets see `clickhouse_metrika.xml`
+
+```
+<yandex>
+	<clickhouse_remote_servers>
+		<cluster_1>
+			<shard>
+                                <weight>1</weight>
+                                <internal_replication>true</internal_replication>
+				<replica>
+					<host>clickhouse-01</host>
+					<port>9000</port>
+				</replica>
+				<replica>
+					<host>clickhouse-06</host>
+					<port>9000</port>
+				</replica>
+			</shard>
+			<shard>
+                                <weight>1</weight>
+                                <internal_replication>true</internal_replication>
+				<replica>
+					<host>clickhouse-02</host>
+					<port>9000</port>
+				</replica>
+				<replica>
+					<host>clickhouse-03</host>
+					<port>9000</port>
+				</replica>
+			</shard>
+			<shard>
+                                <weight>1</weight>
+                                <internal_replication>true</internal_replication>
+
+				<replica>
+					<host>clickhouse-04</host>
+					<port>9000</port>
+				</replica>
+				<replica>
+					<host>clickhouse-05</host>
+					<port>9000</port>
+				</replica>
+			</shard>
+		</cluster_1>
+	</clickhouse_remote_servers>
+        <zookeeper-servers>
+            <node index="1">
+                <host>clickhouse-zookeeper</host>
+                <port>2181</port>
+            </node>
+        </zookeeper-servers>
+        <networks>
+            <ip>::/0</ip>
+        </networks>
+        <clickhouse_compression>
+            <case>
+                <min_part_size>10000000000</min_part_size>
+                <min_part_size_ratio>0.01</min_part_size_ratio>
+                <method>lz4</method>
+            </case>
+        </clickhouse_compression>
+</yandex>
+```
+
+and macros.xml, each instances has there own macros settings, like server 1: 
+
+```
+<yandex>
+    <macros>
+        <replica>clickhouse-01</replica>
+        <shard>01</shard>
+        <layer>01</layer>
+    </macros>
+</yandex>
+```
+
+
+**Make sure your macros settings is equal to remote server settings in metrika.xml**
+
+So now you can start the server.
+
+```
+docker network create clickhouse-net
+docker-compose up -d
+```
+
+Conn to server and see if the cluster settings fine;
+
+```
+docker run -it --rm --network="clickhouse-net" --link clickhouse-01:clickhouse-server yandex/clickhouse-client --host clickhouse-server
+```
+
+```sql
+clickhouse-01 :) select * from system.clusters;
+
+SELECT *
+FROM system.clusters 
+
+┌─cluster─────────────────────┬─shard_num─┬─shard_weight─┬─replica_num─┬─host_name─────┬─host_address─┬─port─┬─is_local─┬─user────┬─default_database─┐
+│ cluster_1                   │         1 │            1 │           1 │ clickhouse-01 │ 172.21.0.4   │ 9000 │        1 │ default │                  │
+│ cluster_1                   │         1 │            1 │           2 │ clickhouse-06 │ 172.21.0.5   │ 9000 │        1 │ default │                  │
+│ cluster_1                   │         2 │            1 │           1 │ clickhouse-02 │ 172.21.0.8   │ 9000 │        0 │ default │                  │
+│ cluster_1                   │         2 │            1 │           2 │ clickhouse-03 │ 172.21.0.6   │ 9000 │        0 │ default │                  │
+│ cluster_1                   │         3 │            1 │           1 │ clickhouse-04 │ 172.21.0.7   │ 9000 │        0 │ default │                  │
+│ cluster_1                   │         3 │            1 │           2 │ clickhouse-05 │ 172.21.0.3   │ 9000 │        0 │ default │                  │
+│ test_shard_localhost        │         1 │            1 │           1 │ localhost     │ 127.0.0.1    │ 9000 │        1 │ default │                  │
+│ test_shard_localhost_secure │         1 │            1 │           1 │ localhost     │ 127.0.0.1    │ 9440 │        0 │ default │                  │
+└─────────────────────────────┴───────────┴──────────────┴─────────────┴───────────────┴──────────────┴──────┴──────────┴─────────┴──────────────────┘
+```
+
+If you see this, it means cluster's settings work well(but not conn fine).
+
+
+### Replica Table
+
+So now we have a cluster and replica settings. For clickhouse, we need to create ReplicatedMergeTree Table as a local table in every server.
+
+```sql
+CREATE TABLE ttt (id Int32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/ttt', '{replica}') PARTITION BY id ORDER BY id
+```
+
+and Create Distributed Table conn to local table
+
+```sql
+CREATE TABLE ttt_all as ttt ENGINE = Distributed(cluster_1, default, ttt, rand());
+```
+
+
+### Insert and test
+
+gen some data and test.
+
+
+```
+# docker exec into client server 1 and
+for ((idx=1;idx<=100;++idx)); do clickhouse-client --host clickhouse-server --query "Insert into default.ttt_all values ($idx)"; done;
+```
+
+For Distributed table.
+
+```
+select count(*) from ttt_all;
+```
+
+For loacl table.
+
+```
+select count(*) from ttt;
+```
+
+
+## Authentication
+
+Please see config/users.xml
+
+
+- Conn
+```bash
+docker run -it --rm --network="clickhouse-net" --link clickhouse-01:clickhouse-server yandex/clickhouse-client --host clickhouse-server -u user1 --password 123456
+```
+
+## Source
+
+- https://clickhouse.yandex/docs/en/operations/table_engines/replication/#creating-replicated-tables
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/clickhouse_config.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/clickhouse_config.xml
new file mode 100644
index 000000000000..94c854dc273a
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/clickhouse_config.xml
@@ -0,0 +1,370 @@
+<?xml version="1.0"?>
+<yandex>
+    <logger>
+        <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
+        <level>error</level>
+        <size>1000M</size>
+        <console>1</console>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+    </logger>
+    <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+
+    <!-- For HTTPS and SSL over native protocol. -->
+    <!--
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+    -->
+
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <server> <!-- Used for https server AND secure tcp port -->
+            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
+            <certificateFile>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
+            <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+
+        <client> <!-- Used for connecting to https dictionary source -->
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
+            <invalidCertificateHandler>
+                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
+    <!--
+    <http_server_default_response><![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]></http_server_default_response>
+    -->
+
+    <!-- Port for communication between replicas. Used for data exchange. -->
+    <interserver_http_port>9009</interserver_http_port>
+
+    <!-- Hostname that is used by other replicas to request this server.
+         If not specified, than it is determined analogous to 'hostname -f' command.
+         This setting could be used to switch replication to another network interface.
+      -->
+    <!--
+    <interserver_http_host>example.yandex.ru</interserver_http_host>
+    -->
+
+    <!-- Listen specified host. use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere. -->
+    <!-- <listen_host>::</listen_host> -->
+    <!-- Same for hosts with disabled ipv6: -->
+    <!-- <listen_host>0.0.0.0</listen_host> -->
+
+    <!-- Default values - try listen localhost on ipv4 and ipv6: -->
+    <!--
+    <listen_host>::1</listen_host>
+    <listen_host>127.0.0.1</listen_host>
+    -->
+    <!-- Don't exit if ipv6 or ipv4 unavailable, but listen_host with this protocol specified -->
+    <!-- <listen_try>0</listen_try> -->
+
+    <!-- Allow listen on same address:port -->
+    <!-- <listen_reuse_port>0</listen_reuse_port> -->
+
+    <!-- <listen_backlog>64</listen_backlog> -->
+
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+
+    <!-- Maximum number of concurrent queries. -->
+    <max_concurrent_queries>100</max_concurrent_queries>
+
+    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+         correct maximum value. -->
+    <!-- <max_open_files>262144</max_open_files> -->
+
+    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+         Uncompressed cache is advantageous only for very short queries and in rare cases.
+      -->
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <!-- Approximate size of mark cache, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         You should not lower this value.
+      -->
+    <mark_cache_size>5368709120</mark_cache_size>
+
+
+    <!-- Path to data directory, with trailing slash. -->
+    <path>/var/lib/clickhouse/</path>
+
+    <!-- Path to temporary data for processing hard queries. -->
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
+    <users_config>users.xml</users_config>
+
+    <!-- Default profile of settings. -->
+    <default_profile>default</default_profile>
+
+    <!-- System profile of settings. This settings are used by internal processes (Buffer storage, Distributed DDL worker and so on). -->
+    <!-- <system_profile>default</system_profile> -->
+
+    <!-- Default database. -->
+    <default_database>default</default_database>
+
+    <!-- Server time zone could be set here.
+
+         Time zone is used when converting between String and DateTime types,
+          when printing DateTime in text formats and parsing DateTime from text,
+          it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+         If not specified, system time zone at server startup is used.
+
+         Please note, that server could display time zone alias instead of specified name.
+         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+    -->
+    <!-- <timezone>Europe/Moscow</timezone> -->
+
+    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
+         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+    -->
+    <!-- <umask>022</umask> -->
+
+    <!-- Configuration of clusters that could be used in Distributed tables.
+         https://clickhouse.yandex/docs/en/table_engines/distributed/
+      -->
+    <remote_servers incl="clickhouse_remote_servers" >
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+    </remote_servers>
+
+
+    <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
+         By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
+         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+      -->
+    <include_from>/etc/clickhouse-server/metrika.xml</include_from>
+    <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
+         Optional. If you don't use replicated tables, you could omit that.
+
+         See https://clickhouse.yandex/docs/en/table_engines/replication/
+      -->
+    <zookeeper incl="zookeeper-servers" optional="true" />
+
+    <!-- Substitutions for parameters of replicated tables.
+          Optional. If you don't use replicated tables, you could omit that.
+
+         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+      -->
+    <macros incl="macros" optional="true" />
+
+
+    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
+    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
+
+
+    <!-- Maximum session timeout, in seconds. Default: 3600. -->
+    <max_session_timeout>3600</max_session_timeout>
+
+    <!-- Default session timeout, in seconds. Default: 60. -->
+    <default_session_timeout>60</default_session_timeout>
+
+    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
+    <!--
+        interval - send every X second
+        root_path - prefix for keys
+        hostname_in_path - append hostname to root_path (default = true)
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>60</interval>
+        <root_path>one_min</root_path>
+        <hostname_in_path>true</hostname_in_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </graphite>
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>1</interval>
+        <root_path>one_sec</root_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>false</asynchronous_metrics>
+    </graphite>
+    -->
+
+
+    <!-- Query log. Used only for queries with setting log_queries = 1. -->
+    <query_log>
+        <!-- What table to insert data. If table is not exist, it will be created.
+             When query log structure is changed after system update,
+              then old table will be renamed and new table will be created automatically.
+        -->
+        <database>system</database>
+        <table>query_log</table>
+        <!--
+            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            Example:
+                event_date
+                toMonday(event_date)
+                toYYYYMM(event_date)
+                toStartOfHour(event_time)
+        -->
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <!-- Interval of flushing data. -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+
+    <!-- Uncomment if use part_log
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </part_log>
+    -->
+
+
+    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
+         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+    -->
+
+    <!-- Path to file with region hierarchy. -->
+    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
+
+    <!-- Path to directory with files containing names of regions -->
+    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+
+
+    <!-- Configuration of external dictionaries. See:
+         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+    -->
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+
+    <!-- Uncomment if you want data to be compressed 30-100% better.
+         Don't do that if you just started using ClickHouse.
+      -->
+    <compression incl="clickhouse_compression">
+    <!--
+        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
+        <case>
+
+            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
+            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
+            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
+
+            <!- - What compression method to use. - ->
+            <method>zstd</method>
+        </case>
+    -->
+    </compression>
+
+    <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
+         Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
+    <distributed_ddl>
+        <!-- Path in ZooKeeper to queue with DDL queries -->
+        <path>/clickhouse/task_queue/ddl</path>
+
+        <!-- Settings from this profile will be used to execute DDL queries -->
+        <!-- <profile>default</profile> -->
+    </distributed_ddl>
+
+    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <merge_tree>
+        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+    </merge_tree>
+    -->
+
+    <!-- Protection from accidental DROP.
+         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+         If you want do delete one table and don't want to restart clickhouse-server, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+         The same for max_partition_size_to_drop.
+         Uncomment to disable protection.
+    -->
+    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
+    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
+
+    <!-- Example of parameters for GraphiteMergeTree table engine -->
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+
+    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+         The directory will be created if it doesn't exist.
+      -->
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+
+    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
+    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
+</yandex>
+
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/clickhouse_metrika.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/clickhouse_metrika.xml
new file mode 100644
index 000000000000..b58ffc34bc29
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/clickhouse_metrika.xml
@@ -0,0 +1,60 @@
+<yandex>
+	<clickhouse_remote_servers>
+		<cluster_1>
+			<shard>
+                                <weight>1</weight>
+                                <internal_replication>true</internal_replication>
+				<replica>
+					<host>clickhouse-01</host>
+					<port>9000</port>
+				</replica>
+				<replica>
+					<host>clickhouse-06</host>
+					<port>9000</port>
+				</replica>
+			</shard>
+			<shard>
+                                <weight>1</weight>
+                                <internal_replication>true</internal_replication>
+				<replica>
+					<host>clickhouse-02</host>
+					<port>9000</port>
+				</replica>
+				<replica>
+					<host>clickhouse-03</host>
+					<port>9000</port>
+				</replica>
+			</shard>
+			<shard>
+                                <weight>1</weight>
+                                <internal_replication>true</internal_replication>
+
+				<replica>
+					<host>clickhouse-04</host>
+					<port>9000</port>
+				</replica>
+				<replica>
+					<host>clickhouse-05</host>
+					<port>9000</port>
+				</replica>
+			</shard>
+		</cluster_1>
+	</clickhouse_remote_servers>
+        <zookeeper-servers>
+            <node index="1">
+                <host>clickhouse-zookeeper</host>
+                <port>2181</port>
+            </node>
+        </zookeeper-servers>
+        <networks>
+            <ip>::/0</ip>
+        </networks>
+        <clickhouse_compression>
+            <case>
+                <min_part_size>10000000000</min_part_size>
+                <min_part_size_ratio>0.01</min_part_size_ratio>
+                <method>lz4</method>
+            </case>
+        </clickhouse_compression>
+</yandex>
+
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-01.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-01.xml
new file mode 100644
index 000000000000..75df1c5916e8
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-01.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <macros>
+        <replica>clickhouse-01</replica>
+        <shard>01</shard>
+        <layer>01</layer>
+        <installation>data</installation>
+        <cluster>cluster_1</cluster>
+    </macros>
+</yandex>
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-02.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-02.xml
new file mode 100644
index 000000000000..67e4a545b30c
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-02.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <macros>
+        <replica>clickhouse-02</replica>
+        <shard>02</shard>
+        <layer>01</layer>
+        <installation>data</installation>
+        <cluster>cluster_1</cluster>
+    </macros>
+</yandex>
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-03.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-03.xml
new file mode 100644
index 000000000000..e9278191b80f
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-03.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <macros>
+        <replica>clickhouse-03</replica>
+        <shard>02</shard>
+        <layer>01</layer>
+        <installation>data</installation>
+        <cluster>cluster_1</cluster>
+    </macros>
+</yandex>
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-04.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-04.xml
new file mode 100644
index 000000000000..033c0ad1152e
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-04.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <macros>
+        <replica>clickhouse-04</replica>
+        <shard>03</shard>
+        <layer>01</layer>
+        <installation>data</installation>
+        <cluster>cluster_1</cluster>
+    </macros>
+</yandex>
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-05.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-05.xml
new file mode 100644
index 000000000000..c63314c5acea
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-05.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <macros>
+        <replica>clickhouse-05</replica>
+        <shard>03</shard>
+        <layer>01</layer>
+        <installation>data</installation>
+        <cluster>cluster_1</cluster>
+    </macros>
+</yandex>
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-06.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-06.xml
new file mode 100644
index 000000000000..4b01bda9948c
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/macros/macros-06.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <macros>
+        <replica>clickhouse-06</replica>
+        <shard>01</shard>
+        <layer>01</layer>
+        <installation>data</installation>
+        <cluster>cluster_1</cluster>
+    </macros>
+</yandex>
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/config/users.xml b/crates/analytics/docs/clickhouse/cluster_setup/config/users.xml
new file mode 100644
index 000000000000..e1b8de78e37a
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/config/users.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<yandex>
+    <!-- Profiles of settings. -->
+    <profiles>
+        <!-- Default settings. -->
+        <default>
+            <!-- Maximum memory usage for processing single query, in bytes. -->
+            <max_memory_usage>10000000000</max_memory_usage>
+
+            <!-- Use cache of uncompressed blocks of data. Meaningful only for processing many of very short queries. -->
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+
+            <!-- How to choose between replicas during distributed query processing.
+                 random - choose random replica from set of replicas with minimum number of errors
+                 nearest_hostname - from set of replicas with minimum number of errors, choose replica
+                  with minimum number of different symbols between replica's hostname and local hostname
+                  (Hamming distance).
+                 in_order - first live replica is chosen in specified order.
+            -->
+            <load_balancing>random</load_balancing>
+        </default>
+
+        <!-- Profile that allows only read queries. -->
+        <readonly>
+            <readonly>1</readonly>
+        </readonly>
+    </profiles>
+
+    <!-- Users and ACL. -->
+    <users>
+        <user1>
+            <password>123456</password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </user1>
+        <!-- If user name was not specified, 'default' user is used. -->
+        <default>
+            <!-- Password could be specified in plaintext or in SHA256 (in hex format).
+
+                 If you want to specify password in plaintext (not recommended), place it in 'password' element.
+                 Example: <password>qwerty</password>.
+                 Password could be empty.
+
+                 If you want to specify SHA256, place it in 'password_sha256_hex' element.
+                 Example: <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>
+
+                 How to generate decent password:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
+                 In first line will be password and in second - corresponding SHA256.
+            -->
+            <password></password>
+
+            <!-- List of networks with open access.
+
+                 To open access from everywhere, specify:
+                    <ip>::/0</ip>
+
+                 To open access only from localhost, specify:
+                    <ip>::1</ip>
+                    <ip>127.0.0.1</ip>
+
+                 Each element of list has one of the following forms:
+                 <ip> IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
+		     2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
+                 <host> Hostname. Example: server01.yandex.ru.
+                     To check access, DNS query is performed, and all received addresses compared to peer address.
+                 <host_regexp> Regular expression for host names. Example, ^server\d\d-\d\d-\d\.yandex\.ru$
+                     To check access, DNS PTR query is performed for peer address and then regexp is applied.
+                     Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
+                     Strongly recommended that regexp is ends with $
+                 All results of DNS requests are cached till server restart.
+            -->
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+
+            <!-- Settings profile for user. -->
+            <profile>default</profile>
+
+            <!-- Quota for user. -->
+            <quota>default</quota>
+        </default>
+
+        <!-- Example of user with readonly access. -->
+        <readonly>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::1</ip>
+                <ip>127.0.0.1</ip>
+            </networks>
+            <profile>readonly</profile>
+            <quota>default</quota>
+        </readonly>
+    </users>
+
+    <!-- Quotas. -->
+    <quotas>
+        <!-- Name of quota. -->
+        <default>
+            <!-- Limits for time interval. You could specify many intervals with different limits. -->
+            <interval>
+                <!-- Length of interval. -->
+                <duration>3600</duration>
+
+                <!-- No limits. Just calculate resource usage for time interval. -->
+                <queries>0</queries>
+                <errors>0</errors>
+                <result_rows>0</result_rows>
+                <read_rows>0</read_rows>
+                <execution_time>0</execution_time>
+            </interval>
+        </default>
+    </quotas>
+</yandex>
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/docker-compose.yml b/crates/analytics/docs/clickhouse/cluster_setup/docker-compose.yml
new file mode 100644
index 000000000000..96d7618b47e6
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/docker-compose.yml
@@ -0,0 +1,198 @@
+version: '3'
+
+networks:
+  ckh_net:
+
+services:
+    clickhouse-zookeeper:
+        image: zookeeper
+        ports:
+            - "2181:2181"
+            - "2182:2182"
+        container_name: clickhouse-zookeeper
+        hostname: clickhouse-zookeeper
+        networks:
+            - ckh_net
+
+    clickhouse-01:
+        image: clickhouse/clickhouse-server
+        hostname: clickhouse-01
+        container_name: clickhouse-01
+        networks:
+            - ckh_net
+        ports:
+            - 9001:9000
+            - 8124:8123
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-01.xml:/etc/clickhouse-server/config.d/macros.xml
+                - ./config/users.xml:/etc/clickhouse-server/users.xml
+                # - ./data/server-01:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-02:
+        image: clickhouse/clickhouse-server
+        hostname: clickhouse-02
+        container_name: clickhouse-02
+        networks:
+            - ckh_net
+        ports:
+            - 9002:9000
+            - 8125:8123
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-02.xml:/etc/clickhouse-server/config.d/macros.xml
+                - ./config/users.xml:/etc/clickhouse-server/users.xml
+                # - ./data/server-02:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-03:
+        image: clickhouse/clickhouse-server
+        hostname: clickhouse-03
+        container_name: clickhouse-03
+        networks:
+            - ckh_net
+        ports:
+            - 9003:9000
+            - 8126:8123
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-03.xml:/etc/clickhouse-server/config.d/macros.xml
+                - ./config/users.xml:/etc/clickhouse-server/users.xml
+                # - ./data/server-03:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-04:
+        image: clickhouse/clickhouse-server
+        hostname: clickhouse-04
+        container_name: clickhouse-04
+        networks:
+            - ckh_net
+        ports:
+            - 9004:9000
+            - 8127:8123
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-04.xml:/etc/clickhouse-server/config.d/macros.xml
+                - ./config/users.xml:/etc/clickhouse-server/users.xml
+                # - ./data/server-04:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-05:
+        image: clickhouse/clickhouse-server
+        hostname: clickhouse-05
+        container_name: clickhouse-05
+        networks:
+            - ckh_net
+        ports:
+            - 9005:9000
+            - 8128:8123
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-05.xml:/etc/clickhouse-server/config.d/macros.xml
+                - ./config/users.xml:/etc/clickhouse-server/users.xml
+                # - ./data/server-05:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    clickhouse-06:
+        image: clickhouse/clickhouse-server
+        hostname: clickhouse-06
+        container_name: clickhouse-06
+        networks:
+            - ckh_net
+        ports:
+            - 9006:9000
+            - 8129:8123
+        volumes:
+                - ./config/clickhouse_config.xml:/etc/clickhouse-server/config.xml
+                - ./config/clickhouse_metrika.xml:/etc/clickhouse-server/metrika.xml
+                - ./config/macros/macros-06.xml:/etc/clickhouse-server/config.d/macros.xml
+                - ./config/users.xml:/etc/clickhouse-server/users.xml
+                # - ./data/server-06:/var/lib/clickhouse
+        ulimits:
+            nofile:
+                soft: 262144
+                hard: 262144
+        depends_on:
+            - "clickhouse-zookeeper"
+
+    kafka0:
+        image: confluentinc/cp-kafka:7.0.5
+        hostname: kafka0
+        container_name: kafka0
+        ports:
+        - 9092:9092
+        - 9093
+        - 9997
+        - 29092
+        environment:
+            KAFKA_BROKER_ID: 1
+            KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+            KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
+            KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+            KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+            KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+            KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+            KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+            KAFKA_PROCESS_ROLES: 'broker,controller'
+            KAFKA_NODE_ID: 1
+            KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+            KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+            KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+            KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+            JMX_PORT: 9997
+            KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
+        volumes:
+        - ./kafka-script.sh:/tmp/update_run.sh
+        command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+        networks:
+            ckh_net:
+                aliases:
+                    - hyper-c1-kafka-brokers.kafka-cluster.svc.cluster.local
+
+
+  # Kafka UI for debugging kafka queues
+    kafka-ui:
+        container_name: kafka-ui
+        image: provectuslabs/kafka-ui:latest
+        ports:
+        - 8090:8080
+        depends_on:
+        - kafka0
+        networks:
+            - ckh_net
+        environment:
+            KAFKA_CLUSTERS_0_NAME: local
+            KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
+            KAFKA_CLUSTERS_0_JMXPORT: 9997
+
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/kafka-script.sh b/crates/analytics/docs/clickhouse/cluster_setup/kafka-script.sh
new file mode 100755
index 000000000000..023c832b4e1b
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/kafka-script.sh
@@ -0,0 +1,11 @@
+# This script is required to run kafka cluster (without zookeeper)
+#!/bin/sh
+
+# Docker workaround: Remove check for KAFKA_ZOOKEEPER_CONNECT parameter
+sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure
+
+# Docker workaround: Ignore cub zk-ready
+sed -i 's/cub zk-ready/echo ignore zk-ready/' /etc/confluent/docker/ensure
+
+# KRaft required step: Format the storage directory with a new cluster ID
+echo "kafka-storage format --ignore-formatted -t $(kafka-storage random-uuid) -c /etc/kafka/kafka.properties" >> /etc/confluent/docker/ensure
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/scripts/api_event_logs.sql b/crates/analytics/docs/clickhouse/cluster_setup/scripts/api_event_logs.sql
new file mode 100644
index 000000000000..0fe194a0e676
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/scripts/api_event_logs.sql
@@ -0,0 +1,237 @@
+CREATE TABLE hyperswitch.api_events_queue on cluster '{cluster}' (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `request_id` String,
+    `flow_type` LowCardinality(String),
+    `api_name` LowCardinality(String),
+    `request` String,
+    `response` String,
+    `status_code` UInt32,
+    `url_path` LowCardinality(Nullable(String)),
+    `event_type` LowCardinality(Nullable(String)),
+    `created_at` DateTime CODEC(T64, LZ4),
+    `latency` Nullable(UInt128),
+    `user_agent` Nullable(String),
+    `ip_addr` Nullable(String)
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'hyper-c1-kafka-brokers.kafka-cluster.svc.cluster.local:9092',
+kafka_topic_list = 'hyperswitch-api-log-events',
+kafka_group_name = 'hyper-c1',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
+
+
+CREATE TABLE hyperswitch.api_events_clustered on cluster '{cluster}' (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `request_id` Nullable(String),
+    `flow_type` LowCardinality(String),
+    `api_name` LowCardinality(String),
+    `request` String,
+    `response` String,
+    `status_code` UInt32,
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `latency` Nullable(UInt128),
+    `user_agent` Nullable(String),
+    `ip_addr` Nullable(String),
+    INDEX flowIndex flow_type TYPE bloom_filter GRANULARITY 1,
+    INDEX apiIndex api_name TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex status_code TYPE bloom_filter GRANULARITY 1
+) ENGINE = ReplicatedMergeTree(
+    '/clickhouse/{installation}/{cluster}/tables/{shard}/hyperswitch/api_events_clustered',
+    '{replica}'
+)
+PARTITION BY toStartOfDay(created_at)
+ORDER BY
+	(created_at, merchant_id, flow_type, status_code, api_name)
+TTL created_at + toIntervalMonth(6)
+;
+
+
+CREATE TABLE hyperswitch.api_events_dist on cluster '{cluster}' (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `request_id` Nullable(String),
+    `flow_type` LowCardinality(String),
+    `api_name` LowCardinality(String),
+    `request` String,
+    `response` String,
+    `status_code` UInt32,
+    `url_path` LowCardinality(Nullable(String)),
+    `event_type` LowCardinality(Nullable(String)),
+    `inserted_at` DateTime64(3),
+    `created_at` DateTime64(3),
+    `latency` Nullable(UInt128),
+    `user_agent` Nullable(String),
+    `ip_addr` Nullable(String)
+) ENGINE = Distributed('{cluster}', 'hyperswitch', 'api_events_clustered', rand());
+
+CREATE MATERIALIZED VIEW hyperswitch.api_events_mv on cluster '{cluster}' TO hyperswitch.api_events_dist (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `request_id` Nullable(String),
+    `flow_type` LowCardinality(String),
+    `api_name` LowCardinality(String),
+    `request` String,
+    `response` String,
+    `status_code` UInt32,
+    `url_path` LowCardinality(Nullable(String)),
+    `event_type` LowCardinality(Nullable(String)),
+    `inserted_at` DateTime64(3),
+    `created_at` DateTime64(3),
+    `latency` Nullable(UInt128),
+    `user_agent` Nullable(String),
+    `ip_addr` Nullable(String)
+) AS
+SELECT
+    merchant_id,
+    payment_id,
+    refund_id,
+    payment_method_id,
+    payment_method,
+    payment_method_type,
+    customer_id,
+    user_id,
+    request_id,
+    flow_type,
+    api_name,
+    request,
+    response,
+    status_code,
+    url_path,
+    event_type,
+    now() as inserted_at,
+    created_at,
+    latency,
+    user_agent,
+    ip_addr
+FROM
+    hyperswitch.api_events_queue
+WHERE length(_error) = 0;
+
+
+CREATE MATERIALIZED VIEW hyperswitch.api_events_parse_errors on cluster '{cluster}'
+(
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String
+)
+ENGINE = MergeTree
+ORDER BY (topic, partition, offset)
+SETTINGS index_granularity = 8192 AS
+SELECT
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error
+FROM hyperswitch.api_events_queue
+WHERE length(_error) > 0
+;
+
+
+ALTER TABLE hyperswitch.api_events_clustered on cluster '{cluster}' ADD COLUMN `url_path` LowCardinality(Nullable(String));
+ALTER TABLE hyperswitch.api_events_clustered on cluster '{cluster}' ADD COLUMN `event_type` LowCardinality(Nullable(String));
+
+
+CREATE TABLE hyperswitch.api_audit_log ON CLUSTER '{cluster}' (
+    `merchant_id` LowCardinality(String),
+    `payment_id` String,
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `user_id` Nullable(String),
+    `request_id` Nullable(String),
+    `flow_type` LowCardinality(String),
+    `api_name` LowCardinality(String),
+    `request` String,
+    `response` String,
+    `status_code` UInt32,
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `latency` Nullable(UInt128),
+    `user_agent` Nullable(String),
+    `ip_addr` Nullable(String),
+    `url_path` LowCardinality(Nullable(String)),
+    `event_type` LowCardinality(Nullable(String)),
+    `customer_id` LowCardinality(Nullable(String))
+) ENGINE = ReplicatedMergeTree( '/clickhouse/{installation}/{cluster}/tables/{shard}/hyperswitch/api_audit_log', '{replica}' ) PARTITION BY merchant_id
+ORDER BY (merchant_id, payment_id) 
+TTL created_at + toIntervalMonth(18) 
+SETTINGS index_granularity = 8192
+
+
+CREATE MATERIALIZED VIEW hyperswitch.api_audit_log_mv ON CLUSTER `{cluster}` TO hyperswitch.api_audit_log(
+    `merchant_id` LowCardinality(String),
+    `payment_id` String,
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `request_id` Nullable(String),
+    `flow_type` LowCardinality(String),
+    `api_name` LowCardinality(String),
+    `request` String,
+    `response` String,
+    `status_code` UInt32,
+    `url_path` LowCardinality(Nullable(String)),
+    `event_type` LowCardinality(Nullable(String)),
+    `inserted_at` DateTime64(3),
+    `created_at` DateTime64(3),
+    `latency` Nullable(UInt128),
+    `user_agent` Nullable(String),
+    `ip_addr` Nullable(String)
+) AS 
+SELECT 
+    merchant_id,
+    multiIf(payment_id IS NULL, '', payment_id) AS payment_id,
+    refund_id,
+    payment_method_id,
+    payment_method,
+    payment_method_type,
+    customer_id,
+    user_id,
+    request_id,
+    flow_type,
+    api_name,
+    request,
+    response,
+    status_code,
+    url_path,
+    api_event_type AS event_type,
+    now() AS inserted_at,
+    created_at,
+    latency,
+    user_agent,
+    ip_addr
+FROM hyperswitch.api_events_queue
+WHERE length(_error) = 0
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/scripts/payment_attempts.sql b/crates/analytics/docs/clickhouse/cluster_setup/scripts/payment_attempts.sql
new file mode 100644
index 000000000000..3a6281ae9050
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/scripts/payment_attempts.sql
@@ -0,0 +1,217 @@
+CREATE TABLE hyperswitch.payment_attempt_queue on cluster '{cluster}' (
+    `payment_id` String,
+    `merchant_id` String,
+    `attempt_id` String,
+    `status` LowCardinality(String),
+    `amount` Nullable(UInt32),
+    `currency` LowCardinality(Nullable(String)),
+    `connector` LowCardinality(Nullable(String)),
+    `save_to_locker` Nullable(Bool),
+    `error_message` Nullable(String),
+    `offer_amount` Nullable(UInt32),
+    `surcharge_amount` Nullable(UInt32),
+    `tax_amount` Nullable(UInt32),
+    `payment_method_id` Nullable(String),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_method_type` LowCardinality(Nullable(String)),
+    `connector_transaction_id` Nullable(String),
+    `capture_method` LowCardinality(Nullable(String)),
+    `capture_on` Nullable(DateTime) CODEC(T64, LZ4),
+    `confirm` Bool,
+    `authentication_type` LowCardinality(Nullable(String)),
+    `cancellation_reason` Nullable(String),
+    `amount_to_capture` Nullable(UInt32),
+    `mandate_id` Nullable(String),
+    `browser_info` Nullable(String),
+    `error_code` Nullable(String),
+    `connector_metadata` Nullable(String),
+    `payment_experience` Nullable(String),
+    `created_at` DateTime CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `modified_at` DateTime CODEC(T64, LZ4),
+    `sign_flag` Int8
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
+kafka_topic_list = 'hyperswitch-payment-attempt-events',
+kafka_group_name = 'hyper-c1',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
+
+
+CREATE TABLE hyperswitch.payment_attempt_dist on cluster '{cluster}' (
+    `payment_id` String,
+    `merchant_id` String,
+    `attempt_id` String,
+    `status` LowCardinality(String),
+    `amount` Nullable(UInt32),
+    `currency` LowCardinality(Nullable(String)),
+    `connector` LowCardinality(Nullable(String)),
+    `save_to_locker` Nullable(Bool),
+    `error_message` Nullable(String),
+    `offer_amount` Nullable(UInt32),
+    `surcharge_amount` Nullable(UInt32),
+    `tax_amount` Nullable(UInt32),
+    `payment_method_id` Nullable(String),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_method_type` LowCardinality(Nullable(String)),
+    `connector_transaction_id` Nullable(String),
+    `capture_method` Nullable(String),
+    `capture_on` Nullable(DateTime) CODEC(T64, LZ4),
+    `confirm` Bool,
+    `authentication_type` LowCardinality(Nullable(String)),
+    `cancellation_reason` Nullable(String),
+    `amount_to_capture` Nullable(UInt32),
+    `mandate_id` Nullable(String),
+    `browser_info` Nullable(String),
+    `error_code` Nullable(String),
+    `connector_metadata` Nullable(String),
+    `payment_experience` Nullable(String),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8
+) ENGINE = Distributed('{cluster}', 'hyperswitch', 'payment_attempt_clustered', cityHash64(attempt_id));
+
+
+
+CREATE MATERIALIZED VIEW hyperswitch.payment_attempt_mv on cluster '{cluster}' TO hyperswitch.payment_attempt_dist (
+    `payment_id` String,
+    `merchant_id` String,
+    `attempt_id` String,
+    `status` LowCardinality(String),
+    `amount` Nullable(UInt32),
+    `currency` LowCardinality(Nullable(String)),
+    `connector` LowCardinality(Nullable(String)),
+    `save_to_locker` Nullable(Bool),
+    `error_message` Nullable(String),
+    `offer_amount` Nullable(UInt32),
+    `surcharge_amount` Nullable(UInt32),
+    `tax_amount` Nullable(UInt32),
+    `payment_method_id` Nullable(String),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_method_type` LowCardinality(Nullable(String)),
+    `connector_transaction_id` Nullable(String),
+    `capture_method` Nullable(String),
+    `confirm` Bool,
+    `authentication_type` LowCardinality(Nullable(String)),
+    `cancellation_reason` Nullable(String),
+    `amount_to_capture` Nullable(UInt32),
+    `mandate_id` Nullable(String),
+    `browser_info` Nullable(String),
+    `error_code` Nullable(String),
+    `connector_metadata` Nullable(String),
+    `payment_experience` Nullable(String),
+    `created_at` DateTime64(3),
+    `capture_on` Nullable(DateTime64(3)),
+    `last_synced` Nullable(DateTime64(3)),
+    `modified_at` DateTime64(3),
+    `inserted_at` DateTime64(3),
+    `sign_flag` Int8
+) AS
+SELECT
+    payment_id,
+    merchant_id,
+    attempt_id,
+    status,
+    amount,
+    currency,
+    connector,
+    save_to_locker,
+    error_message,
+    offer_amount,
+    surcharge_amount,
+    tax_amount,
+    payment_method_id,
+    payment_method,
+    payment_method_type,
+    connector_transaction_id,
+    capture_method,
+    confirm,
+    authentication_type,
+    cancellation_reason,
+    amount_to_capture,
+    mandate_id,
+    browser_info,
+    error_code,
+    connector_metadata,
+    payment_experience,
+    created_at,
+    capture_on,
+    last_synced,
+    modified_at,
+    now() as inserted_at,
+    sign_flag
+FROM
+    hyperswitch.payment_attempt_queue
+WHERE length(_error) = 0;
+
+
+CREATE TABLE hyperswitch.payment_attempt_clustered on cluster '{cluster}' (
+    `payment_id` String,
+    `merchant_id` String,
+    `attempt_id` String,
+    `status` LowCardinality(String),
+    `amount` Nullable(UInt32),
+    `currency` LowCardinality(Nullable(String)),
+    `connector` LowCardinality(Nullable(String)),
+    `save_to_locker` Nullable(Bool),
+    `error_message` Nullable(String),
+    `offer_amount` Nullable(UInt32),
+    `surcharge_amount` Nullable(UInt32),
+    `tax_amount` Nullable(UInt32),
+    `payment_method_id` Nullable(String),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_method_type` LowCardinality(Nullable(String)),
+    `connector_transaction_id` Nullable(String),
+    `capture_method` Nullable(String),
+    `capture_on` Nullable(DateTime) CODEC(T64, LZ4),
+    `confirm` Bool,
+    `authentication_type` LowCardinality(Nullable(String)),
+    `cancellation_reason` Nullable(String),
+    `amount_to_capture` Nullable(UInt32),
+    `mandate_id` Nullable(String),
+    `browser_info` Nullable(String),
+    `error_code` Nullable(String),
+    `connector_metadata` Nullable(String),
+    `payment_experience` Nullable(String),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8,
+    INDEX connectorIndex connector TYPE bloom_filter GRANULARITY 1,
+    INDEX paymentMethodIndex payment_method TYPE bloom_filter GRANULARITY 1,
+    INDEX authenticationTypeIndex authentication_type TYPE bloom_filter GRANULARITY 1,
+    INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex status TYPE bloom_filter GRANULARITY 1
+) ENGINE = ReplicatedCollapsingMergeTree(
+    '/clickhouse/{installation}/{cluster}/tables/{shard}/hyperswitch/payment_attempt_clustered',
+    '{replica}',
+    sign_flag
+)
+PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (created_at, merchant_id, attempt_id)
+TTL created_at + toIntervalMonth(6)
+;
+
+CREATE MATERIALIZED VIEW hyperswitch.payment_attempt_parse_errors on cluster '{cluster}'
+(
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String
+)
+ENGINE = MergeTree
+ORDER BY (topic, partition, offset)
+SETTINGS index_granularity = 8192 AS
+SELECT
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error
+FROM hyperswitch.payment_attempt_queue
+WHERE length(_error) > 0
+;
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/scripts/payment_intents.sql b/crates/analytics/docs/clickhouse/cluster_setup/scripts/payment_intents.sql
new file mode 100644
index 000000000000..eb2d83140e92
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/scripts/payment_intents.sql
@@ -0,0 +1,165 @@
+CREATE TABLE hyperswitch.payment_intents_queue on cluster '{cluster}' (
+    `payment_id` String,
+    `merchant_id` String,
+    `status` LowCardinality(String),
+    `amount` UInt32,
+    `currency` LowCardinality(Nullable(String)),
+    `amount_captured` Nullable(UInt32),
+    `customer_id` Nullable(String),
+    `description` Nullable(String),
+    `return_url` Nullable(String),
+    `connector_id` LowCardinality(Nullable(String)),
+    `statement_descriptor_name` Nullable(String),
+    `statement_descriptor_suffix` Nullable(String),
+    `setup_future_usage` LowCardinality(Nullable(String)),
+    `off_session` Nullable(Bool),
+    `client_secret` Nullable(String),
+    `active_attempt_id` String,
+    `business_country` String,
+    `business_label` String,
+    `modified_at` DateTime,
+    `created_at` DateTime,
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `sign_flag` Int8
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
+kafka_topic_list = 'hyperswitch-payment-intent-events',
+kafka_group_name = 'hyper-c1',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
+
+CREATE TABLE hyperswitch.payment_intents_dist on cluster '{cluster}' (
+    `payment_id` String,
+    `merchant_id` String,
+    `status` LowCardinality(String),
+    `amount` UInt32,
+    `currency` LowCardinality(Nullable(String)),
+    `amount_captured` Nullable(UInt32),
+    `customer_id` Nullable(String),
+    `description` Nullable(String),
+    `return_url` Nullable(String),
+    `connector_id` LowCardinality(Nullable(String)),
+    `statement_descriptor_name` Nullable(String),
+    `statement_descriptor_suffix` Nullable(String),
+    `setup_future_usage` LowCardinality(Nullable(String)),
+    `off_session` Nullable(Bool),
+    `client_secret` Nullable(String),
+    `active_attempt_id` String,
+    `business_country` LowCardinality(String),
+    `business_label` String,
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8
+) ENGINE = Distributed('{cluster}', 'hyperswitch', 'payment_intents_clustered', cityHash64(payment_id));
+
+CREATE TABLE hyperswitch.payment_intents_clustered on cluster '{cluster}' (
+    `payment_id` String,
+    `merchant_id` String,
+    `status` LowCardinality(String),
+    `amount` UInt32,
+    `currency` LowCardinality(Nullable(String)),
+    `amount_captured` Nullable(UInt32),
+    `customer_id` Nullable(String),
+    `description` Nullable(String),
+    `return_url` Nullable(String),
+    `connector_id` LowCardinality(Nullable(String)),
+    `statement_descriptor_name` Nullable(String),
+    `statement_descriptor_suffix` Nullable(String),
+    `setup_future_usage` LowCardinality(Nullable(String)),
+    `off_session` Nullable(Bool),
+    `client_secret` Nullable(String),
+    `active_attempt_id` String,
+    `business_country` LowCardinality(String),
+    `business_label` String,
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8,
+    INDEX connectorIndex connector_id TYPE bloom_filter GRANULARITY 1,
+    INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex status TYPE bloom_filter GRANULARITY 1
+) ENGINE = ReplicatedCollapsingMergeTree(
+    '/clickhouse/{installation}/{cluster}/tables/{shard}/hyperswitch/payment_intents_clustered',
+    '{replica}',
+    sign_flag
+)
+PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (created_at, merchant_id, payment_id)
+TTL created_at + toIntervalMonth(6)
+;
+
+CREATE MATERIALIZED VIEW hyperswitch.payment_intent_mv on cluster '{cluster}' TO hyperswitch.payment_intents_dist (
+    `payment_id` String,
+    `merchant_id` String,
+    `status` LowCardinality(String),
+    `amount` UInt32,
+    `currency` LowCardinality(Nullable(String)),
+    `amount_captured` Nullable(UInt32),
+    `customer_id` Nullable(String),
+    `description` Nullable(String),
+    `return_url` Nullable(String),
+    `connector_id` LowCardinality(Nullable(String)),
+    `statement_descriptor_name` Nullable(String),
+    `statement_descriptor_suffix` Nullable(String),
+    `setup_future_usage` LowCardinality(Nullable(String)),
+    `off_session` Nullable(Bool),
+    `client_secret` Nullable(String),
+    `active_attempt_id` String,
+    `business_country` LowCardinality(String),
+    `business_label` String,
+    `modified_at` DateTime64(3),
+    `created_at` DateTime64(3),
+    `last_synced` Nullable(DateTime64(3)),
+    `inserted_at` DateTime64(3),
+    `sign_flag` Int8
+) AS
+SELECT
+    payment_id,
+    merchant_id,
+    status,
+    amount,
+    currency,
+    amount_captured,
+    customer_id,
+    description,
+    return_url,
+    connector_id,
+    statement_descriptor_name,
+    statement_descriptor_suffix,
+    setup_future_usage,
+    off_session,
+    client_secret,
+    active_attempt_id,
+    business_country,
+    business_label,
+    modified_at,
+    created_at,
+    last_synced,
+    now() as inserted_at,
+    sign_flag
+FROM hyperswitch.payment_intents_queue
+WHERE length(_error) = 0;
+
+CREATE MATERIALIZED VIEW hyperswitch.payment_intent_parse_errors on cluster '{cluster}'
+(
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String
+)
+ENGINE = MergeTree
+ORDER BY (topic, partition, offset)
+SETTINGS index_granularity = 8192 AS
+SELECT
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error
+FROM hyperswitch.payment_intents_queue
+WHERE length(_error) > 0
+;
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/scripts/refund_analytics.sql b/crates/analytics/docs/clickhouse/cluster_setup/scripts/refund_analytics.sql
new file mode 100644
index 000000000000..bf5f6e0e2405
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/scripts/refund_analytics.sql
@@ -0,0 +1,173 @@
+CREATE TABLE hyperswitch.refund_queue on cluster '{cluster}' (
+    `internal_reference_id` String,
+    `refund_id` String,
+    `payment_id` String,
+    `merchant_id` String,
+    `connector_transaction_id` String,
+    `connector` LowCardinality(Nullable(String)),
+    `connector_refund_id` Nullable(String),
+    `external_reference_id` Nullable(String),
+    `refund_type` LowCardinality(String),
+    `total_amount` Nullable(UInt32),
+    `currency` LowCardinality(String),
+    `refund_amount` Nullable(UInt32),
+    `refund_status` LowCardinality(String),
+    `sent_to_gateway` Bool,
+    `refund_error_message` Nullable(String),
+    `refund_arn` Nullable(String),
+    `attempt_id` String,
+    `description` Nullable(String),
+    `refund_reason` Nullable(String),
+    `refund_error_code` Nullable(String),
+    `created_at` DateTime,
+    `modified_at` DateTime,
+    `sign_flag` Int8
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
+kafka_topic_list = 'hyperswitch-refund-events',
+kafka_group_name = 'hyper-c1',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
+
+CREATE TABLE hyperswitch.refund_dist on cluster '{cluster}' (
+    `internal_reference_id` String,
+    `refund_id` String,
+    `payment_id` String,
+    `merchant_id` String,
+    `connector_transaction_id` String,
+    `connector` LowCardinality(Nullable(String)),
+    `connector_refund_id` Nullable(String),
+    `external_reference_id` Nullable(String),
+    `refund_type` LowCardinality(String),
+    `total_amount` Nullable(UInt32),
+    `currency` LowCardinality(String),
+    `refund_amount` Nullable(UInt32),
+    `refund_status` LowCardinality(String),
+    `sent_to_gateway` Bool,
+    `refund_error_message` Nullable(String),
+    `refund_arn` Nullable(String),
+    `attempt_id` String,
+    `description` Nullable(String),
+    `refund_reason` Nullable(String),
+    `refund_error_code` Nullable(String),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8
+) ENGINE = Distributed('{cluster}', 'hyperswitch', 'refund_clustered', cityHash64(refund_id));
+
+
+
+CREATE TABLE hyperswitch.refund_clustered on cluster '{cluster}' (
+    `internal_reference_id` String,
+    `refund_id` String,
+    `payment_id` String,
+    `merchant_id` String,
+    `connector_transaction_id` String,
+    `connector` LowCardinality(Nullable(String)),
+    `connector_refund_id` Nullable(String),
+    `external_reference_id` Nullable(String),
+    `refund_type` LowCardinality(String),
+    `total_amount` Nullable(UInt32),
+    `currency` LowCardinality(String),
+    `refund_amount` Nullable(UInt32),
+    `refund_status` LowCardinality(String),
+    `sent_to_gateway` Bool,
+    `refund_error_message` Nullable(String),
+    `refund_arn` Nullable(String),
+    `attempt_id` String,
+    `description` Nullable(String),
+    `refund_reason` Nullable(String),
+    `refund_error_code` Nullable(String),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8,
+    INDEX connectorIndex connector TYPE bloom_filter GRANULARITY 1,
+    INDEX refundTypeIndex refund_type TYPE bloom_filter GRANULARITY 1,
+    INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex refund_status TYPE bloom_filter GRANULARITY 1
+) ENGINE = ReplicatedCollapsingMergeTree(
+    '/clickhouse/{installation}/{cluster}/tables/{shard}/hyperswitch/refund_clustered',
+    '{replica}',
+    sign_flag
+)
+PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (created_at, merchant_id, refund_id)
+TTL created_at + toIntervalMonth(6)
+;
+
+CREATE MATERIALIZED VIEW hyperswitch.kafka_parse_refund on cluster '{cluster}' TO hyperswitch.refund_dist (
+    `internal_reference_id` String,
+    `refund_id` String,
+    `payment_id` String,
+    `merchant_id` String,
+    `connector_transaction_id` String,
+    `connector` LowCardinality(Nullable(String)),
+    `connector_refund_id` Nullable(String),
+    `external_reference_id` Nullable(String),
+    `refund_type` LowCardinality(String),
+    `total_amount` Nullable(UInt32),
+    `currency` LowCardinality(String),
+    `refund_amount` Nullable(UInt32),
+    `refund_status` LowCardinality(String),
+    `sent_to_gateway` Bool,
+    `refund_error_message` Nullable(String),
+    `refund_arn` Nullable(String),
+    `attempt_id` String,
+    `description` Nullable(String),
+    `refund_reason` Nullable(String),
+    `refund_error_code` Nullable(String),
+    `created_at` DateTime64(3),
+    `modified_at` DateTime64(3),
+    `inserted_at` DateTime64(3),
+    `sign_flag` Int8
+) AS
+SELECT
+    internal_reference_id,
+    refund_id,
+    payment_id,
+    merchant_id,
+    connector_transaction_id,
+    connector,
+    connector_refund_id,
+    external_reference_id,
+    refund_type,
+    total_amount,
+    currency,
+    refund_amount,
+    refund_status,
+    sent_to_gateway,
+    refund_error_message,
+    refund_arn,
+    attempt_id,
+    description,
+    refund_reason,
+    refund_error_code,
+    created_at,
+    modified_at,
+    now() as inserted_at,
+    sign_flag
+FROM hyperswitch.refund_queue
+WHERE length(_error) = 0;
+
+CREATE MATERIALIZED VIEW hyperswitch.refund_parse_errors on cluster '{cluster}'
+(
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String
+)
+ENGINE = MergeTree
+ORDER BY (topic, partition, offset)
+SETTINGS index_granularity = 8192 AS
+SELECT
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error
+FROM hyperswitch.refund_queue
+WHERE length(_error) > 0
+;
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/scripts/sdk_events.sql b/crates/analytics/docs/clickhouse/cluster_setup/scripts/sdk_events.sql
new file mode 100644
index 000000000000..37766392bc70
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/scripts/sdk_events.sql
@@ -0,0 +1,156 @@
+CREATE TABLE hyperswitch.sdk_events_queue on cluster '{cluster}' ( 
+    `payment_id` Nullable(String),
+    `merchant_id` String,
+    `remote_ip` Nullable(String),
+    `log_type` LowCardinality(Nullable(String)),
+    `event_name` LowCardinality(Nullable(String)),
+    `first_event` LowCardinality(Nullable(String)),
+    `latency` Nullable(UInt32),
+    `timestamp` String,
+    `browser_name` LowCardinality(Nullable(String)),
+    `browser_version` Nullable(String),
+    `platform` LowCardinality(Nullable(String)),
+    `source` LowCardinality(Nullable(String)),
+    `category` LowCardinality(Nullable(String)),
+    `version` LowCardinality(Nullable(String)),
+    `value` Nullable(String),
+    `component` LowCardinality(Nullable(String)),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_experience` LowCardinality(Nullable(String))
+) ENGINE = Kafka SETTINGS
+    kafka_broker_list = 'hyper-c1-kafka-brokers.kafka-cluster.svc.cluster.local:9092', 
+    kafka_topic_list = 'hyper-sdk-logs', 
+    kafka_group_name = 'hyper-c1', 
+    kafka_format = 'JSONEachRow', 
+    kafka_handle_error_mode = 'stream';
+
+CREATE TABLE hyperswitch.sdk_events_clustered on cluster '{cluster}' ( 
+    `payment_id` Nullable(String),
+    `merchant_id` String,
+    `remote_ip` Nullable(String),
+    `log_type` LowCardinality(Nullable(String)),
+    `event_name` LowCardinality(Nullable(String)),
+    `first_event` Bool DEFAULT 1,
+    `browser_name` LowCardinality(Nullable(String)),
+    `browser_version` Nullable(String),
+    `platform` LowCardinality(Nullable(String)),
+    `source` LowCardinality(Nullable(String)),
+    `category` LowCardinality(Nullable(String)),
+    `version` LowCardinality(Nullable(String)),
+    `value` Nullable(String),
+    `component` LowCardinality(Nullable(String)),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_experience` LowCardinality(Nullable(String)) DEFAULT '',
+    `created_at` DateTime64(3) DEFAULT now64() CODEC(T64, LZ4),
+    `inserted_at` DateTime64(3) DEFAULT now64() CODEC(T64, LZ4),
+    `latency` Nullable(UInt32) DEFAULT 0,
+    INDEX paymentMethodIndex payment_method TYPE bloom_filter GRANULARITY 1,
+    INDEX eventIndex event_name TYPE bloom_filter GRANULARITY 1,
+    INDEX platformIndex platform TYPE bloom_filter GRANULARITY 1,
+    INDEX logTypeIndex log_type TYPE bloom_filter GRANULARITY 1,
+    INDEX categoryIndex category TYPE bloom_filter GRANULARITY 1,
+    INDEX sourceIndex source TYPE bloom_filter GRANULARITY 1,
+    INDEX componentIndex component TYPE bloom_filter GRANULARITY 1,
+    INDEX firstEventIndex first_event TYPE bloom_filter GRANULARITY 1 
+) ENGINE = ReplicatedMergeTree(
+    '/clickhouse/{installation}/{cluster}/tables/{shard}/hyperswitch/sdk_events_clustered', '{replica}'
+) 
+PARTITION BY 
+    toStartOfDay(created_at) 
+ORDER BY 
+    (created_at, merchant_id) 
+TTL 
+    toDateTime(created_at) + toIntervalMonth(6) 
+SETTINGS 
+    index_granularity = 8192
+;
+
+CREATE TABLE hyperswitch.sdk_events_dist on cluster '{cluster}' ( 
+    `payment_id` Nullable(String),
+    `merchant_id` String,
+    `remote_ip` Nullable(String),
+    `log_type` LowCardinality(Nullable(String)),
+    `event_name` LowCardinality(Nullable(String)),
+    `first_event` Bool DEFAULT 1,
+    `browser_name` LowCardinality(Nullable(String)),
+    `browser_version` Nullable(String),
+    `platform` LowCardinality(Nullable(String)),
+    `source` LowCardinality(Nullable(String)),
+    `category` LowCardinality(Nullable(String)),
+    `version` LowCardinality(Nullable(String)),
+    `value` Nullable(String),
+    `component` LowCardinality(Nullable(String)),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_experience` LowCardinality(Nullable(String)) DEFAULT '',
+    `created_at` DateTime64(3) DEFAULT now64() CODEC(T64, LZ4),
+    `inserted_at` DateTime64(3) DEFAULT now64() CODEC(T64, LZ4),
+    `latency` Nullable(UInt32) DEFAULT 0
+) ENGINE = Distributed(
+    '{cluster}', 'hyperswitch', 'sdk_events_clustered', rand()
+);
+
+CREATE MATERIALIZED VIEW hyperswitch.sdk_events_mv on cluster '{cluster}' TO hyperswitch.sdk_events_dist ( 
+    `payment_id` Nullable(String),
+    `merchant_id` String,
+    `remote_ip` Nullable(String),
+    `log_type` LowCardinality(Nullable(String)),
+    `event_name` LowCardinality(Nullable(String)),
+    `first_event` Bool,
+    `latency` Nullable(UInt32),
+    `browser_name` LowCardinality(Nullable(String)),
+    `browser_version` Nullable(String),
+    `platform` LowCardinality(Nullable(String)),
+    `source` LowCardinality(Nullable(String)),
+    `category` LowCardinality(Nullable(String)),
+    `version` LowCardinality(Nullable(String)),
+    `value` Nullable(String),
+    `component` LowCardinality(Nullable(String)),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_experience` LowCardinality(Nullable(String)),
+    `created_at` DateTime64(3)
+) AS 
+SELECT 
+    payment_id,
+    merchant_id,
+    remote_ip,
+    log_type,
+    event_name,
+    multiIf(first_event = 'true', 1, 0) AS first_event,
+    latency,
+    browser_name,
+    browser_version,
+    platform,
+    source,
+    category,
+    version,
+    value,
+    component,
+    payment_method,
+    payment_experience,
+    toDateTime64(timestamp, 3) AS created_at 
+FROM 
+    hyperswitch.sdk_events_queue
+WHERE length(_error) = 0
+;
+
+CREATE MATERIALIZED VIEW hyperswitch.sdk_parse_errors on cluster '{cluster}' (
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String 
+) ENGINE = MergeTree 
+    ORDER BY (topic, partition, offset) 
+SETTINGS 
+    index_granularity = 8192 AS 
+SELECT 
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error 
+FROM 
+    hyperswitch.sdk_events_queue 
+WHERE 
+    length(_error) > 0
+;
diff --git a/crates/analytics/docs/clickhouse/cluster_setup/scripts/seed_scripts.sql b/crates/analytics/docs/clickhouse/cluster_setup/scripts/seed_scripts.sql
new file mode 100644
index 000000000000..202b94ac6040
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/cluster_setup/scripts/seed_scripts.sql
@@ -0,0 +1 @@
+create database hyperswitch on cluster '{cluster}';
\ No newline at end of file
diff --git a/crates/analytics/docs/clickhouse/scripts/api_events_v2.sql b/crates/analytics/docs/clickhouse/scripts/api_events_v2.sql
new file mode 100644
index 000000000000..b41a75fe67e5
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/scripts/api_events_v2.sql
@@ -0,0 +1,134 @@
+CREATE TABLE api_events_v2_queue (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `connector` Nullable(String),
+    `request_id` String,
+    `flow_type` LowCardinality(String),
+    `api_flow` LowCardinality(String),
+    `api_auth_type` LowCardinality(String),
+    `request` String,
+    `response` Nullable(String),
+    `authentication_data` Nullable(String),
+    `status_code` UInt32,
+    `created_at` DateTime CODEC(T64, LZ4),
+    `latency` UInt128,
+    `user_agent` String,
+    `ip_addr` String,
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
+kafka_topic_list = 'hyperswitch-api-log-events',
+kafka_group_name = 'hyper-c1',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
+
+
+CREATE TABLE api_events_v2_dist (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `connector` Nullable(String),
+    `request_id` String,
+    `flow_type` LowCardinality(String),
+    `api_flow` LowCardinality(String),
+    `api_auth_type` LowCardinality(String),
+    `request` String,
+    `response` Nullable(String),
+    `authentication_data` Nullable(String),
+    `status_code` UInt32,
+    `created_at` DateTime CODEC(T64, LZ4),
+    `inserted_at` DateTime CODEC(T64, LZ4),
+    `latency` UInt128,
+    `user_agent` String,
+    `ip_addr` String,
+    INDEX flowIndex flow_type TYPE bloom_filter GRANULARITY 1,
+    INDEX apiIndex api_flow TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex status_code TYPE bloom_filter GRANULARITY 1
+) ENGINE = MergeTree
+PARTITION BY toStartOfDay(created_at)
+ORDER BY
+	(created_at, merchant_id, flow_type, status_code, api_flow)
+TTL created_at + toIntervalMonth(6)
+;
+
+CREATE MATERIALIZED VIEW api_events_v2_mv TO api_events_v2_dist (
+    `merchant_id` String,
+    `payment_id` Nullable(String),
+    `refund_id` Nullable(String),
+    `payment_method_id` Nullable(String),
+    `payment_method` Nullable(String),
+    `payment_method_type` Nullable(String),
+    `customer_id` Nullable(String),
+    `user_id` Nullable(String),
+    `connector` Nullable(String),
+    `request_id` String,
+    `flow_type` LowCardinality(String),
+    `api_flow` LowCardinality(String),
+    `api_auth_type` LowCardinality(String),
+    `request` String,
+    `response` Nullable(String),
+    `authentication_data` Nullable(String),
+    `status_code` UInt32,
+    `created_at` DateTime CODEC(T64, LZ4),
+    `inserted_at` DateTime CODEC(T64, LZ4),
+    `latency` UInt128,
+    `user_agent` String,
+    `ip_addr` String
+) AS
+SELECT
+    merchant_id,
+    payment_id,
+    refund_id,
+    payment_method_id,
+    payment_method,
+    payment_method_type,
+    customer_id,
+    user_id,
+    connector,
+    request_id,
+    flow_type,
+    api_flow,
+    api_auth_type,
+    request,
+    response,
+    authentication_data,
+    status_code,
+    created_at,
+    now() as inserted_at,
+    latency,
+    user_agent,
+    ip_addr
+FROM
+    api_events_v2_queue
+where length(_error) = 0;
+
+
+CREATE MATERIALIZED VIEW api_events_parse_errors
+(
+    `topic` String,
+    `partition` Int64,
+    `offset` Int64,
+    `raw` String,
+    `error` String
+)
+ENGINE = MergeTree
+ORDER BY (topic, partition, offset)
+SETTINGS index_granularity = 8192 AS
+SELECT
+    _topic AS topic,
+    _partition AS partition,
+    _offset AS offset,
+    _raw_message AS raw,
+    _error AS error
+FROM api_events_v2_queue
+WHERE length(_error) > 0
+;
diff --git a/crates/analytics/docs/clickhouse/scripts/payment_attempts.sql b/crates/analytics/docs/clickhouse/scripts/payment_attempts.sql
new file mode 100644
index 000000000000..276e311e57a9
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/scripts/payment_attempts.sql
@@ -0,0 +1,156 @@
+CREATE TABLE payment_attempts_queue (
+    `payment_id` String,
+    `merchant_id` String,
+    `attempt_id` String,
+    `status` LowCardinality(String),
+    `amount` Nullable(UInt32),
+    `currency` LowCardinality(Nullable(String)),
+    `connector` LowCardinality(Nullable(String)),
+    `save_to_locker` Nullable(Bool),
+    `error_message` Nullable(String),
+    `offer_amount` Nullable(UInt32),
+    `surcharge_amount` Nullable(UInt32),
+    `tax_amount` Nullable(UInt32),
+    `payment_method_id` Nullable(String),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_method_type` LowCardinality(Nullable(String)),
+    `connector_transaction_id` Nullable(String),
+    `capture_method` LowCardinality(Nullable(String)),
+    `capture_on` Nullable(DateTime) CODEC(T64, LZ4),
+    `confirm` Bool,
+    `authentication_type` LowCardinality(Nullable(String)),
+    `cancellation_reason` Nullable(String),
+    `amount_to_capture` Nullable(UInt32),
+    `mandate_id` Nullable(String),
+    `browser_info` Nullable(String),
+    `error_code` Nullable(String),
+    `connector_metadata` Nullable(String),
+    `payment_experience` Nullable(String),
+    `created_at` DateTime CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `modified_at` DateTime CODEC(T64, LZ4),
+    `sign_flag` Int8
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
+kafka_topic_list = 'hyperswitch-payment-attempt-events',
+kafka_group_name = 'hyper-c1',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
+
+CREATE TABLE payment_attempt_dist (
+    `payment_id` String,
+    `merchant_id` String,
+    `attempt_id` String,
+    `status` LowCardinality(String),
+    `amount` Nullable(UInt32),
+    `currency` LowCardinality(Nullable(String)),
+    `connector` LowCardinality(Nullable(String)),
+    `save_to_locker` Nullable(Bool),
+    `error_message` Nullable(String),
+    `offer_amount` Nullable(UInt32),
+    `surcharge_amount` Nullable(UInt32),
+    `tax_amount` Nullable(UInt32),
+    `payment_method_id` Nullable(String),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_method_type` LowCardinality(Nullable(String)),
+    `connector_transaction_id` Nullable(String),
+    `capture_method` Nullable(String),
+    `capture_on` Nullable(DateTime) CODEC(T64, LZ4),
+    `confirm` Bool,
+    `authentication_type` LowCardinality(Nullable(String)),
+    `cancellation_reason` Nullable(String),
+    `amount_to_capture` Nullable(UInt32),
+    `mandate_id` Nullable(String),
+    `browser_info` Nullable(String),
+    `error_code` Nullable(String),
+    `connector_metadata` Nullable(String),
+    `payment_experience` Nullable(String),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8,
+    INDEX connectorIndex connector TYPE bloom_filter GRANULARITY 1,
+    INDEX paymentMethodIndex payment_method TYPE bloom_filter GRANULARITY 1,
+    INDEX authenticationTypeIndex authentication_type TYPE bloom_filter GRANULARITY 1,
+    INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex status TYPE bloom_filter GRANULARITY 1
+) ENGINE = CollapsingMergeTree(
+    sign_flag
+)
+PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (created_at, merchant_id, attempt_id)
+TTL created_at + toIntervalMonth(6)
+;
+
+
+CREATE MATERIALIZED VIEW kafka_parse_pa TO payment_attempt_dist (
+    `payment_id` String,
+    `merchant_id` String,
+    `attempt_id` String,
+    `status` LowCardinality(String),
+    `amount` Nullable(UInt32),
+    `currency` LowCardinality(Nullable(String)),
+    `connector` LowCardinality(Nullable(String)),
+    `save_to_locker` Nullable(Bool),
+    `error_message` Nullable(String),
+    `offer_amount` Nullable(UInt32),
+    `surcharge_amount` Nullable(UInt32),
+    `tax_amount` Nullable(UInt32),
+    `payment_method_id` Nullable(String),
+    `payment_method` LowCardinality(Nullable(String)),
+    `payment_method_type` LowCardinality(Nullable(String)),
+    `connector_transaction_id` Nullable(String),
+    `capture_method` Nullable(String),
+    `confirm` Bool,
+    `authentication_type` LowCardinality(Nullable(String)),
+    `cancellation_reason` Nullable(String),
+    `amount_to_capture` Nullable(UInt32),
+    `mandate_id` Nullable(String),
+    `browser_info` Nullable(String),
+    `error_code` Nullable(String),
+    `connector_metadata` Nullable(String),
+    `payment_experience` Nullable(String),
+    `created_at` DateTime64(3),
+    `capture_on` Nullable(DateTime64(3)),
+    `last_synced` Nullable(DateTime64(3)),
+    `modified_at` DateTime64(3),
+    `inserted_at` DateTime64(3),
+    `sign_flag` Int8
+) AS
+SELECT
+    payment_id,
+    merchant_id,
+    attempt_id,
+    status,
+    amount,
+    currency,
+    connector,
+    save_to_locker,
+    error_message,
+    offer_amount,
+    surcharge_amount,
+    tax_amount,
+    payment_method_id,
+    payment_method,
+    payment_method_type,
+    connector_transaction_id,
+    capture_method,
+    confirm,
+    authentication_type,
+    cancellation_reason,
+    amount_to_capture,
+    mandate_id,
+    browser_info,
+    error_code,
+    connector_metadata,
+    payment_experience,
+    created_at,
+    capture_on,
+    last_synced,
+    modified_at,
+    now() as inserted_at,
+    sign_flag
+FROM
+    payment_attempts_queue;
+
diff --git a/crates/analytics/docs/clickhouse/scripts/payment_intents.sql b/crates/analytics/docs/clickhouse/scripts/payment_intents.sql
new file mode 100644
index 000000000000..8cd487f364b4
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/scripts/payment_intents.sql
@@ -0,0 +1,116 @@
+CREATE TABLE payment_intents_queue (
+    `payment_id` String,
+    `merchant_id` String,
+    `status` LowCardinality(String),
+    `amount` UInt32,
+    `currency` LowCardinality(Nullable(String)),
+    `amount_captured` Nullable(UInt32),
+    `customer_id` Nullable(String),
+    `description` Nullable(String),
+    `return_url` Nullable(String),
+    `connector_id` LowCardinality(Nullable(String)),
+    `statement_descriptor_name` Nullable(String),
+    `statement_descriptor_suffix` Nullable(String),
+    `setup_future_usage` LowCardinality(Nullable(String)),
+    `off_session` Nullable(Bool),
+    `client_secret` Nullable(String),
+    `active_attempt_id` String,
+    `business_country` String,
+    `business_label` String,
+    `modified_at` DateTime CODEC(T64, LZ4),
+    `created_at` DateTime CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `sign_flag` Int8
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
+kafka_topic_list = 'hyperswitch-payment-intent-events',
+kafka_group_name = 'hyper-c1',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
+
+
+CREATE TABLE payment_intents_dist (
+    `payment_id` String,
+    `merchant_id` String,
+    `status` LowCardinality(String),
+    `amount` UInt32,
+    `currency` LowCardinality(Nullable(String)),
+    `amount_captured` Nullable(UInt32),
+    `customer_id` Nullable(String),
+    `description` Nullable(String),
+    `return_url` Nullable(String),
+    `connector_id` LowCardinality(Nullable(String)),
+    `statement_descriptor_name` Nullable(String),
+    `statement_descriptor_suffix` Nullable(String),
+    `setup_future_usage` LowCardinality(Nullable(String)),
+    `off_session` Nullable(Bool),
+    `client_secret` Nullable(String),
+    `active_attempt_id` String,
+    `business_country` LowCardinality(String),
+    `business_label` String,
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `last_synced` Nullable(DateTime) CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8,
+    INDEX connectorIndex connector_id TYPE bloom_filter GRANULARITY 1,
+    INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex status TYPE bloom_filter GRANULARITY 1
+) ENGINE = CollapsingMergeTree(
+    sign_flag
+)
+PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (created_at, merchant_id, payment_id)
+TTL created_at + toIntervalMonth(6)
+;
+
+CREATE MATERIALIZED VIEW kafka_parse_payment_intent TO payment_intents_dist (
+    `payment_id` String,
+    `merchant_id` String,
+    `status` LowCardinality(String),
+    `amount` UInt32,
+    `currency` LowCardinality(Nullable(String)),
+    `amount_captured` Nullable(UInt32),
+    `customer_id` Nullable(String),
+    `description` Nullable(String),
+    `return_url` Nullable(String),
+    `connector_id` LowCardinality(Nullable(String)),
+    `statement_descriptor_name` Nullable(String),
+    `statement_descriptor_suffix` Nullable(String),
+    `setup_future_usage` LowCardinality(Nullable(String)),
+    `off_session` Nullable(Bool),
+    `client_secret` Nullable(String),
+    `active_attempt_id` String,
+    `business_country` LowCardinality(String),
+    `business_label` String,
+    `modified_at` DateTime64(3),
+    `created_at` DateTime64(3),
+    `last_synced` Nullable(DateTime64(3)),
+    `inserted_at` DateTime64(3),
+    `sign_flag` Int8
+) AS
+SELECT
+    payment_id,
+    merchant_id,
+    status,
+    amount,
+    currency,
+    amount_captured,
+    customer_id,
+    description,
+    return_url,
+    connector_id,
+    statement_descriptor_name,
+    statement_descriptor_suffix,
+    setup_future_usage,
+    off_session,
+    client_secret,
+    active_attempt_id,
+    business_country,
+    business_label,
+    modified_at,
+    created_at,
+    last_synced,
+    now() as inserted_at,
+    sign_flag
+FROM payment_intents_queue;
diff --git a/crates/analytics/docs/clickhouse/scripts/refunds.sql b/crates/analytics/docs/clickhouse/scripts/refunds.sql
new file mode 100644
index 000000000000..a131270c1326
--- /dev/null
+++ b/crates/analytics/docs/clickhouse/scripts/refunds.sql
@@ -0,0 +1,121 @@
+CREATE TABLE refund_queue (
+    `internal_reference_id` String,
+    `refund_id` String,
+    `payment_id` String,
+    `merchant_id` String,
+    `connector_transaction_id` String,
+    `connector` LowCardinality(Nullable(String)),
+    `connector_refund_id` Nullable(String),
+    `external_reference_id` Nullable(String),
+    `refund_type` LowCardinality(String),
+    `total_amount` Nullable(UInt32),
+    `currency` LowCardinality(String),
+    `refund_amount` Nullable(UInt32),
+    `refund_status` LowCardinality(String),
+    `sent_to_gateway` Bool,
+    `refund_error_message` Nullable(String),
+    `refund_arn` Nullable(String),
+    `attempt_id` String,
+    `description` Nullable(String),
+    `refund_reason` Nullable(String),
+    `refund_error_code` Nullable(String),
+    `created_at` DateTime CODEC(T64, LZ4),
+    `modified_at` DateTime CODEC(T64, LZ4),
+    `sign_flag` Int8
+) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka0:29092',
+kafka_topic_list = 'hyperswitch-refund-events',
+kafka_group_name = 'hyper-c1',
+kafka_format = 'JSONEachRow',
+kafka_handle_error_mode = 'stream';
+
+
+CREATE TABLE refund_dist (
+    `internal_reference_id` String,
+    `refund_id` String,
+    `payment_id` String,
+    `merchant_id` String,
+    `connector_transaction_id` String,
+    `connector` LowCardinality(Nullable(String)),
+    `connector_refund_id` Nullable(String),
+    `external_reference_id` Nullable(String),
+    `refund_type` LowCardinality(String),
+    `total_amount` Nullable(UInt32),
+    `currency` LowCardinality(String),
+    `refund_amount` Nullable(UInt32),
+    `refund_status` LowCardinality(String),
+    `sent_to_gateway` Bool,
+    `refund_error_message` Nullable(String),
+    `refund_arn` Nullable(String),
+    `attempt_id` String,
+    `description` Nullable(String),
+    `refund_reason` Nullable(String),
+    `refund_error_code` Nullable(String),
+    `created_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `modified_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `inserted_at` DateTime DEFAULT now() CODEC(T64, LZ4),
+    `sign_flag` Int8,
+    INDEX connectorIndex connector TYPE bloom_filter GRANULARITY 1,
+    INDEX refundTypeIndex refund_type TYPE bloom_filter GRANULARITY 1,
+    INDEX currencyIndex currency TYPE bloom_filter GRANULARITY 1,
+    INDEX statusIndex refund_status TYPE bloom_filter GRANULARITY 1
+) ENGINE = CollapsingMergeTree(
+    sign_flag
+)
+PARTITION BY toStartOfDay(created_at)
+ORDER BY
+    (created_at, merchant_id, refund_id)
+TTL created_at + toIntervalMonth(6)
+;
+
+CREATE MATERIALIZED VIEW kafka_parse_refund TO refund_dist (
+    `internal_reference_id` String,
+    `refund_id` String,
+    `payment_id` String,
+    `merchant_id` String,
+    `connector_transaction_id` String,
+    `connector` LowCardinality(Nullable(String)),
+    `connector_refund_id` Nullable(String),
+    `external_reference_id` Nullable(String),
+    `refund_type` LowCardinality(String),
+    `total_amount` Nullable(UInt32),
+    `currency` LowCardinality(String),
+    `refund_amount` Nullable(UInt32),
+    `refund_status` LowCardinality(String),
+    `sent_to_gateway` Bool,
+    `refund_error_message` Nullable(String),
+    `refund_arn` Nullable(String),
+    `attempt_id` String,
+    `description` Nullable(String),
+    `refund_reason` Nullable(String),
+    `refund_error_code` Nullable(String),
+    `created_at` DateTime64(3),
+    `modified_at` DateTime64(3),
+    `inserted_at` DateTime64(3),
+    `sign_flag` Int8
+) AS
+SELECT
+    internal_reference_id,
+    refund_id,
+    payment_id,
+    merchant_id,
+    connector_transaction_id,
+    connector,
+    connector_refund_id,
+    external_reference_id,
+    refund_type,
+    total_amount,
+    currency,
+    refund_amount,
+    refund_status,
+    sent_to_gateway,
+    refund_error_message,
+    refund_arn,
+    attempt_id,
+    description,
+    refund_reason,
+    refund_error_code,
+    created_at,
+    modified_at,
+    now() as inserted_at,
+    sign_flag
+FROM refund_queue;
diff --git a/crates/analytics/src/api_event.rs b/crates/analytics/src/api_event.rs
new file mode 100644
index 000000000000..113344d47254
--- /dev/null
+++ b/crates/analytics/src/api_event.rs
@@ -0,0 +1,9 @@
+mod core;
+pub mod events;
+pub mod filters;
+pub mod metrics;
+pub mod types;
+
+pub trait APIEventAnalytics: events::ApiLogsFilterAnalytics {}
+
+pub use self::core::{api_events_core, get_api_event_metrics, get_filters};
diff --git a/crates/analytics/src/api_event/core.rs b/crates/analytics/src/api_event/core.rs
new file mode 100644
index 000000000000..b368d6374f75
--- /dev/null
+++ b/crates/analytics/src/api_event/core.rs
@@ -0,0 +1,176 @@
+use std::collections::HashMap;
+
+use api_models::analytics::{
+    api_event::{
+        ApiEventMetricsBucketIdentifier, ApiEventMetricsBucketValue, ApiLogsRequest,
+        ApiMetricsBucketResponse,
+    },
+    AnalyticsMetadata, ApiEventFiltersResponse, GetApiEventFiltersRequest,
+    GetApiEventMetricRequest, MetricsResponse,
+};
+use error_stack::{IntoReport, ResultExt};
+use router_env::{
+    instrument, logger,
+    tracing::{self, Instrument},
+};
+
+use super::{
+    events::{get_api_event, ApiLogsResult},
+    metrics::ApiEventMetricRow,
+};
+use crate::{
+    errors::{AnalyticsError, AnalyticsResult},
+    metrics,
+    types::FiltersError,
+    AnalyticsProvider,
+};
+
+#[instrument(skip_all)]
+pub async fn api_events_core(
+    pool: &AnalyticsProvider,
+    req: ApiLogsRequest,
+    merchant_id: String,
+) -> AnalyticsResult<Vec<ApiLogsResult>> {
+    let data = match pool {
+        AnalyticsProvider::Sqlx(_) => Err(FiltersError::NotImplemented)
+            .into_report()
+            .attach_printable("SQL Analytics is not implemented for API Events"),
+        AnalyticsProvider::Clickhouse(pool) => get_api_event(&merchant_id, req, pool).await,
+        AnalyticsProvider::CombinedSqlx(_sqlx_pool, ckh_pool)
+        | AnalyticsProvider::CombinedCkh(_sqlx_pool, ckh_pool) => {
+            get_api_event(&merchant_id, req, ckh_pool).await
+        }
+    }
+    .change_context(AnalyticsError::UnknownError)?;
+    Ok(data)
+}
+
+pub async fn get_filters(
+    pool: &AnalyticsProvider,
+    req: GetApiEventFiltersRequest,
+    merchant_id: String,
+) -> AnalyticsResult<ApiEventFiltersResponse> {
+    use api_models::analytics::{api_event::ApiEventDimensions, ApiEventFilterValue};
+
+    use super::filters::get_api_event_filter_for_dimension;
+    use crate::api_event::filters::ApiEventFilter;
+
+    let mut res = ApiEventFiltersResponse::default();
+    for dim in req.group_by_names {
+        let values = match pool {
+            AnalyticsProvider::Sqlx(_pool) => Err(FiltersError::NotImplemented)
+                .into_report()
+                .attach_printable("SQL Analytics is not implemented for API Events"),
+            AnalyticsProvider::Clickhouse(ckh_pool)
+            | AnalyticsProvider::CombinedSqlx(_, ckh_pool)
+            | AnalyticsProvider::CombinedCkh(_, ckh_pool) => {
+                get_api_event_filter_for_dimension(dim, &merchant_id, &req.time_range, ckh_pool)
+                    .await
+            }
+        }
+        .change_context(AnalyticsError::UnknownError)?
+        .into_iter()
+        .filter_map(|fil: ApiEventFilter| match dim {
+            ApiEventDimensions::StatusCode => fil.status_code.map(|i| i.to_string()),
+            ApiEventDimensions::FlowType => fil.flow_type,
+            ApiEventDimensions::ApiFlow => fil.api_flow,
+        })
+        .collect::<Vec<String>>();
+        res.query_data.push(ApiEventFilterValue {
+            dimension: dim,
+            values,
+        })
+    }
+
+    Ok(res)
+}
+
+#[instrument(skip_all)]
+pub async fn get_api_event_metrics(
+    pool: &AnalyticsProvider,
+    merchant_id: &str,
+    req: GetApiEventMetricRequest,
+) -> AnalyticsResult<MetricsResponse<ApiMetricsBucketResponse>> {
+    let mut metrics_accumulator: HashMap<ApiEventMetricsBucketIdentifier, ApiEventMetricRow> =
+        HashMap::new();
+
+    let mut set = tokio::task::JoinSet::new();
+    for metric_type in req.metrics.iter().cloned() {
+        let req = req.clone();
+        let pool = pool.clone();
+        let task_span = tracing::debug_span!(
+            "analytics_api_metrics_query",
+            api_event_metric = metric_type.as_ref()
+        );
+
+        // TODO: lifetime issues with joinset,
+        // can be optimized away if joinset lifetime requirements are relaxed
+        let merchant_id_scoped = merchant_id.to_owned();
+        set.spawn(
+            async move {
+                let data = pool
+                    .get_api_event_metrics(
+                        &metric_type,
+                        &req.group_by_names.clone(),
+                        &merchant_id_scoped,
+                        &req.filters,
+                        &req.time_series.map(|t| t.granularity),
+                        &req.time_range,
+                    )
+                    .await
+                    .change_context(AnalyticsError::UnknownError);
+                (metric_type, data)
+            }
+            .instrument(task_span),
+        );
+    }
+
+    while let Some((metric, data)) = set
+        .join_next()
+        .await
+        .transpose()
+        .into_report()
+        .change_context(AnalyticsError::UnknownError)?
+    {
+        let data = data?;
+        let attributes = &[
+            metrics::request::add_attributes("metric_type", metric.to_string()),
+            metrics::request::add_attributes("source", pool.to_string()),
+        ];
+
+        let value = u64::try_from(data.len());
+        if let Ok(val) = value {
+            metrics::BUCKETS_FETCHED.record(&metrics::CONTEXT, val, attributes);
+            logger::debug!("Attributes: {:?}, Buckets fetched: {}", attributes, val);
+        }
+        for (id, value) in data {
+            metrics_accumulator
+                .entry(id)
+                .and_modify(|data| {
+                    data.api_count = data.api_count.or(value.api_count);
+                    data.status_code_count = data.status_code_count.or(value.status_code_count);
+                    data.latency = data.latency.or(value.latency);
+                })
+                .or_insert(value);
+        }
+    }
+
+    let query_data: Vec<ApiMetricsBucketResponse> = metrics_accumulator
+        .into_iter()
+        .map(|(id, val)| ApiMetricsBucketResponse {
+            values: ApiEventMetricsBucketValue {
+                latency: val.latency,
+                api_count: val.api_count,
+                status_code_count: val.status_code_count,
+            },
+            dimensions: id,
+        })
+        .collect();
+
+    Ok(MetricsResponse {
+        query_data,
+        meta_data: [AnalyticsMetadata {
+            current_time_range: req.time_range,
+        }],
+    })
+}
diff --git a/crates/analytics/src/api_event/events.rs b/crates/analytics/src/api_event/events.rs
new file mode 100644
index 000000000000..73b3fb9cbad2
--- /dev/null
+++ b/crates/analytics/src/api_event/events.rs
@@ -0,0 +1,105 @@
+use api_models::analytics::{
+    api_event::{ApiLogsRequest, QueryType},
+    Granularity,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use router_env::Flow;
+use time::PrimitiveDateTime;
+
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, FiltersError, FiltersResult, LoadRow},
+};
+pub trait ApiLogsFilterAnalytics: LoadRow<ApiLogsResult> {}
+
+pub async fn get_api_event<T>(
+    merchant_id: &String,
+    query_param: ApiLogsRequest,
+    pool: &T,
+) -> FiltersResult<Vec<ApiLogsResult>>
+where
+    T: AnalyticsDataSource + ApiLogsFilterAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::ApiEvents);
+    query_builder.add_select_column("*").switch()?;
+
+    query_builder
+        .add_filter_clause("merchant_id", merchant_id)
+        .switch()?;
+    match query_param.query_param {
+        QueryType::Payment { payment_id } => query_builder
+            .add_filter_clause("payment_id", payment_id)
+            .switch()?,
+        QueryType::Refund {
+            payment_id,
+            refund_id,
+        } => {
+            query_builder
+                .add_filter_clause("payment_id", payment_id)
+                .switch()?;
+            query_builder
+                .add_filter_clause("refund_id", refund_id)
+                .switch()?;
+        }
+    }
+    if let Some(list_api_name) = query_param.api_name_filter {
+        query_builder
+            .add_filter_in_range_clause("api_flow", &list_api_name)
+            .switch()?;
+    } else {
+        query_builder
+            .add_filter_in_range_clause(
+                "api_flow",
+                &[
+                    Flow::PaymentsCancel,
+                    Flow::PaymentsCapture,
+                    Flow::PaymentsConfirm,
+                    Flow::PaymentsCreate,
+                    Flow::PaymentsStart,
+                    Flow::PaymentsUpdate,
+                    Flow::RefundsCreate,
+                    Flow::IncomingWebhookReceive,
+                ],
+            )
+            .switch()?;
+    }
+    //TODO!: update the execute_query function to return reports instead of plain errors...
+    query_builder
+        .execute_query::<ApiLogsResult, _>(pool)
+        .await
+        .change_context(FiltersError::QueryBuildingError)?
+        .change_context(FiltersError::QueryExecutionFailure)
+}
+#[derive(Debug, serde::Serialize, serde::Deserialize)]
+pub struct ApiLogsResult {
+    pub merchant_id: String,
+    pub payment_id: Option<String>,
+    pub refund_id: Option<String>,
+    pub payment_method_id: Option<String>,
+    pub payment_method: Option<String>,
+    pub payment_method_type: Option<String>,
+    pub customer_id: Option<String>,
+    pub user_id: Option<String>,
+    pub connector: Option<String>,
+    pub request_id: Option<String>,
+    pub flow_type: String,
+    pub api_flow: String,
+    pub api_auth_type: Option<String>,
+    pub request: String,
+    pub response: Option<String>,
+    pub error: Option<String>,
+    pub authentication_data: Option<String>,
+    pub status_code: u16,
+    pub latency: Option<u128>,
+    pub user_agent: Option<String>,
+    pub hs_latency: Option<u128>,
+    pub ip_addr: Option<String>,
+    #[serde(with = "common_utils::custom_serde::iso8601")]
+    pub created_at: PrimitiveDateTime,
+}
diff --git a/crates/analytics/src/api_event/filters.rs b/crates/analytics/src/api_event/filters.rs
new file mode 100644
index 000000000000..87414ebad4ba
--- /dev/null
+++ b/crates/analytics/src/api_event/filters.rs
@@ -0,0 +1,53 @@
+use api_models::analytics::{api_event::ApiEventDimensions, Granularity, TimeRange};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, FiltersError, FiltersResult, LoadRow},
+};
+
+pub trait ApiEventFilterAnalytics: LoadRow<ApiEventFilter> {}
+
+pub async fn get_api_event_filter_for_dimension<T>(
+    dimension: ApiEventDimensions,
+    merchant_id: &String,
+    time_range: &TimeRange,
+    pool: &T,
+) -> FiltersResult<Vec<ApiEventFilter>>
+where
+    T: AnalyticsDataSource + ApiEventFilterAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::ApiEvents);
+
+    query_builder.add_select_column(dimension).switch()?;
+    time_range
+        .set_filter_clause(&mut query_builder)
+        .attach_printable("Error filtering time range")
+        .switch()?;
+
+    query_builder
+        .add_filter_clause("merchant_id", merchant_id)
+        .switch()?;
+
+    query_builder.set_distinct();
+
+    query_builder
+        .execute_query::<ApiEventFilter, _>(pool)
+        .await
+        .change_context(FiltersError::QueryBuildingError)?
+        .change_context(FiltersError::QueryExecutionFailure)
+}
+
+#[derive(Debug, serde::Serialize, Eq, PartialEq, serde::Deserialize)]
+pub struct ApiEventFilter {
+    pub status_code: Option<i32>,
+    pub flow_type: Option<String>,
+    pub api_flow: Option<String>,
+}
diff --git a/crates/analytics/src/api_event/metrics.rs b/crates/analytics/src/api_event/metrics.rs
new file mode 100644
index 000000000000..16f2d7a2f5ab
--- /dev/null
+++ b/crates/analytics/src/api_event/metrics.rs
@@ -0,0 +1,110 @@
+use api_models::analytics::{
+    api_event::{
+        ApiEventDimensions, ApiEventFilters, ApiEventMetrics, ApiEventMetricsBucketIdentifier,
+    },
+    Granularity, TimeRange,
+};
+use time::PrimitiveDateTime;
+
+use crate::{
+    query::{Aggregate, GroupByClause, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, LoadRow, MetricsResult},
+};
+
+mod api_count;
+pub mod latency;
+mod status_code_count;
+use api_count::ApiCount;
+use latency::MaxLatency;
+use status_code_count::StatusCodeCount;
+
+use self::latency::LatencyAvg;
+
+#[derive(Debug, PartialEq, Eq, serde::Deserialize)]
+pub struct ApiEventMetricRow {
+    pub latency: Option<u64>,
+    pub api_count: Option<u64>,
+    pub status_code_count: Option<u64>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
+    pub start_bucket: Option<PrimitiveDateTime>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
+    pub end_bucket: Option<PrimitiveDateTime>,
+}
+
+pub trait ApiEventMetricAnalytics: LoadRow<ApiEventMetricRow> + LoadRow<LatencyAvg> {}
+
+#[async_trait::async_trait]
+pub trait ApiEventMetric<T>
+where
+    T: AnalyticsDataSource + ApiEventMetricAnalytics,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[ApiEventDimensions],
+        merchant_id: &str,
+        filters: &ApiEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>>;
+}
+
+#[async_trait::async_trait]
+impl<T> ApiEventMetric<T> for ApiEventMetrics
+where
+    T: AnalyticsDataSource + ApiEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[ApiEventDimensions],
+        merchant_id: &str,
+        filters: &ApiEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>> {
+        match self {
+            Self::Latency => {
+                MaxLatency
+                    .load_metrics(
+                        dimensions,
+                        merchant_id,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::ApiCount => {
+                ApiCount
+                    .load_metrics(
+                        dimensions,
+                        merchant_id,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::StatusCodeCount => {
+                StatusCodeCount
+                    .load_metrics(
+                        dimensions,
+                        merchant_id,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+        }
+    }
+}
diff --git a/crates/analytics/src/api_event/metrics/api_count.rs b/crates/analytics/src/api_event/metrics/api_count.rs
new file mode 100644
index 000000000000..7f5f291aa53e
--- /dev/null
+++ b/crates/analytics/src/api_event/metrics/api_count.rs
@@ -0,0 +1,106 @@
+use api_models::analytics::{
+    api_event::{ApiEventDimensions, ApiEventFilters, ApiEventMetricsBucketIdentifier},
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::ApiEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct ApiCount;
+
+#[async_trait::async_trait]
+impl<T> super::ApiEventMetric<T> for ApiCount
+where
+    T: AnalyticsDataSource + super::ApiEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        _dimensions: &[ApiEventDimensions],
+        merchant_id: &str,
+        filters: &ApiEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::ApiEvents);
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("api_count"),
+            })
+            .switch()?;
+        if !filters.flow_type.is_empty() {
+            query_builder
+                .add_filter_in_range_clause(ApiEventDimensions::FlowType, &filters.flow_type)
+                .attach_printable("Error adding flow_type filter")
+                .switch()?;
+        }
+        query_builder
+            .add_select_column(Aggregate::Min {
+                field: "created_at",
+                alias: Some("start_bucket"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Max {
+                field: "created_at",
+                alias: Some("end_bucket"),
+            })
+            .switch()?;
+        if let Some(granularity) = granularity.as_ref() {
+            granularity
+                .set_group_by_clause(&mut query_builder)
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .add_filter_clause("merchant_id", merchant_id)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        query_builder
+            .execute_query::<ApiEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    ApiEventMetricsBucketIdentifier::new(TimeRange {
+                        start_time: match (granularity, i.start_bucket) {
+                            (Some(g), Some(st)) => g.clip_to_start(st)?,
+                            _ => time_range.start_time,
+                        },
+                        end_time: granularity.as_ref().map_or_else(
+                            || Ok(time_range.end_time),
+                            |g| i.end_bucket.map(|et| g.clip_to_end(et)).transpose(),
+                        )?,
+                    }),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/api_event/metrics/latency.rs b/crates/analytics/src/api_event/metrics/latency.rs
new file mode 100644
index 000000000000..379b39fbeb9e
--- /dev/null
+++ b/crates/analytics/src/api_event/metrics/latency.rs
@@ -0,0 +1,138 @@
+use api_models::analytics::{
+    api_event::{ApiEventDimensions, ApiEventFilters, ApiEventMetricsBucketIdentifier},
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::ApiEventMetricRow;
+use crate::{
+    query::{
+        Aggregate, FilterTypes, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql,
+        Window,
+    },
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct MaxLatency;
+
+#[async_trait::async_trait]
+impl<T> super::ApiEventMetric<T> for MaxLatency
+where
+    T: AnalyticsDataSource + super::ApiEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        _dimensions: &[ApiEventDimensions],
+        merchant_id: &str,
+        filters: &ApiEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::ApiEvents);
+
+        query_builder
+            .add_select_column(Aggregate::Sum {
+                field: "latency",
+                alias: Some("latency_sum"),
+            })
+            .switch()?;
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: Some("latency"),
+                alias: Some("latency_count"),
+            })
+            .switch()?;
+
+        query_builder
+            .add_select_column(Aggregate::Min {
+                field: "created_at",
+                alias: Some("start_bucket"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Max {
+                field: "created_at",
+                alias: Some("end_bucket"),
+            })
+            .switch()?;
+        if let Some(granularity) = granularity.as_ref() {
+            granularity
+                .set_group_by_clause(&mut query_builder)
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", merchant_id)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        query_builder
+            .add_custom_filter_clause("request", "10.63.134.6", FilterTypes::NotLike)
+            .attach_printable("Error filtering out locker IP")
+            .switch()?;
+
+        query_builder
+            .execute_query::<LatencyAvg, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    ApiEventMetricsBucketIdentifier::new(TimeRange {
+                        start_time: match (granularity, i.start_bucket) {
+                            (Some(g), Some(st)) => g.clip_to_start(st)?,
+                            _ => time_range.start_time,
+                        },
+                        end_time: granularity.as_ref().map_or_else(
+                            || Ok(time_range.end_time),
+                            |g| i.end_bucket.map(|et| g.clip_to_end(et)).transpose(),
+                        )?,
+                    }),
+                    ApiEventMetricRow {
+                        latency: if i.latency_count != 0 {
+                            Some(i.latency_sum.unwrap_or(0) / i.latency_count)
+                        } else {
+                            None
+                        },
+                        api_count: None,
+                        status_code_count: None,
+                        start_bucket: i.start_bucket,
+                        end_bucket: i.end_bucket,
+                    },
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, serde::Deserialize)]
+pub struct LatencyAvg {
+    latency_sum: Option<u64>,
+    latency_count: u64,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
+    pub start_bucket: Option<PrimitiveDateTime>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
+    pub end_bucket: Option<PrimitiveDateTime>,
+}
diff --git a/crates/analytics/src/api_event/metrics/status_code_count.rs b/crates/analytics/src/api_event/metrics/status_code_count.rs
new file mode 100644
index 000000000000..5c652fd8e0c9
--- /dev/null
+++ b/crates/analytics/src/api_event/metrics/status_code_count.rs
@@ -0,0 +1,103 @@
+use api_models::analytics::{
+    api_event::{ApiEventDimensions, ApiEventFilters, ApiEventMetricsBucketIdentifier},
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::ApiEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct StatusCodeCount;
+
+#[async_trait::async_trait]
+impl<T> super::ApiEventMetric<T> for StatusCodeCount
+where
+    T: AnalyticsDataSource + super::ApiEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        _dimensions: &[ApiEventDimensions],
+        merchant_id: &str,
+        filters: &ApiEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::ApiEvents);
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: Some("status_code"),
+                alias: Some("status_code_count"),
+            })
+            .switch()?;
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", merchant_id)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        query_builder
+            .add_select_column(Aggregate::Min {
+                field: "created_at",
+                alias: Some("start_bucket"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Max {
+                field: "created_at",
+                alias: Some("end_bucket"),
+            })
+            .switch()?;
+        if let Some(granularity) = granularity.as_ref() {
+            granularity
+                .set_group_by_clause(&mut query_builder)
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<ApiEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    ApiEventMetricsBucketIdentifier::new(TimeRange {
+                        start_time: match (granularity, i.start_bucket) {
+                            (Some(g), Some(st)) => g.clip_to_start(st)?,
+                            _ => time_range.start_time,
+                        },
+                        end_time: granularity.as_ref().map_or_else(
+                            || Ok(time_range.end_time),
+                            |g| i.end_bucket.map(|et| g.clip_to_end(et)).transpose(),
+                        )?,
+                    }),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/api_event/types.rs b/crates/analytics/src/api_event/types.rs
new file mode 100644
index 000000000000..72205fc72abf
--- /dev/null
+++ b/crates/analytics/src/api_event/types.rs
@@ -0,0 +1,33 @@
+use api_models::analytics::api_event::{ApiEventDimensions, ApiEventFilters};
+use error_stack::ResultExt;
+
+use crate::{
+    query::{QueryBuilder, QueryFilter, QueryResult, ToSql},
+    types::{AnalyticsCollection, AnalyticsDataSource},
+};
+
+impl<T> QueryFilter<T> for ApiEventFilters
+where
+    T: AnalyticsDataSource,
+    AnalyticsCollection: ToSql<T>,
+{
+    fn set_filter_clause(&self, builder: &mut QueryBuilder<T>) -> QueryResult<()> {
+        if !self.status_code.is_empty() {
+            builder
+                .add_filter_in_range_clause(ApiEventDimensions::StatusCode, &self.status_code)
+                .attach_printable("Error adding status_code filter")?;
+        }
+        if !self.flow_type.is_empty() {
+            builder
+                .add_filter_in_range_clause(ApiEventDimensions::FlowType, &self.flow_type)
+                .attach_printable("Error adding flow_type filter")?;
+        }
+        if !self.api_flow.is_empty() {
+            builder
+                .add_filter_in_range_clause(ApiEventDimensions::ApiFlow, &self.api_flow)
+                .attach_printable("Error adding api_name filter")?;
+        }
+
+        Ok(())
+    }
+}
diff --git a/crates/analytics/src/clickhouse.rs b/crates/analytics/src/clickhouse.rs
new file mode 100644
index 000000000000..964486c93649
--- /dev/null
+++ b/crates/analytics/src/clickhouse.rs
@@ -0,0 +1,458 @@
+use std::sync::Arc;
+
+use actix_web::http::StatusCode;
+use common_utils::errors::ParsingError;
+use error_stack::{IntoReport, Report, ResultExt};
+use router_env::logger;
+use time::PrimitiveDateTime;
+
+use super::{
+    payments::{
+        distribution::PaymentDistributionRow, filters::FilterRow, metrics::PaymentMetricRow,
+    },
+    query::{Aggregate, ToSql, Window},
+    refunds::{filters::RefundFilterRow, metrics::RefundMetricRow},
+    sdk_events::{filters::SdkEventFilter, metrics::SdkEventMetricRow},
+    types::{AnalyticsCollection, AnalyticsDataSource, LoadRow, QueryExecutionError},
+};
+use crate::{
+    api_event::{
+        events::ApiLogsResult,
+        filters::ApiEventFilter,
+        metrics::{latency::LatencyAvg, ApiEventMetricRow},
+    },
+    sdk_events::events::SdkEventsResult,
+    types::TableEngine,
+};
+
+pub type ClickhouseResult<T> = error_stack::Result<T, ClickhouseError>;
+
+#[derive(Clone, Debug)]
+pub struct ClickhouseClient {
+    pub config: Arc<ClickhouseConfig>,
+}
+
+#[derive(Clone, Debug, serde::Deserialize)]
+pub struct ClickhouseConfig {
+    username: String,
+    password: Option<String>,
+    host: String,
+    database_name: String,
+}
+
+impl Default for ClickhouseConfig {
+    fn default() -> Self {
+        Self {
+            username: "default".to_string(),
+            password: None,
+            host: "http://localhost:8123".to_string(),
+            database_name: "default".to_string(),
+        }
+    }
+}
+
+impl ClickhouseClient {
+    async fn execute_query(&self, query: &str) -> ClickhouseResult<Vec<serde_json::Value>> {
+        logger::debug!("Executing query: {query}");
+        let client = reqwest::Client::new();
+        let params = CkhQuery {
+            date_time_output_format: String::from("iso"),
+            output_format_json_quote_64bit_integers: 0,
+            database: self.config.database_name.clone(),
+        };
+        let response = client
+            .post(&self.config.host)
+            .query(&params)
+            .basic_auth(self.config.username.clone(), self.config.password.clone())
+            .body(format!("{query}\nFORMAT JSON"))
+            .send()
+            .await
+            .into_report()
+            .change_context(ClickhouseError::ConnectionError)?;
+
+        logger::debug!(clickhouse_response=?response, query=?query, "Clickhouse response");
+        if response.status() != StatusCode::OK {
+            response.text().await.map_or_else(
+                |er| {
+                    Err(ClickhouseError::ResponseError)
+                        .into_report()
+                        .attach_printable_lazy(|| format!("Error: {er:?}"))
+                },
+                |t| Err(ClickhouseError::ResponseNotOK(t)).into_report(),
+            )
+        } else {
+            Ok(response
+                .json::<CkhOutput<serde_json::Value>>()
+                .await
+                .into_report()
+                .change_context(ClickhouseError::ResponseError)?
+                .data)
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl AnalyticsDataSource for ClickhouseClient {
+    type Row = serde_json::Value;
+
+    async fn load_results<T>(
+        &self,
+        query: &str,
+    ) -> common_utils::errors::CustomResult<Vec<T>, QueryExecutionError>
+    where
+        Self: LoadRow<T>,
+    {
+        self.execute_query(query)
+            .await
+            .change_context(QueryExecutionError::DatabaseError)?
+            .into_iter()
+            .map(Self::load_row)
+            .collect::<Result<Vec<_>, _>>()
+            .change_context(QueryExecutionError::RowExtractionFailure)
+    }
+
+    fn get_table_engine(table: AnalyticsCollection) -> TableEngine {
+        match table {
+            AnalyticsCollection::Payment
+            | AnalyticsCollection::Refund
+            | AnalyticsCollection::PaymentIntent => {
+                TableEngine::CollapsingMergeTree { sign: "sign_flag" }
+            }
+            AnalyticsCollection::SdkEvents => TableEngine::BasicTree,
+            AnalyticsCollection::ApiEvents => TableEngine::BasicTree,
+        }
+    }
+}
+
+impl<T, E> LoadRow<T> for ClickhouseClient
+where
+    Self::Row: TryInto<T, Error = Report<E>>,
+{
+    fn load_row(row: Self::Row) -> common_utils::errors::CustomResult<T, QueryExecutionError> {
+        row.try_into()
+            .change_context(QueryExecutionError::RowExtractionFailure)
+    }
+}
+
+impl super::payments::filters::PaymentFilterAnalytics for ClickhouseClient {}
+impl super::payments::metrics::PaymentMetricAnalytics for ClickhouseClient {}
+impl super::payments::distribution::PaymentDistributionAnalytics for ClickhouseClient {}
+impl super::refunds::metrics::RefundMetricAnalytics for ClickhouseClient {}
+impl super::refunds::filters::RefundFilterAnalytics for ClickhouseClient {}
+impl super::sdk_events::filters::SdkEventFilterAnalytics for ClickhouseClient {}
+impl super::sdk_events::metrics::SdkEventMetricAnalytics for ClickhouseClient {}
+impl super::sdk_events::events::SdkEventsFilterAnalytics for ClickhouseClient {}
+impl super::api_event::events::ApiLogsFilterAnalytics for ClickhouseClient {}
+impl super::api_event::filters::ApiEventFilterAnalytics for ClickhouseClient {}
+impl super::api_event::metrics::ApiEventMetricAnalytics for ClickhouseClient {}
+
+#[derive(Debug, serde::Serialize)]
+struct CkhQuery {
+    date_time_output_format: String,
+    output_format_json_quote_64bit_integers: u8,
+    database: String,
+}
+
+#[derive(Debug, serde::Deserialize)]
+struct CkhOutput<T> {
+    data: Vec<T>,
+}
+
+impl TryInto<ApiLogsResult> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<ApiLogsResult, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse ApiLogsResult in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<SdkEventsResult> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<SdkEventsResult, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse SdkEventsResult in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<PaymentMetricRow> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<PaymentMetricRow, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse PaymentMetricRow in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<PaymentDistributionRow> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<PaymentDistributionRow, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse PaymentDistributionRow in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<FilterRow> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<FilterRow, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse FilterRow in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<RefundMetricRow> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<RefundMetricRow, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse RefundMetricRow in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<RefundFilterRow> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<RefundFilterRow, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse RefundFilterRow in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<ApiEventMetricRow> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<ApiEventMetricRow, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse ApiEventMetricRow in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<LatencyAvg> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<LatencyAvg, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse LatencyAvg in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<SdkEventMetricRow> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<SdkEventMetricRow, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse SdkEventMetricRow in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<SdkEventFilter> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<SdkEventFilter, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse SdkEventFilter in clickhouse results",
+            ))
+    }
+}
+
+impl TryInto<ApiEventFilter> for serde_json::Value {
+    type Error = Report<ParsingError>;
+
+    fn try_into(self) -> Result<ApiEventFilter, Self::Error> {
+        serde_json::from_value(self)
+            .into_report()
+            .change_context(ParsingError::StructParseFailure(
+                "Failed to parse ApiEventFilter in clickhouse results",
+            ))
+    }
+}
+
+impl ToSql<ClickhouseClient> for PrimitiveDateTime {
+    fn to_sql(&self, _table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
+        let format =
+            time::format_description::parse("[year]-[month]-[day] [hour]:[minute]:[second]")
+                .into_report()
+                .change_context(ParsingError::DateTimeParsingError)
+                .attach_printable("Failed to parse format description")?;
+        self.format(&format)
+            .into_report()
+            .change_context(ParsingError::EncodeError(
+                "failed to encode to clickhouse date-time format",
+            ))
+            .attach_printable("Failed to format date time")
+    }
+}
+
+impl ToSql<ClickhouseClient> for AnalyticsCollection {
+    fn to_sql(&self, _table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
+        match self {
+            Self::Payment => Ok("payment_attempt_dist".to_string()),
+            Self::Refund => Ok("refund_dist".to_string()),
+            Self::SdkEvents => Ok("sdk_events_dist".to_string()),
+            Self::ApiEvents => Ok("api_audit_log".to_string()),
+            Self::PaymentIntent => Ok("payment_intents_dist".to_string()),
+        }
+    }
+}
+
+impl<T> ToSql<ClickhouseClient> for Aggregate<T>
+where
+    T: ToSql<ClickhouseClient>,
+{
+    fn to_sql(&self, table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
+        Ok(match self {
+            Self::Count { field: _, alias } => {
+                let query = match table_engine {
+                    TableEngine::CollapsingMergeTree { sign } => format!("sum({sign})"),
+                    TableEngine::BasicTree => "count(*)".to_string(),
+                };
+                format!(
+                    "{query}{}",
+                    alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
+                )
+            }
+            Self::Sum { field, alias } => {
+                let query = match table_engine {
+                    TableEngine::CollapsingMergeTree { sign } => format!(
+                        "sum({sign} * {})",
+                        field
+                            .to_sql(table_engine)
+                            .attach_printable("Failed to sum aggregate")?
+                    ),
+                    TableEngine::BasicTree => format!(
+                        "sum({})",
+                        field
+                            .to_sql(table_engine)
+                            .attach_printable("Failed to sum aggregate")?
+                    ),
+                };
+                format!(
+                    "{query}{}",
+                    alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
+                )
+            }
+            Self::Min { field, alias } => {
+                format!(
+                    "min({}){}",
+                    field
+                        .to_sql(table_engine)
+                        .attach_printable("Failed to min aggregate")?,
+                    alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
+                )
+            }
+            Self::Max { field, alias } => {
+                format!(
+                    "max({}){}",
+                    field
+                        .to_sql(table_engine)
+                        .attach_printable("Failed to max aggregate")?,
+                    alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
+                )
+            }
+        })
+    }
+}
+
+impl<T> ToSql<ClickhouseClient> for Window<T>
+where
+    T: ToSql<ClickhouseClient>,
+{
+    fn to_sql(&self, table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
+        Ok(match self {
+            Self::Sum {
+                field,
+                partition_by,
+                order_by,
+                alias,
+            } => {
+                format!(
+                    "sum({}) over ({}{}){}",
+                    field
+                        .to_sql(table_engine)
+                        .attach_printable("Failed to sum window")?,
+                    partition_by.as_ref().map_or_else(
+                        || "".to_owned(),
+                        |partition_by| format!("partition by {}", partition_by.to_owned())
+                    ),
+                    order_by.as_ref().map_or_else(
+                        || "".to_owned(),
+                        |(order_column, order)| format!(
+                            " order by {} {}",
+                            order_column.to_owned(),
+                            order.to_string()
+                        )
+                    ),
+                    alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
+                )
+            }
+            Self::RowNumber {
+                field: _,
+                partition_by,
+                order_by,
+                alias,
+            } => {
+                format!(
+                    "row_number() over ({}{}){}",
+                    partition_by.as_ref().map_or_else(
+                        || "".to_owned(),
+                        |partition_by| format!("partition by {}", partition_by.to_owned())
+                    ),
+                    order_by.as_ref().map_or_else(
+                        || "".to_owned(),
+                        |(order_column, order)| format!(
+                            " order by {} {}",
+                            order_column.to_owned(),
+                            order.to_string()
+                        )
+                    ),
+                    alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
+                )
+            }
+        })
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ClickhouseError {
+    #[error("Clickhouse connection error")]
+    ConnectionError,
+    #[error("Clickhouse NON-200 response content: '{0}'")]
+    ResponseNotOK(String),
+    #[error("Clickhouse response error")]
+    ResponseError,
+}
diff --git a/crates/analytics/src/core.rs b/crates/analytics/src/core.rs
new file mode 100644
index 000000000000..354e1e2f1766
--- /dev/null
+++ b/crates/analytics/src/core.rs
@@ -0,0 +1,31 @@
+use api_models::analytics::GetInfoResponse;
+
+use crate::{types::AnalyticsDomain, utils};
+
+pub async fn get_domain_info(
+    domain: AnalyticsDomain,
+) -> crate::errors::AnalyticsResult<GetInfoResponse> {
+    let info = match domain {
+        AnalyticsDomain::Payments => GetInfoResponse {
+            metrics: utils::get_payment_metrics_info(),
+            download_dimensions: None,
+            dimensions: utils::get_payment_dimensions(),
+        },
+        AnalyticsDomain::Refunds => GetInfoResponse {
+            metrics: utils::get_refund_metrics_info(),
+            download_dimensions: None,
+            dimensions: utils::get_refund_dimensions(),
+        },
+        AnalyticsDomain::SdkEvents => GetInfoResponse {
+            metrics: utils::get_sdk_event_metrics_info(),
+            download_dimensions: None,
+            dimensions: utils::get_sdk_event_dimensions(),
+        },
+        AnalyticsDomain::ApiEvents => GetInfoResponse {
+            metrics: utils::get_api_event_metrics_info(),
+            download_dimensions: None,
+            dimensions: utils::get_api_event_dimensions(),
+        },
+    };
+    Ok(info)
+}
diff --git a/crates/router/src/analytics/errors.rs b/crates/analytics/src/errors.rs
similarity index 100%
rename from crates/router/src/analytics/errors.rs
rename to crates/analytics/src/errors.rs
diff --git a/crates/analytics/src/lambda_utils.rs b/crates/analytics/src/lambda_utils.rs
new file mode 100644
index 000000000000..f9446a402b4e
--- /dev/null
+++ b/crates/analytics/src/lambda_utils.rs
@@ -0,0 +1,36 @@
+use aws_config::{self, meta::region::RegionProviderChain};
+use aws_sdk_lambda::{config::Region, types::InvocationType::Event, Client};
+use aws_smithy_types::Blob;
+use common_utils::errors::CustomResult;
+use error_stack::{IntoReport, ResultExt};
+
+use crate::errors::AnalyticsError;
+
+async fn get_aws_client(region: String) -> Client {
+    let region_provider = RegionProviderChain::first_try(Region::new(region));
+    let sdk_config = aws_config::from_env().region(region_provider).load().await;
+    Client::new(&sdk_config)
+}
+
+pub async fn invoke_lambda(
+    function_name: &str,
+    region: &str,
+    json_bytes: &[u8],
+) -> CustomResult<(), AnalyticsError> {
+    get_aws_client(region.to_string())
+        .await
+        .invoke()
+        .function_name(function_name)
+        .invocation_type(Event)
+        .payload(Blob::new(json_bytes.to_owned()))
+        .send()
+        .await
+        .into_report()
+        .map_err(|er| {
+            let er_rep = format!("{er:?}");
+            er.attach_printable(er_rep)
+        })
+        .change_context(AnalyticsError::UnknownError)
+        .attach_printable("Lambda invocation failed")?;
+    Ok(())
+}
diff --git a/crates/analytics/src/lib.rs b/crates/analytics/src/lib.rs
new file mode 100644
index 000000000000..24da77f84f2b
--- /dev/null
+++ b/crates/analytics/src/lib.rs
@@ -0,0 +1,509 @@
+mod clickhouse;
+pub mod core;
+pub mod errors;
+pub mod metrics;
+pub mod payments;
+mod query;
+pub mod refunds;
+
+pub mod api_event;
+pub mod sdk_events;
+mod sqlx;
+mod types;
+use api_event::metrics::{ApiEventMetric, ApiEventMetricRow};
+pub use types::AnalyticsDomain;
+pub mod lambda_utils;
+pub mod utils;
+
+use std::sync::Arc;
+
+use api_models::analytics::{
+    api_event::{
+        ApiEventDimensions, ApiEventFilters, ApiEventMetrics, ApiEventMetricsBucketIdentifier,
+    },
+    payments::{PaymentDimensions, PaymentFilters, PaymentMetrics, PaymentMetricsBucketIdentifier},
+    refunds::{RefundDimensions, RefundFilters, RefundMetrics, RefundMetricsBucketIdentifier},
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetrics, SdkEventMetricsBucketIdentifier,
+    },
+    Distribution, Granularity, TimeRange,
+};
+use clickhouse::ClickhouseClient;
+pub use clickhouse::ClickhouseConfig;
+use error_stack::IntoReport;
+use router_env::{
+    logger,
+    tracing::{self, instrument},
+};
+use storage_impl::config::Database;
+
+use self::{
+    payments::{
+        distribution::{PaymentDistribution, PaymentDistributionRow},
+        metrics::{PaymentMetric, PaymentMetricRow},
+    },
+    refunds::metrics::{RefundMetric, RefundMetricRow},
+    sdk_events::metrics::{SdkEventMetric, SdkEventMetricRow},
+    sqlx::SqlxClient,
+    types::MetricsError,
+};
+
+#[derive(Clone, Debug)]
+pub enum AnalyticsProvider {
+    Sqlx(SqlxClient),
+    Clickhouse(ClickhouseClient),
+    CombinedCkh(SqlxClient, ClickhouseClient),
+    CombinedSqlx(SqlxClient, ClickhouseClient),
+}
+
+impl Default for AnalyticsProvider {
+    fn default() -> Self {
+        Self::Sqlx(SqlxClient::default())
+    }
+}
+
+impl ToString for AnalyticsProvider {
+    fn to_string(&self) -> String {
+        String::from(match self {
+            Self::Clickhouse(_) => "Clickhouse",
+            Self::Sqlx(_) => "Sqlx",
+            Self::CombinedCkh(_, _) => "CombinedCkh",
+            Self::CombinedSqlx(_, _) => "CombinedSqlx",
+        })
+    }
+}
+
+impl AnalyticsProvider {
+    #[instrument(skip_all)]
+    pub async fn get_payment_metrics(
+        &self,
+        metric: &PaymentMetrics,
+        dimensions: &[PaymentDimensions],
+        merchant_id: &str,
+        filters: &PaymentFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+    ) -> types::MetricsResult<Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>> {
+        // Metrics to get the fetch time for each payment metric
+        metrics::request::record_operation_time(
+            async {
+                match self {
+                        Self::Sqlx(pool) => {
+                        metric
+                            .load_metrics(
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                pool,
+                            )
+                            .await
+                    }
+                                        Self::Clickhouse(pool) => {
+                        metric
+                            .load_metrics(
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                pool,
+                            )
+                            .await
+                    }
+                                    Self::CombinedCkh(sqlx_pool, ckh_pool) => {
+                        let (ckh_result, sqlx_result) = tokio::join!(metric
+                            .load_metrics(
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                ckh_pool,
+                            ),
+                            metric
+                            .load_metrics(
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                sqlx_pool,
+                            ));
+                        match (&sqlx_result, &ckh_result) {
+                            (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                                router_env::logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres payments analytics metrics")
+                            },
+                            _ => {}
+
+                        };
+
+                        ckh_result
+                    }
+                                    Self::CombinedSqlx(sqlx_pool, ckh_pool) => {
+                        let (ckh_result, sqlx_result) = tokio::join!(metric
+                            .load_metrics(
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                ckh_pool,
+                            ),
+                            metric
+                            .load_metrics(
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                sqlx_pool,
+                            ));
+                        match (&sqlx_result, &ckh_result) {
+                            (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                                router_env::logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres payments analytics metrics")
+                            },
+                            _ => {}
+
+                        };
+
+                        sqlx_result
+                    }
+                }
+            },
+            &metrics::METRIC_FETCH_TIME,
+            metric,
+            self,
+        )
+        .await
+    }
+
+    pub async fn get_payment_distribution(
+        &self,
+        distribution: &Distribution,
+        dimensions: &[PaymentDimensions],
+        merchant_id: &str,
+        filters: &PaymentFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+    ) -> types::MetricsResult<Vec<(PaymentMetricsBucketIdentifier, PaymentDistributionRow)>> {
+        // Metrics to get the fetch time for each payment metric
+        metrics::request::record_operation_time(
+            async {
+                match self {
+                        Self::Sqlx(pool) => {
+                        distribution.distribution_for
+                            .load_distribution(
+                                distribution,
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                pool,
+                            )
+                            .await
+                    }
+                                        Self::Clickhouse(pool) => {
+                        distribution.distribution_for
+                            .load_distribution(
+                                distribution,
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                pool,
+                            )
+                            .await
+                    }
+                                    Self::CombinedCkh(sqlx_pool, ckh_pool) => {
+                        let (ckh_result, sqlx_result) = tokio::join!(distribution.distribution_for
+                            .load_distribution(
+                                distribution,
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                ckh_pool,
+                            ),
+                            distribution.distribution_for
+                            .load_distribution(
+                                distribution,
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                sqlx_pool,
+                            ));
+                        match (&sqlx_result, &ckh_result) {
+                            (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                                router_env::logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres payments analytics distribution")
+                            },
+                            _ => {}
+
+                        };
+
+                        ckh_result
+                    }
+                                    Self::CombinedSqlx(sqlx_pool, ckh_pool) => {
+                        let (ckh_result, sqlx_result) = tokio::join!(distribution.distribution_for
+                            .load_distribution(
+                                distribution,
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                ckh_pool,
+                            ),
+                            distribution.distribution_for
+                            .load_distribution(
+                                distribution,
+                                dimensions,
+                                merchant_id,
+                                filters,
+                                granularity,
+                                time_range,
+                                sqlx_pool,
+                            ));
+                        match (&sqlx_result, &ckh_result) {
+                            (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                                router_env::logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres payments analytics distribution")
+                            },
+                            _ => {}
+
+                        };
+
+                        sqlx_result
+                    }
+                }
+            },
+            &metrics::METRIC_FETCH_TIME,
+            &distribution.distribution_for,
+            self,
+        )
+        .await
+    }
+
+    pub async fn get_refund_metrics(
+        &self,
+        metric: &RefundMetrics,
+        dimensions: &[RefundDimensions],
+        merchant_id: &str,
+        filters: &RefundFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+    ) -> types::MetricsResult<Vec<(RefundMetricsBucketIdentifier, RefundMetricRow)>> {
+        // Metrics to get the fetch time for each refund metric
+        metrics::request::record_operation_time(
+            async {
+                        match self {
+                            Self::Sqlx(pool) => {
+                                metric
+                                    .load_metrics(
+                                        dimensions,
+                                        merchant_id,
+                                        filters,
+                                        granularity,
+                                        time_range,
+                                        pool,
+                                    )
+                                    .await
+                            }
+                            Self::Clickhouse(pool) => {
+                                metric
+                                    .load_metrics(
+                                        dimensions,
+                                        merchant_id,
+                                        filters,
+                                        granularity,
+                                        time_range,
+                                        pool,
+                                    )
+                                    .await
+                            }
+                            Self::CombinedCkh(sqlx_pool, ckh_pool) => {
+                                let (ckh_result, sqlx_result) = tokio::join!(
+                                    metric.load_metrics(
+                                        dimensions,
+                                        merchant_id,
+                                        filters,
+                                        granularity,
+                                        time_range,
+                                        ckh_pool,
+                                    ),
+                                    metric.load_metrics(
+                                        dimensions,
+                                        merchant_id,
+                                        filters,
+                                        granularity,
+                                        time_range,
+                                        sqlx_pool,
+                                    )
+                                );
+                                match (&sqlx_result, &ckh_result) {
+                                    (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                                        logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres refunds analytics metrics")
+                                    }
+                                    _ => {}
+                                };
+                                ckh_result
+                            }
+                            Self::CombinedSqlx(sqlx_pool, ckh_pool) => {
+                                let (ckh_result, sqlx_result) = tokio::join!(
+                                    metric.load_metrics(
+                                        dimensions,
+                                        merchant_id,
+                                        filters,
+                                        granularity,
+                                        time_range,
+                                        ckh_pool,
+                                    ),
+                                    metric.load_metrics(
+                                        dimensions,
+                                        merchant_id,
+                                        filters,
+                                        granularity,
+                                        time_range,
+                                        sqlx_pool,
+                                    )
+                                );
+                                match (&sqlx_result, &ckh_result) {
+                                    (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                                        logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres refunds analytics metrics")
+                                    }
+                                    _ => {}
+                                };
+                                sqlx_result
+                            }
+                        }
+                    },
+                   &metrics::METRIC_FETCH_TIME,
+       metric,
+            self,
+        )
+        .await
+    }
+
+    pub async fn get_sdk_event_metrics(
+        &self,
+        metric: &SdkEventMetrics,
+        dimensions: &[SdkEventDimensions],
+        pub_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+    ) -> types::MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        match self {
+            Self::Sqlx(_pool) => Err(MetricsError::NotImplemented).into_report(),
+            Self::Clickhouse(pool) => {
+                metric
+                    .load_metrics(dimensions, pub_key, filters, granularity, time_range, pool)
+                    .await
+            }
+            Self::CombinedCkh(_sqlx_pool, ckh_pool) | Self::CombinedSqlx(_sqlx_pool, ckh_pool) => {
+                metric
+                    .load_metrics(
+                        dimensions,
+                        pub_key,
+                        filters,
+                        granularity,
+                        // Since SDK events are ckh only use ckh here
+                        time_range,
+                        ckh_pool,
+                    )
+                    .await
+            }
+        }
+    }
+
+    pub async fn get_api_event_metrics(
+        &self,
+        metric: &ApiEventMetrics,
+        dimensions: &[ApiEventDimensions],
+        pub_key: &str,
+        filters: &ApiEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+    ) -> types::MetricsResult<Vec<(ApiEventMetricsBucketIdentifier, ApiEventMetricRow)>> {
+        match self {
+            Self::Sqlx(_pool) => Err(MetricsError::NotImplemented).into_report(),
+            Self::Clickhouse(ckh_pool)
+            | Self::CombinedCkh(_, ckh_pool)
+            | Self::CombinedSqlx(_, ckh_pool) => {
+                // Since API events are ckh only use ckh here
+                metric
+                    .load_metrics(
+                        dimensions,
+                        pub_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        ckh_pool,
+                    )
+                    .await
+            }
+        }
+    }
+
+    pub async fn from_conf(config: &AnalyticsConfig) -> Self {
+        match config {
+            AnalyticsConfig::Sqlx { sqlx } => Self::Sqlx(SqlxClient::from_conf(sqlx).await),
+            AnalyticsConfig::Clickhouse { clickhouse } => Self::Clickhouse(ClickhouseClient {
+                config: Arc::new(clickhouse.clone()),
+            }),
+            AnalyticsConfig::CombinedCkh { sqlx, clickhouse } => Self::CombinedCkh(
+                SqlxClient::from_conf(sqlx).await,
+                ClickhouseClient {
+                    config: Arc::new(clickhouse.clone()),
+                },
+            ),
+            AnalyticsConfig::CombinedSqlx { sqlx, clickhouse } => Self::CombinedSqlx(
+                SqlxClient::from_conf(sqlx).await,
+                ClickhouseClient {
+                    config: Arc::new(clickhouse.clone()),
+                },
+            ),
+        }
+    }
+}
+
+#[derive(Clone, Debug, serde::Deserialize)]
+#[serde(tag = "source")]
+#[serde(rename_all = "lowercase")]
+pub enum AnalyticsConfig {
+    Sqlx {
+        sqlx: Database,
+    },
+    Clickhouse {
+        clickhouse: ClickhouseConfig,
+    },
+    CombinedCkh {
+        sqlx: Database,
+        clickhouse: ClickhouseConfig,
+    },
+    CombinedSqlx {
+        sqlx: Database,
+        clickhouse: ClickhouseConfig,
+    },
+}
+
+impl Default for AnalyticsConfig {
+    fn default() -> Self {
+        Self::Sqlx {
+            sqlx: Database::default(),
+        }
+    }
+}
+
+#[derive(Clone, Debug, serde::Deserialize, Default, serde::Serialize)]
+pub struct ReportConfig {
+    pub payment_function: String,
+    pub refund_function: String,
+    pub dispute_function: String,
+    pub region: String,
+}
diff --git a/crates/analytics/src/main.rs b/crates/analytics/src/main.rs
new file mode 100644
index 000000000000..5bf256ea9783
--- /dev/null
+++ b/crates/analytics/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello world");
+}
diff --git a/crates/router/src/analytics/metrics.rs b/crates/analytics/src/metrics.rs
similarity index 100%
rename from crates/router/src/analytics/metrics.rs
rename to crates/analytics/src/metrics.rs
diff --git a/crates/router/src/analytics/metrics/request.rs b/crates/analytics/src/metrics/request.rs
similarity index 51%
rename from crates/router/src/analytics/metrics/request.rs
rename to crates/analytics/src/metrics/request.rs
index b7c202f2db25..3d1a78808f34 100644
--- a/crates/router/src/analytics/metrics/request.rs
+++ b/crates/analytics/src/metrics/request.rs
@@ -6,24 +6,20 @@ pub fn add_attributes<T: Into<router_env::opentelemetry::Value>>(
 }
 
 #[inline]
-pub async fn record_operation_time<F, R>(
+pub async fn record_operation_time<F, R, T>(
     future: F,
     metric: &once_cell::sync::Lazy<router_env::opentelemetry::metrics::Histogram<f64>>,
-    metric_name: &api_models::analytics::payments::PaymentMetrics,
-    source: &crate::analytics::AnalyticsProvider,
+    metric_name: &T,
+    source: &crate::AnalyticsProvider,
 ) -> R
 where
     F: futures::Future<Output = R>,
+    T: ToString,
 {
     let (result, time) = time_future(future).await;
     let attributes = &[
         add_attributes("metric_name", metric_name.to_string()),
-        add_attributes(
-            "source",
-            match source {
-                crate::analytics::AnalyticsProvider::Sqlx(_) => "Sqlx",
-            },
-        ),
+        add_attributes("source", source.to_string()),
     ];
     let value = time.as_secs_f64();
     metric.record(&super::CONTEXT, value, attributes);
@@ -44,17 +40,3 @@ where
     let time_spent = start.elapsed();
     (result, time_spent)
 }
-
-#[macro_export]
-macro_rules! histogram_metric {
-    ($name:ident, $meter:ident) => {
-        pub(crate) static $name: once_cell::sync::Lazy<
-            $crate::opentelemetry::metrics::Histogram<u64>,
-        > = once_cell::sync::Lazy::new(|| $meter.u64_histogram(stringify!($name)).init());
-    };
-    ($name:ident, $meter:ident, $description:literal) => {
-        pub(crate) static $name: once_cell::sync::Lazy<
-            $crate::opentelemetry::metrics::Histogram<u64>,
-        > = once_cell::sync::Lazy::new(|| $meter.u64_histogram($description).init());
-    };
-}
diff --git a/crates/analytics/src/payments.rs b/crates/analytics/src/payments.rs
new file mode 100644
index 000000000000..984647172c5b
--- /dev/null
+++ b/crates/analytics/src/payments.rs
@@ -0,0 +1,16 @@
+pub mod accumulator;
+mod core;
+pub mod distribution;
+pub mod filters;
+pub mod metrics;
+pub mod types;
+pub use accumulator::{
+    PaymentDistributionAccumulator, PaymentMetricAccumulator, PaymentMetricsAccumulator,
+};
+
+pub trait PaymentAnalytics:
+    metrics::PaymentMetricAnalytics + filters::PaymentFilterAnalytics
+{
+}
+
+pub use self::core::{get_filters, get_metrics};
diff --git a/crates/router/src/analytics/payments/accumulator.rs b/crates/analytics/src/payments/accumulator.rs
similarity index 62%
rename from crates/router/src/analytics/payments/accumulator.rs
rename to crates/analytics/src/payments/accumulator.rs
index 5eebd0974693..c340f2888f8b 100644
--- a/crates/router/src/analytics/payments/accumulator.rs
+++ b/crates/analytics/src/payments/accumulator.rs
@@ -1,8 +1,9 @@
-use api_models::analytics::payments::PaymentMetricsBucketValue;
-use common_enums::enums as storage_enums;
+use api_models::analytics::payments::{ErrorResult, PaymentMetricsBucketValue};
+use bigdecimal::ToPrimitive;
+use diesel_models::enums as storage_enums;
 use router_env::logger;
 
-use super::metrics::PaymentMetricRow;
+use super::{distribution::PaymentDistributionRow, metrics::PaymentMetricRow};
 
 #[derive(Debug, Default)]
 pub struct PaymentMetricsAccumulator {
@@ -11,6 +12,22 @@ pub struct PaymentMetricsAccumulator {
     pub payment_success: CountAccumulator,
     pub processed_amount: SumAccumulator,
     pub avg_ticket_size: AverageAccumulator,
+    pub payment_error_message: ErrorDistributionAccumulator,
+    pub retries_count: CountAccumulator,
+    pub retries_amount_processed: SumAccumulator,
+    pub connector_success_rate: SuccessRateAccumulator,
+}
+
+#[derive(Debug, Default)]
+pub struct ErrorDistributionRow {
+    pub count: i64,
+    pub total: i64,
+    pub error_message: String,
+}
+
+#[derive(Debug, Default)]
+pub struct ErrorDistributionAccumulator {
+    pub error_vec: Vec<ErrorDistributionRow>,
 }
 
 #[derive(Debug, Default)]
@@ -45,6 +62,51 @@ pub trait PaymentMetricAccumulator {
     fn collect(self) -> Self::MetricOutput;
 }
 
+pub trait PaymentDistributionAccumulator {
+    type DistributionOutput;
+
+    fn add_distribution_bucket(&mut self, distribution: &PaymentDistributionRow);
+
+    fn collect(self) -> Self::DistributionOutput;
+}
+
+impl PaymentDistributionAccumulator for ErrorDistributionAccumulator {
+    type DistributionOutput = Option<Vec<ErrorResult>>;
+
+    fn add_distribution_bucket(&mut self, distribution: &PaymentDistributionRow) {
+        self.error_vec.push(ErrorDistributionRow {
+            count: distribution.count.unwrap_or_default(),
+            total: distribution
+                .total
+                .clone()
+                .map(|i| i.to_i64().unwrap_or_default())
+                .unwrap_or_default(),
+            error_message: distribution.error_message.clone().unwrap_or("".to_string()),
+        })
+    }
+
+    fn collect(mut self) -> Self::DistributionOutput {
+        if self.error_vec.is_empty() {
+            None
+        } else {
+            self.error_vec.sort_by(|a, b| b.count.cmp(&a.count));
+            let mut res: Vec<ErrorResult> = Vec::new();
+            for val in self.error_vec.into_iter() {
+                let perc = f64::from(u32::try_from(val.count).ok()?) * 100.0
+                    / f64::from(u32::try_from(val.total).ok()?);
+
+                res.push(ErrorResult {
+                    reason: val.error_message,
+                    count: val.count,
+                    percentage: (perc * 100.0).round() / 100.0,
+                })
+            }
+
+            Some(res)
+        }
+    }
+}
+
 impl PaymentMetricAccumulator for SuccessRateAccumulator {
     type MetricOutput = Option<f64>;
 
@@ -145,6 +207,10 @@ impl PaymentMetricsAccumulator {
             payment_success_count: self.payment_success.collect(),
             payment_processed_amount: self.processed_amount.collect(),
             avg_ticket_size: self.avg_ticket_size.collect(),
+            payment_error_message: self.payment_error_message.collect(),
+            retries_count: self.retries_count.collect(),
+            retries_amount_processed: self.retries_amount_processed.collect(),
+            connector_success_rate: self.connector_success_rate.collect(),
         }
     }
 }
diff --git a/crates/analytics/src/payments/core.rs b/crates/analytics/src/payments/core.rs
new file mode 100644
index 000000000000..138e88789327
--- /dev/null
+++ b/crates/analytics/src/payments/core.rs
@@ -0,0 +1,303 @@
+#![allow(dead_code)]
+use std::collections::HashMap;
+
+use api_models::analytics::{
+    payments::{
+        MetricsBucketResponse, PaymentDimensions, PaymentDistributions, PaymentMetrics,
+        PaymentMetricsBucketIdentifier,
+    },
+    AnalyticsMetadata, FilterValue, GetPaymentFiltersRequest, GetPaymentMetricRequest,
+    MetricsResponse, PaymentFiltersResponse,
+};
+use common_utils::errors::CustomResult;
+use error_stack::{IntoReport, ResultExt};
+use router_env::{
+    instrument, logger,
+    tracing::{self, Instrument},
+};
+
+use super::{
+    distribution::PaymentDistributionRow,
+    filters::{get_payment_filter_for_dimension, FilterRow},
+    metrics::PaymentMetricRow,
+    PaymentMetricsAccumulator,
+};
+use crate::{
+    errors::{AnalyticsError, AnalyticsResult},
+    metrics,
+    payments::{PaymentDistributionAccumulator, PaymentMetricAccumulator},
+    AnalyticsProvider,
+};
+
+#[derive(Debug)]
+pub enum TaskType {
+    MetricTask(
+        PaymentMetrics,
+        CustomResult<Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>, AnalyticsError>,
+    ),
+    DistributionTask(
+        PaymentDistributions,
+        CustomResult<Vec<(PaymentMetricsBucketIdentifier, PaymentDistributionRow)>, AnalyticsError>,
+    ),
+}
+
+#[instrument(skip_all)]
+pub async fn get_metrics(
+    pool: &AnalyticsProvider,
+    merchant_id: &str,
+    req: GetPaymentMetricRequest,
+) -> AnalyticsResult<MetricsResponse<MetricsBucketResponse>> {
+    let mut metrics_accumulator: HashMap<
+        PaymentMetricsBucketIdentifier,
+        PaymentMetricsAccumulator,
+    > = HashMap::new();
+
+    let mut set = tokio::task::JoinSet::new();
+    for metric_type in req.metrics.iter().cloned() {
+        let req = req.clone();
+        let pool = pool.clone();
+        let task_span = tracing::debug_span!(
+            "analytics_payments_metrics_query",
+            payment_metric = metric_type.as_ref()
+        );
+
+        // TODO: lifetime issues with joinset,
+        // can be optimized away if joinset lifetime requirements are relaxed
+        let merchant_id_scoped = merchant_id.to_owned();
+        set.spawn(
+            async move {
+                let data = pool
+                    .get_payment_metrics(
+                        &metric_type,
+                        &req.group_by_names.clone(),
+                        &merchant_id_scoped,
+                        &req.filters,
+                        &req.time_series.map(|t| t.granularity),
+                        &req.time_range,
+                    )
+                    .await
+                    .change_context(AnalyticsError::UnknownError);
+                TaskType::MetricTask(metric_type, data)
+            }
+            .instrument(task_span),
+        );
+    }
+
+    if let Some(distribution) = req.clone().distribution {
+        let req = req.clone();
+        let pool = pool.clone();
+        let task_span = tracing::debug_span!(
+            "analytics_payments_distribution_query",
+            payment_distribution = distribution.distribution_for.as_ref()
+        );
+
+        let merchant_id_scoped = merchant_id.to_owned();
+        set.spawn(
+            async move {
+                let data = pool
+                    .get_payment_distribution(
+                        &distribution,
+                        &req.group_by_names.clone(),
+                        &merchant_id_scoped,
+                        &req.filters,
+                        &req.time_series.map(|t| t.granularity),
+                        &req.time_range,
+                    )
+                    .await
+                    .change_context(AnalyticsError::UnknownError);
+                TaskType::DistributionTask(distribution.distribution_for, data)
+            }
+            .instrument(task_span),
+        );
+    }
+
+    while let Some(task_type) = set
+        .join_next()
+        .await
+        .transpose()
+        .into_report()
+        .change_context(AnalyticsError::UnknownError)?
+    {
+        match task_type {
+            TaskType::MetricTask(metric, data) => {
+                let data = data?;
+                let attributes = &[
+                    metrics::request::add_attributes("metric_type", metric.to_string()),
+                    metrics::request::add_attributes("source", pool.to_string()),
+                ];
+
+                let value = u64::try_from(data.len());
+                if let Ok(val) = value {
+                    metrics::BUCKETS_FETCHED.record(&metrics::CONTEXT, val, attributes);
+                    logger::debug!("Attributes: {:?}, Buckets fetched: {}", attributes, val);
+                }
+
+                for (id, value) in data {
+                    logger::debug!(bucket_id=?id, bucket_value=?value, "Bucket row for metric {metric}");
+                    let metrics_builder = metrics_accumulator.entry(id).or_default();
+                    match metric {
+                        PaymentMetrics::PaymentSuccessRate => metrics_builder
+                            .payment_success_rate
+                            .add_metrics_bucket(&value),
+                        PaymentMetrics::PaymentCount => {
+                            metrics_builder.payment_count.add_metrics_bucket(&value)
+                        }
+                        PaymentMetrics::PaymentSuccessCount => {
+                            metrics_builder.payment_success.add_metrics_bucket(&value)
+                        }
+                        PaymentMetrics::PaymentProcessedAmount => {
+                            metrics_builder.processed_amount.add_metrics_bucket(&value)
+                        }
+                        PaymentMetrics::AvgTicketSize => {
+                            metrics_builder.avg_ticket_size.add_metrics_bucket(&value)
+                        }
+                        PaymentMetrics::RetriesCount => {
+                            metrics_builder.retries_count.add_metrics_bucket(&value);
+                            metrics_builder
+                                .retries_amount_processed
+                                .add_metrics_bucket(&value)
+                        }
+                        PaymentMetrics::ConnectorSuccessRate => {
+                            metrics_builder
+                                .connector_success_rate
+                                .add_metrics_bucket(&value);
+                        }
+                    }
+                }
+
+                logger::debug!(
+                    "Analytics Accumulated Results: metric: {}, results: {:#?}",
+                    metric,
+                    metrics_accumulator
+                );
+            }
+            TaskType::DistributionTask(distribution, data) => {
+                let data = data?;
+                let attributes = &[
+                    metrics::request::add_attributes("distribution_type", distribution.to_string()),
+                    metrics::request::add_attributes("source", pool.to_string()),
+                ];
+
+                let value = u64::try_from(data.len());
+                if let Ok(val) = value {
+                    metrics::BUCKETS_FETCHED.record(&metrics::CONTEXT, val, attributes);
+                    logger::debug!("Attributes: {:?}, Buckets fetched: {}", attributes, val);
+                }
+
+                for (id, value) in data {
+                    logger::debug!(bucket_id=?id, bucket_value=?value, "Bucket row for distribution {distribution}");
+                    let metrics_accumulator = metrics_accumulator.entry(id).or_default();
+                    match distribution {
+                        PaymentDistributions::PaymentErrorMessage => metrics_accumulator
+                            .payment_error_message
+                            .add_distribution_bucket(&value),
+                    }
+                }
+
+                logger::debug!(
+                    "Analytics Accumulated Results: distribution: {}, results: {:#?}",
+                    distribution,
+                    metrics_accumulator
+                );
+            }
+        }
+    }
+
+    let query_data: Vec<MetricsBucketResponse> = metrics_accumulator
+        .into_iter()
+        .map(|(id, val)| MetricsBucketResponse {
+            values: val.collect(),
+            dimensions: id,
+        })
+        .collect();
+
+    Ok(MetricsResponse {
+        query_data,
+        meta_data: [AnalyticsMetadata {
+            current_time_range: req.time_range,
+        }],
+    })
+}
+
+pub async fn get_filters(
+    pool: &AnalyticsProvider,
+    req: GetPaymentFiltersRequest,
+    merchant_id: &String,
+) -> AnalyticsResult<PaymentFiltersResponse> {
+    let mut res = PaymentFiltersResponse::default();
+
+    for dim in req.group_by_names {
+        let values = match pool {
+                        AnalyticsProvider::Sqlx(pool) => {
+                get_payment_filter_for_dimension(dim, merchant_id, &req.time_range, pool)
+                    .await
+            }
+                        AnalyticsProvider::Clickhouse(pool) => {
+                get_payment_filter_for_dimension(dim, merchant_id, &req.time_range, pool)
+                    .await
+            }
+                    AnalyticsProvider::CombinedCkh(sqlx_poll, ckh_pool) => {
+                let ckh_result = get_payment_filter_for_dimension(
+                    dim,
+                    merchant_id,
+                    &req.time_range,
+                    ckh_pool,
+                )
+                .await;
+                let sqlx_result = get_payment_filter_for_dimension(
+                    dim,
+                    merchant_id,
+                    &req.time_range,
+                    sqlx_poll,
+                )
+                .await;
+                match (&sqlx_result, &ckh_result) {
+                    (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                        router_env::logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres payments analytics filters")
+                    },
+                    _ => {}
+                };
+                ckh_result
+            }
+                    AnalyticsProvider::CombinedSqlx(sqlx_poll, ckh_pool) => {
+                let ckh_result = get_payment_filter_for_dimension(
+                    dim,
+                    merchant_id,
+                    &req.time_range,
+                    ckh_pool,
+                )
+                .await;
+                let sqlx_result = get_payment_filter_for_dimension(
+                    dim,
+                    merchant_id,
+                    &req.time_range,
+                    sqlx_poll,
+                )
+                .await;
+                match (&sqlx_result, &ckh_result) {
+                    (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                        router_env::logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres payments analytics filters")
+                    },
+                    _ => {}
+                };
+                sqlx_result
+            }
+        }
+        .change_context(AnalyticsError::UnknownError)?
+        .into_iter()
+        .filter_map(|fil: FilterRow| match dim {
+            PaymentDimensions::Currency => fil.currency.map(|i| i.as_ref().to_string()),
+            PaymentDimensions::PaymentStatus => fil.status.map(|i| i.as_ref().to_string()),
+            PaymentDimensions::Connector => fil.connector,
+            PaymentDimensions::AuthType => fil.authentication_type.map(|i| i.as_ref().to_string()),
+            PaymentDimensions::PaymentMethod => fil.payment_method,
+            PaymentDimensions::PaymentMethodType => fil.payment_method_type,
+        })
+        .collect::<Vec<String>>();
+        res.query_data.push(FilterValue {
+            dimension: dim,
+            values,
+        })
+    }
+    Ok(res)
+}
diff --git a/crates/analytics/src/payments/distribution.rs b/crates/analytics/src/payments/distribution.rs
new file mode 100644
index 000000000000..cf18c26310a7
--- /dev/null
+++ b/crates/analytics/src/payments/distribution.rs
@@ -0,0 +1,92 @@
+use api_models::analytics::{
+    payments::{
+        PaymentDimensions, PaymentDistributions, PaymentFilters, PaymentMetricsBucketIdentifier,
+    },
+    Distribution, Granularity, TimeRange,
+};
+use diesel_models::enums as storage_enums;
+use time::PrimitiveDateTime;
+
+use crate::{
+    query::{Aggregate, GroupByClause, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, DBEnumWrapper, LoadRow, MetricsResult},
+};
+
+mod payment_error_message;
+
+use payment_error_message::PaymentErrorMessage;
+
+#[derive(Debug, PartialEq, Eq, serde::Deserialize)]
+pub struct PaymentDistributionRow {
+    pub currency: Option<DBEnumWrapper<storage_enums::Currency>>,
+    pub status: Option<DBEnumWrapper<storage_enums::AttemptStatus>>,
+    pub connector: Option<String>,
+    pub authentication_type: Option<DBEnumWrapper<storage_enums::AuthenticationType>>,
+    pub payment_method: Option<String>,
+    pub payment_method_type: Option<String>,
+    pub total: Option<bigdecimal::BigDecimal>,
+    pub count: Option<i64>,
+    pub error_message: Option<String>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
+    pub start_bucket: Option<PrimitiveDateTime>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
+    pub end_bucket: Option<PrimitiveDateTime>,
+}
+
+pub trait PaymentDistributionAnalytics: LoadRow<PaymentDistributionRow> {}
+
+#[async_trait::async_trait]
+pub trait PaymentDistribution<T>
+where
+    T: AnalyticsDataSource + PaymentDistributionAnalytics,
+{
+    #[allow(clippy::too_many_arguments)]
+    async fn load_distribution(
+        &self,
+        distribution: &Distribution,
+        dimensions: &[PaymentDimensions],
+        merchant_id: &str,
+        filters: &PaymentFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(PaymentMetricsBucketIdentifier, PaymentDistributionRow)>>;
+}
+
+#[async_trait::async_trait]
+impl<T> PaymentDistribution<T> for PaymentDistributions
+where
+    T: AnalyticsDataSource + PaymentDistributionAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_distribution(
+        &self,
+        distribution: &Distribution,
+        dimensions: &[PaymentDimensions],
+        merchant_id: &str,
+        filters: &PaymentFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(PaymentMetricsBucketIdentifier, PaymentDistributionRow)>> {
+        match self {
+            Self::PaymentErrorMessage => {
+                PaymentErrorMessage
+                    .load_distribution(
+                        distribution,
+                        dimensions,
+                        merchant_id,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+        }
+    }
+}
diff --git a/crates/analytics/src/payments/distribution/payment_error_message.rs b/crates/analytics/src/payments/distribution/payment_error_message.rs
new file mode 100644
index 000000000000..c70fc09aeac4
--- /dev/null
+++ b/crates/analytics/src/payments/distribution/payment_error_message.rs
@@ -0,0 +1,176 @@
+use api_models::analytics::{
+    payments::{PaymentDimensions, PaymentFilters, PaymentMetricsBucketIdentifier},
+    Distribution, Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use diesel_models::enums as storage_enums;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::{PaymentDistribution, PaymentDistributionRow};
+use crate::{
+    query::{
+        Aggregate, GroupByClause, Order, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window,
+    },
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct PaymentErrorMessage;
+
+#[async_trait::async_trait]
+impl<T> PaymentDistribution<T> for PaymentErrorMessage
+where
+    T: AnalyticsDataSource + super::PaymentDistributionAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_distribution(
+        &self,
+        distribution: &Distribution,
+        dimensions: &[PaymentDimensions],
+        merchant_id: &str,
+        filters: &PaymentFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(PaymentMetricsBucketIdentifier, PaymentDistributionRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::Payment);
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(&distribution.distribution_for)
+            .switch()?;
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Min {
+                field: "created_at",
+                alias: Some("start_bucket"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Max {
+                field: "created_at",
+                alias: Some("end_bucket"),
+            })
+            .switch()?;
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", merchant_id)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        query_builder
+            .add_group_by_clause(&distribution.distribution_for)
+            .attach_printable("Error grouping by distribution_for")
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            granularity
+                .set_group_by_clause(&mut query_builder)
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .add_filter_clause(
+                PaymentDimensions::PaymentStatus,
+                storage_enums::AttemptStatus::Failure,
+            )
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder.add_outer_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_outer_select_column(&distribution.distribution_for)
+            .switch()?;
+        query_builder.add_outer_select_column("count").switch()?;
+        query_builder
+            .add_outer_select_column("start_bucket")
+            .switch()?;
+        query_builder
+            .add_outer_select_column("end_bucket")
+            .switch()?;
+        let sql_dimensions = query_builder.transform_to_sql_values(dimensions).switch()?;
+
+        query_builder
+            .add_outer_select_column(Window::Sum {
+                field: "count",
+                partition_by: Some(sql_dimensions),
+                order_by: None,
+                alias: Some("total"),
+            })
+            .switch()?;
+
+        query_builder
+            .add_top_n_clause(
+                dimensions,
+                distribution.distribution_cardinality.into(),
+                "count",
+                Order::Descending,
+            )
+            .switch()?;
+
+        query_builder
+            .execute_query::<PaymentDistributionRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    PaymentMetricsBucketIdentifier::new(
+                        i.currency.as_ref().map(|i| i.0),
+                        i.status.as_ref().map(|i| i.0),
+                        i.connector.clone(),
+                        i.authentication_type.as_ref().map(|i| i.0),
+                        i.payment_method.clone(),
+                        i.payment_method_type.clone(),
+                        TimeRange {
+                            start_time: match (granularity, i.start_bucket) {
+                                (Some(g), Some(st)) => g.clip_to_start(st)?,
+                                _ => time_range.start_time,
+                            },
+                            end_time: granularity.as_ref().map_or_else(
+                                || Ok(time_range.end_time),
+                                |g| i.end_bucket.map(|et| g.clip_to_end(et)).transpose(),
+                            )?,
+                        },
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(PaymentMetricsBucketIdentifier, PaymentDistributionRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/router/src/analytics/payments/filters.rs b/crates/analytics/src/payments/filters.rs
similarity index 87%
rename from crates/router/src/analytics/payments/filters.rs
rename to crates/analytics/src/payments/filters.rs
index f009aaa76329..6c165f78a8e4 100644
--- a/crates/router/src/analytics/payments/filters.rs
+++ b/crates/analytics/src/payments/filters.rs
@@ -1,11 +1,11 @@
 use api_models::analytics::{payments::PaymentDimensions, Granularity, TimeRange};
-use common_enums::enums::{AttemptStatus, AuthenticationType, Currency};
 use common_utils::errors::ReportSwitchExt;
+use diesel_models::enums::{AttemptStatus, AuthenticationType, Currency};
 use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
     types::{
         AnalyticsCollection, AnalyticsDataSource, DBEnumWrapper, FiltersError, FiltersResult,
         LoadRow,
@@ -26,6 +26,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::Payment);
 
@@ -48,11 +49,12 @@ where
         .change_context(FiltersError::QueryExecutionFailure)
 }
 
-#[derive(Debug, serde::Serialize, Eq, PartialEq)]
+#[derive(Debug, serde::Serialize, Eq, PartialEq, serde::Deserialize)]
 pub struct FilterRow {
     pub currency: Option<DBEnumWrapper<Currency>>,
     pub status: Option<DBEnumWrapper<AttemptStatus>>,
     pub connector: Option<String>,
     pub authentication_type: Option<DBEnumWrapper<AuthenticationType>>,
     pub payment_method: Option<String>,
+    pub payment_method_type: Option<String>,
 }
diff --git a/crates/router/src/analytics/payments/metrics.rs b/crates/analytics/src/payments/metrics.rs
similarity index 76%
rename from crates/router/src/analytics/payments/metrics.rs
rename to crates/analytics/src/payments/metrics.rs
index f492e5bd4df9..6fe6b6260d48 100644
--- a/crates/router/src/analytics/payments/metrics.rs
+++ b/crates/analytics/src/payments/metrics.rs
@@ -2,36 +2,44 @@ use api_models::analytics::{
     payments::{PaymentDimensions, PaymentFilters, PaymentMetrics, PaymentMetricsBucketIdentifier},
     Granularity, TimeRange,
 };
-use common_enums::enums as storage_enums;
+use diesel_models::enums as storage_enums;
 use time::PrimitiveDateTime;
 
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, DBEnumWrapper, LoadRow, MetricsResult},
 };
 
 mod avg_ticket_size;
+mod connector_success_rate;
 mod payment_count;
 mod payment_processed_amount;
 mod payment_success_count;
+mod retries_count;
 mod success_rate;
 
 use avg_ticket_size::AvgTicketSize;
+use connector_success_rate::ConnectorSuccessRate;
 use payment_count::PaymentCount;
 use payment_processed_amount::PaymentProcessedAmount;
 use payment_success_count::PaymentSuccessCount;
 use success_rate::PaymentSuccessRate;
 
-#[derive(Debug, PartialEq, Eq)]
+use self::retries_count::RetriesCount;
+
+#[derive(Debug, PartialEq, Eq, serde::Deserialize)]
 pub struct PaymentMetricRow {
     pub currency: Option<DBEnumWrapper<storage_enums::Currency>>,
     pub status: Option<DBEnumWrapper<storage_enums::AttemptStatus>>,
     pub connector: Option<String>,
     pub authentication_type: Option<DBEnumWrapper<storage_enums::AuthenticationType>>,
     pub payment_method: Option<String>,
+    pub payment_method_type: Option<String>,
     pub total: Option<bigdecimal::BigDecimal>,
     pub count: Option<i64>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
     pub start_bucket: Option<PrimitiveDateTime>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
     pub end_bucket: Option<PrimitiveDateTime>,
 }
 
@@ -61,6 +69,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -132,6 +141,30 @@ where
                     )
                     .await
             }
+            Self::RetriesCount => {
+                RetriesCount
+                    .load_metrics(
+                        dimensions,
+                        merchant_id,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::ConnectorSuccessRate => {
+                ConnectorSuccessRate
+                    .load_metrics(
+                        dimensions,
+                        merchant_id,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
         }
     }
 }
diff --git a/crates/router/src/analytics/payments/metrics/avg_ticket_size.rs b/crates/analytics/src/payments/metrics/avg_ticket_size.rs
similarity index 90%
rename from crates/router/src/analytics/payments/metrics/avg_ticket_size.rs
rename to crates/analytics/src/payments/metrics/avg_ticket_size.rs
index 2230d870e68a..9475d5288a64 100644
--- a/crates/router/src/analytics/payments/metrics/avg_ticket_size.rs
+++ b/crates/analytics/src/payments/metrics/avg_ticket_size.rs
@@ -3,12 +3,13 @@ use api_models::analytics::{
     Granularity, TimeRange,
 };
 use common_utils::errors::ReportSwitchExt;
+use diesel_models::enums as storage_enums;
 use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::{PaymentMetric, PaymentMetricRow};
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 
@@ -23,6 +24,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -89,6 +91,13 @@ where
                 .switch()?;
         }
 
+        query_builder
+            .add_filter_clause(
+                PaymentDimensions::PaymentStatus,
+                storage_enums::AttemptStatus::Charged,
+            )
+            .switch()?;
+
         query_builder
             .execute_query::<PaymentMetricRow, _>(pool)
             .await
@@ -103,6 +112,7 @@ where
                         i.connector.clone(),
                         i.authentication_type.as_ref().map(|i| i.0),
                         i.payment_method.clone(),
+                        i.payment_method_type.clone(),
                         TimeRange {
                             start_time: match (granularity, i.start_bucket) {
                                 (Some(g), Some(st)) => g.clip_to_start(st)?,
@@ -119,7 +129,7 @@ where
             })
             .collect::<error_stack::Result<
                 Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>,
-                crate::analytics::query::PostProcessingError,
+                crate::query::PostProcessingError,
             >>()
             .change_context(MetricsError::PostProcessingFailure)
     }
diff --git a/crates/analytics/src/payments/metrics/connector_success_rate.rs b/crates/analytics/src/payments/metrics/connector_success_rate.rs
new file mode 100644
index 000000000000..0c4d19b2e0ba
--- /dev/null
+++ b/crates/analytics/src/payments/metrics/connector_success_rate.rs
@@ -0,0 +1,130 @@
+use api_models::analytics::{
+    payments::{PaymentDimensions, PaymentFilters, PaymentMetricsBucketIdentifier},
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::PaymentMetricRow;
+use crate::{
+    query::{
+        Aggregate, FilterTypes, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql,
+        Window,
+    },
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct ConnectorSuccessRate;
+
+#[async_trait::async_trait]
+impl<T> super::PaymentMetric<T> for ConnectorSuccessRate
+where
+    T: AnalyticsDataSource + super::PaymentMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[PaymentDimensions],
+        merchant_id: &str,
+        filters: &PaymentFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::Payment);
+        let mut dimensions = dimensions.to_vec();
+
+        dimensions.push(PaymentDimensions::PaymentStatus);
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Min {
+                field: "created_at",
+                alias: Some("start_bucket"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Max {
+                field: "created_at",
+                alias: Some("end_bucket"),
+            })
+            .switch()?;
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", merchant_id)
+            .switch()?;
+        query_builder
+            .add_custom_filter_clause(PaymentDimensions::Connector, "NULL", FilterTypes::IsNotNull)
+            .switch()?;
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(granularity) = granularity.as_ref() {
+            granularity
+                .set_group_by_clause(&mut query_builder)
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<PaymentMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    PaymentMetricsBucketIdentifier::new(
+                        i.currency.as_ref().map(|i| i.0),
+                        None,
+                        i.connector.clone(),
+                        i.authentication_type.as_ref().map(|i| i.0),
+                        i.payment_method.clone(),
+                        i.payment_method_type.clone(),
+                        TimeRange {
+                            start_time: match (granularity, i.start_bucket) {
+                                (Some(g), Some(st)) => g.clip_to_start(st)?,
+                                _ => time_range.start_time,
+                            },
+                            end_time: granularity.as_ref().map_or_else(
+                                || Ok(time_range.end_time),
+                                |g| i.end_bucket.map(|et| g.clip_to_end(et)).transpose(),
+                            )?,
+                        },
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/router/src/analytics/payments/metrics/payment_count.rs b/crates/analytics/src/payments/metrics/payment_count.rs
similarity index 94%
rename from crates/router/src/analytics/payments/metrics/payment_count.rs
rename to crates/analytics/src/payments/metrics/payment_count.rs
index 661cec3dac36..34e71f3da6fb 100644
--- a/crates/router/src/analytics/payments/metrics/payment_count.rs
+++ b/crates/analytics/src/payments/metrics/payment_count.rs
@@ -7,8 +7,8 @@ use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::PaymentMetricRow;
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 
@@ -23,6 +23,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -97,6 +98,7 @@ where
                         i.connector.clone(),
                         i.authentication_type.as_ref().map(|i| i.0),
                         i.payment_method.clone(),
+                        i.payment_method_type.clone(),
                         TimeRange {
                             start_time: match (granularity, i.start_bucket) {
                                 (Some(g), Some(st)) => g.clip_to_start(st)?,
@@ -111,7 +113,7 @@ where
                     i,
                 ))
             })
-            .collect::<error_stack::Result<Vec<_>, crate::analytics::query::PostProcessingError>>()
+            .collect::<error_stack::Result<Vec<_>, crate::query::PostProcessingError>>()
             .change_context(MetricsError::PostProcessingFailure)
     }
 }
diff --git a/crates/router/src/analytics/payments/metrics/payment_processed_amount.rs b/crates/analytics/src/payments/metrics/payment_processed_amount.rs
similarity index 94%
rename from crates/router/src/analytics/payments/metrics/payment_processed_amount.rs
rename to crates/analytics/src/payments/metrics/payment_processed_amount.rs
index 2ec0c6f18f9c..f2dbf97e0db9 100644
--- a/crates/router/src/analytics/payments/metrics/payment_processed_amount.rs
+++ b/crates/analytics/src/payments/metrics/payment_processed_amount.rs
@@ -2,14 +2,14 @@ use api_models::analytics::{
     payments::{PaymentDimensions, PaymentFilters, PaymentMetricsBucketIdentifier},
     Granularity, TimeRange,
 };
-use common_enums::enums as storage_enums;
 use common_utils::errors::ReportSwitchExt;
+use diesel_models::enums as storage_enums;
 use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::PaymentMetricRow;
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 
@@ -24,6 +24,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -105,6 +106,7 @@ where
                         i.connector.clone(),
                         i.authentication_type.as_ref().map(|i| i.0),
                         i.payment_method.clone(),
+                        i.payment_method_type.clone(),
                         TimeRange {
                             start_time: match (granularity, i.start_bucket) {
                                 (Some(g), Some(st)) => g.clip_to_start(st)?,
@@ -121,7 +123,7 @@ where
             })
             .collect::<error_stack::Result<
                 Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>,
-                crate::analytics::query::PostProcessingError,
+                crate::query::PostProcessingError,
             >>()
             .change_context(MetricsError::PostProcessingFailure)
     }
diff --git a/crates/router/src/analytics/payments/metrics/payment_success_count.rs b/crates/analytics/src/payments/metrics/payment_success_count.rs
similarity index 94%
rename from crates/router/src/analytics/payments/metrics/payment_success_count.rs
rename to crates/analytics/src/payments/metrics/payment_success_count.rs
index 8245fe7aeb88..a6fb8ed2239d 100644
--- a/crates/router/src/analytics/payments/metrics/payment_success_count.rs
+++ b/crates/analytics/src/payments/metrics/payment_success_count.rs
@@ -2,14 +2,14 @@ use api_models::analytics::{
     payments::{PaymentDimensions, PaymentFilters, PaymentMetricsBucketIdentifier},
     Granularity, TimeRange,
 };
-use common_enums::enums as storage_enums;
 use common_utils::errors::ReportSwitchExt;
+use diesel_models::enums as storage_enums;
 use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::PaymentMetricRow;
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 
@@ -24,6 +24,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -104,6 +105,7 @@ where
                         i.connector.clone(),
                         i.authentication_type.as_ref().map(|i| i.0),
                         i.payment_method.clone(),
+                        i.payment_method_type.clone(),
                         TimeRange {
                             start_time: match (granularity, i.start_bucket) {
                                 (Some(g), Some(st)) => g.clip_to_start(st)?,
@@ -120,7 +122,7 @@ where
             })
             .collect::<error_stack::Result<
                 Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>,
-                crate::analytics::query::PostProcessingError,
+                crate::query::PostProcessingError,
             >>()
             .change_context(MetricsError::PostProcessingFailure)
     }
diff --git a/crates/analytics/src/payments/metrics/retries_count.rs b/crates/analytics/src/payments/metrics/retries_count.rs
new file mode 100644
index 000000000000..91952adb569a
--- /dev/null
+++ b/crates/analytics/src/payments/metrics/retries_count.rs
@@ -0,0 +1,122 @@
+use api_models::analytics::{
+    payments::{PaymentDimensions, PaymentFilters, PaymentMetricsBucketIdentifier},
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::PaymentMetricRow;
+use crate::{
+    query::{
+        Aggregate, FilterTypes, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql,
+        Window,
+    },
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct RetriesCount;
+
+#[async_trait::async_trait]
+impl<T> super::PaymentMetric<T> for RetriesCount
+where
+    T: AnalyticsDataSource + super::PaymentMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        _dimensions: &[PaymentDimensions],
+        merchant_id: &str,
+        _filters: &PaymentFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> =
+            QueryBuilder::new(AnalyticsCollection::PaymentIntent);
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Sum {
+                field: "amount",
+                alias: Some("total"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Min {
+                field: "created_at",
+                alias: Some("start_bucket"),
+            })
+            .switch()?;
+        query_builder
+            .add_select_column(Aggregate::Max {
+                field: "created_at",
+                alias: Some("end_bucket"),
+            })
+            .switch()?;
+        query_builder
+            .add_filter_clause("merchant_id", merchant_id)
+            .switch()?;
+        query_builder
+            .add_custom_filter_clause("attempt_count", "1", FilterTypes::Gt)
+            .switch()?;
+        query_builder
+            .add_custom_filter_clause("status", "succeeded", FilterTypes::Equal)
+            .switch()?;
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            granularity
+                .set_group_by_clause(&mut query_builder)
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<PaymentMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    PaymentMetricsBucketIdentifier::new(
+                        i.currency.as_ref().map(|i| i.0),
+                        None,
+                        i.connector.clone(),
+                        i.authentication_type.as_ref().map(|i| i.0),
+                        i.payment_method.clone(),
+                        i.payment_method_type.clone(),
+                        TimeRange {
+                            start_time: match (granularity, i.start_bucket) {
+                                (Some(g), Some(st)) => g.clip_to_start(st)?,
+                                _ => time_range.start_time,
+                            },
+                            end_time: granularity.as_ref().map_or_else(
+                                || Ok(time_range.end_time),
+                                |g| i.end_bucket.map(|et| g.clip_to_end(et)).transpose(),
+                            )?,
+                        },
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/router/src/analytics/payments/metrics/success_rate.rs b/crates/analytics/src/payments/metrics/success_rate.rs
similarity index 95%
rename from crates/router/src/analytics/payments/metrics/success_rate.rs
rename to crates/analytics/src/payments/metrics/success_rate.rs
index c63956d4b157..9e688240ddbf 100644
--- a/crates/router/src/analytics/payments/metrics/success_rate.rs
+++ b/crates/analytics/src/payments/metrics/success_rate.rs
@@ -7,8 +7,8 @@ use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::PaymentMetricRow;
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 
@@ -23,6 +23,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -100,6 +101,7 @@ where
                         i.connector.clone(),
                         i.authentication_type.as_ref().map(|i| i.0),
                         i.payment_method.clone(),
+                        i.payment_method_type.clone(),
                         TimeRange {
                             start_time: match (granularity, i.start_bucket) {
                                 (Some(g), Some(st)) => g.clip_to_start(st)?,
@@ -116,7 +118,7 @@ where
             })
             .collect::<error_stack::Result<
                 Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>,
-                crate::analytics::query::PostProcessingError,
+                crate::query::PostProcessingError,
             >>()
             .change_context(MetricsError::PostProcessingFailure)
     }
diff --git a/crates/router/src/analytics/payments/types.rs b/crates/analytics/src/payments/types.rs
similarity index 82%
rename from crates/router/src/analytics/payments/types.rs
rename to crates/analytics/src/payments/types.rs
index fdfbedef383d..d5d8eca13e58 100644
--- a/crates/router/src/analytics/payments/types.rs
+++ b/crates/analytics/src/payments/types.rs
@@ -1,7 +1,7 @@
 use api_models::analytics::payments::{PaymentDimensions, PaymentFilters};
 use error_stack::ResultExt;
 
-use crate::analytics::{
+use crate::{
     query::{QueryBuilder, QueryFilter, QueryResult, ToSql},
     types::{AnalyticsCollection, AnalyticsDataSource},
 };
@@ -41,6 +41,15 @@ where
                 .add_filter_in_range_clause(PaymentDimensions::PaymentMethod, &self.payment_method)
                 .attach_printable("Error adding payment method filter")?;
         }
+
+        if !self.payment_method_type.is_empty() {
+            builder
+                .add_filter_in_range_clause(
+                    PaymentDimensions::PaymentMethodType,
+                    &self.payment_method_type,
+                )
+                .attach_printable("Error adding payment method filter")?;
+        }
         Ok(())
     }
 }
diff --git a/crates/router/src/analytics/query.rs b/crates/analytics/src/query.rs
similarity index 65%
rename from crates/router/src/analytics/query.rs
rename to crates/analytics/src/query.rs
index b1f621d8153d..b924987f004c 100644
--- a/crates/router/src/analytics/query.rs
+++ b/crates/analytics/src/query.rs
@@ -1,26 +1,26 @@
-#![allow(dead_code)]
 use std::marker::PhantomData;
 
 use api_models::{
     analytics::{
         self as analytics_api,
-        payments::PaymentDimensions,
+        api_event::ApiEventDimensions,
+        payments::{PaymentDimensions, PaymentDistributions},
         refunds::{RefundDimensions, RefundType},
+        sdk_events::{SdkEventDimensions, SdkEventNames},
         Granularity,
     },
-    enums::Connector,
+    enums::{
+        AttemptStatus, AuthenticationType, Connector, Currency, PaymentMethod, PaymentMethodType,
+    },
     refunds::RefundStatus,
 };
-use common_enums::{
-    enums as storage_enums,
-    enums::{AttemptStatus, AuthenticationType, Currency, PaymentMethod},
-};
 use common_utils::errors::{CustomResult, ParsingError};
+use diesel_models::enums as storage_enums;
 use error_stack::{IntoReport, ResultExt};
-use router_env::logger;
+use router_env::{logger, Flow};
 
-use super::types::{AnalyticsCollection, AnalyticsDataSource, LoadRow};
-use crate::analytics::types::QueryExecutionError;
+use super::types::{AnalyticsCollection, AnalyticsDataSource, LoadRow, TableEngine};
+use crate::types::QueryExecutionError;
 pub type QueryResult<T> = error_stack::Result<T, QueryBuildingError>;
 pub trait QueryFilter<T>
 where
@@ -89,12 +89,12 @@ impl GroupByClause<super::SqlxClient> for Granularity {
         let granularity_divisor = self.get_bucket_size();
 
         builder
-            .add_group_by_clause(format!("DATE_TRUNC('{trunc_scale}', modified_at)"))
+            .add_group_by_clause(format!("DATE_TRUNC('{trunc_scale}', created_at)"))
             .attach_printable("Error adding time prune group by")?;
         if let Some(scale) = granularity_bucket_scale {
             builder
                 .add_group_by_clause(format!(
-                    "FLOOR(DATE_PART('{scale}', modified_at)/{granularity_divisor})"
+                    "FLOOR(DATE_PART('{scale}', created_at)/{granularity_divisor})"
                 ))
                 .attach_printable("Error adding time binning group by")?;
         }
@@ -102,6 +102,26 @@ impl GroupByClause<super::SqlxClient> for Granularity {
     }
 }
 
+impl GroupByClause<super::ClickhouseClient> for Granularity {
+    fn set_group_by_clause(
+        &self,
+        builder: &mut QueryBuilder<super::ClickhouseClient>,
+    ) -> QueryResult<()> {
+        let interval = match self {
+            Self::OneMin => "toStartOfMinute(created_at)",
+            Self::FiveMin => "toStartOfFiveMinutes(created_at)",
+            Self::FifteenMin => "toStartOfFifteenMinutes(created_at)",
+            Self::ThirtyMin => "toStartOfInterval(created_at, INTERVAL 30 minute)",
+            Self::OneHour => "toStartOfHour(created_at)",
+            Self::OneDay => "toStartOfDay(created_at)",
+        };
+
+        builder
+            .add_group_by_clause(interval)
+            .attach_printable("Error adding interval group by")
+    }
+}
+
 #[derive(strum::Display)]
 #[strum(serialize_all = "lowercase")]
 pub enum TimeGranularityLevel {
@@ -229,6 +249,76 @@ pub enum Aggregate<R> {
     },
 }
 
+// Window functions in query
+// ---
+// Description -
+// field: to_sql type value used as expr in aggregation
+// partition_by: partition by fields in window
+// order_by: order by fields and order (Ascending / Descending) in window
+// alias: alias of window expr in query
+// ---
+// Usage -
+// Window::Sum {
+//     field: "count",
+//     partition_by: Some(query_builder.transform_to_sql_values(&dimensions).switch()?),
+//     order_by: Some(("value", Descending)),
+//     alias: Some("total"),
+// }
+#[derive(Debug)]
+pub enum Window<R> {
+    Sum {
+        field: R,
+        partition_by: Option<String>,
+        order_by: Option<(String, Order)>,
+        alias: Option<&'static str>,
+    },
+    RowNumber {
+        field: R,
+        partition_by: Option<String>,
+        order_by: Option<(String, Order)>,
+        alias: Option<&'static str>,
+    },
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum Order {
+    Ascending,
+    Descending,
+}
+
+impl ToString for Order {
+    fn to_string(&self) -> String {
+        String::from(match self {
+            Self::Ascending => "asc",
+            Self::Descending => "desc",
+        })
+    }
+}
+
+// Select TopN values for a group based on a metric
+// ---
+// Description -
+// columns: Columns in group to select TopN values for
+// count: N in TopN
+// order_column: metric used to sort and limit TopN
+// order: sort order of metric (Ascending / Descending)
+// ---
+// Usage -
+// Use via add_top_n_clause fn of query_builder
+// add_top_n_clause(
+//     &dimensions,
+//     distribution.distribution_cardinality.into(),
+//     "count",
+//     Order::Descending,
+// )
+#[derive(Debug)]
+pub struct TopN {
+    pub columns: String,
+    pub count: u64,
+    pub order_column: String,
+    pub order: Order,
+}
+
 #[derive(Debug)]
 pub struct QueryBuilder<T>
 where
@@ -239,13 +329,16 @@ where
     filters: Vec<(String, FilterTypes, String)>,
     group_by: Vec<String>,
     having: Option<Vec<(String, FilterTypes, String)>>,
+    outer_select: Vec<String>,
+    top_n: Option<TopN>,
     table: AnalyticsCollection,
     distinct: bool,
     db_type: PhantomData<T>,
+    table_engine: TableEngine,
 }
 
 pub trait ToSql<T: AnalyticsDataSource> {
-    fn to_sql(&self) -> error_stack::Result<String, ParsingError>;
+    fn to_sql(&self, table_engine: &TableEngine) -> error_stack::Result<String, ParsingError>;
 }
 
 /// Implement `ToSql` on arrays of types that impl `ToString`.
@@ -253,7 +346,7 @@ macro_rules! impl_to_sql_for_to_string {
     ($($type:ty),+) => {
         $(
             impl<T: AnalyticsDataSource> ToSql<T> for $type {
-                fn to_sql(&self) -> error_stack::Result<String, ParsingError> {
+                fn to_sql(&self, _table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
                     Ok(self.to_string())
                 }
             }
@@ -267,8 +360,10 @@ impl_to_sql_for_to_string!(
     &PaymentDimensions,
     &RefundDimensions,
     PaymentDimensions,
+    &PaymentDistributions,
     RefundDimensions,
     PaymentMethod,
+    PaymentMethodType,
     AuthenticationType,
     Connector,
     AttemptStatus,
@@ -276,12 +371,18 @@ impl_to_sql_for_to_string!(
     storage_enums::RefundStatus,
     Currency,
     RefundType,
+    Flow,
     &String,
     &bool,
-    &u64
+    &u64,
+    u64,
+    Order
 );
 
-#[allow(dead_code)]
+impl_to_sql_for_to_string!(&SdkEventDimensions, SdkEventDimensions, SdkEventNames);
+
+impl_to_sql_for_to_string!(&ApiEventDimensions, ApiEventDimensions);
+
 #[derive(Debug)]
 pub enum FilterTypes {
     Equal,
@@ -290,6 +391,23 @@ pub enum FilterTypes {
     Gte,
     Lte,
     Gt,
+    Like,
+    NotLike,
+    IsNotNull,
+}
+
+pub fn filter_type_to_sql(l: &String, op: &FilterTypes, r: &String) -> String {
+    match op {
+        FilterTypes::EqualBool => format!("{l} = {r}"),
+        FilterTypes::Equal => format!("{l} = '{r}'"),
+        FilterTypes::In => format!("{l} IN ({r})"),
+        FilterTypes::Gte => format!("{l} >= '{r}'"),
+        FilterTypes::Gt => format!("{l} > {r}"),
+        FilterTypes::Lte => format!("{l} <= '{r}'"),
+        FilterTypes::Like => format!("{l} LIKE '%{r}%'"),
+        FilterTypes::NotLike => format!("{l} NOT LIKE '%{r}%'"),
+        FilterTypes::IsNotNull => format!("{l} IS NOT NULL"),
+    }
 }
 
 impl<T> QueryBuilder<T>
@@ -303,22 +421,68 @@ where
             filters: Default::default(),
             group_by: Default::default(),
             having: Default::default(),
+            outer_select: Default::default(),
+            top_n: Default::default(),
             table,
             distinct: Default::default(),
             db_type: Default::default(),
+            table_engine: T::get_table_engine(table),
         }
     }
 
     pub fn add_select_column(&mut self, column: impl ToSql<T>) -> QueryResult<()> {
         self.columns.push(
             column
-                .to_sql()
+                .to_sql(&self.table_engine)
                 .change_context(QueryBuildingError::SqlSerializeError)
                 .attach_printable("Error serializing select column")?,
         );
         Ok(())
     }
 
+    pub fn transform_to_sql_values(&mut self, values: &[impl ToSql<T>]) -> QueryResult<String> {
+        let res = values
+            .iter()
+            .map(|i| i.to_sql(&self.table_engine))
+            .collect::<error_stack::Result<Vec<String>, ParsingError>>()
+            .change_context(QueryBuildingError::SqlSerializeError)
+            .attach_printable("Error serializing range filter value")?
+            .join(", ");
+        Ok(res)
+    }
+
+    pub fn add_top_n_clause(
+        &mut self,
+        columns: &[impl ToSql<T>],
+        count: u64,
+        order_column: impl ToSql<T>,
+        order: Order,
+    ) -> QueryResult<()>
+    where
+        Window<&'static str>: ToSql<T>,
+    {
+        let partition_by_columns = self.transform_to_sql_values(columns)?;
+        let order_by_column = order_column
+            .to_sql(&self.table_engine)
+            .change_context(QueryBuildingError::SqlSerializeError)
+            .attach_printable("Error serializing select column")?;
+
+        self.add_outer_select_column(Window::RowNumber {
+            field: "",
+            partition_by: Some(partition_by_columns.clone()),
+            order_by: Some((order_by_column.clone(), order)),
+            alias: Some("top_n"),
+        })?;
+
+        self.top_n = Some(TopN {
+            columns: partition_by_columns,
+            count,
+            order_column: order_by_column,
+            order,
+        });
+        Ok(())
+    }
+
     pub fn set_distinct(&mut self) {
         self.distinct = true
     }
@@ -346,11 +510,11 @@ where
         comparison: FilterTypes,
     ) -> QueryResult<()> {
         self.filters.push((
-            lhs.to_sql()
+            lhs.to_sql(&self.table_engine)
                 .change_context(QueryBuildingError::SqlSerializeError)
                 .attach_printable("Error serializing filter key")?,
             comparison,
-            rhs.to_sql()
+            rhs.to_sql(&self.table_engine)
                 .change_context(QueryBuildingError::SqlSerializeError)
                 .attach_printable("Error serializing filter value")?,
         ));
@@ -366,7 +530,7 @@ where
             .iter()
             .map(|i| {
                 // trimming whitespaces from the filter values received in request, to prevent a possibility of an SQL injection
-                i.to_sql().map(|s| {
+                i.to_sql(&self.table_engine).map(|s| {
                     let trimmed_str = s.replace(' ', "");
                     format!("'{trimmed_str}'")
                 })
@@ -381,7 +545,7 @@ where
     pub fn add_group_by_clause(&mut self, column: impl ToSql<T>) -> QueryResult<()> {
         self.group_by.push(
             column
-                .to_sql()
+                .to_sql(&self.table_engine)
                 .change_context(QueryBuildingError::SqlSerializeError)
                 .attach_printable("Error serializing group by field")?,
         );
@@ -406,14 +570,7 @@ where
     fn get_filter_clause(&self) -> String {
         self.filters
             .iter()
-            .map(|(l, op, r)| match op {
-                FilterTypes::EqualBool => format!("{l} = {r}"),
-                FilterTypes::Equal => format!("{l} = '{r}'"),
-                FilterTypes::In => format!("{l} IN ({r})"),
-                FilterTypes::Gte => format!("{l} >= '{r}'"),
-                FilterTypes::Gt => format!("{l} > {r}"),
-                FilterTypes::Lte => format!("{l} <= '{r}'"),
-            })
+            .map(|(l, op, r)| filter_type_to_sql(l, op, r))
             .collect::<Vec<String>>()
             .join(" AND ")
     }
@@ -426,7 +583,10 @@ where
         self.group_by.join(", ")
     }
 
-    #[allow(dead_code)]
+    fn get_outer_select_clause(&self) -> String {
+        self.outer_select.join(", ")
+    }
+
     pub fn add_having_clause<R>(
         &mut self,
         aggregate: Aggregate<R>,
@@ -437,11 +597,11 @@ where
         Aggregate<R>: ToSql<T>,
     {
         let aggregate = aggregate
-            .to_sql()
+            .to_sql(&self.table_engine)
             .change_context(QueryBuildingError::SqlSerializeError)
             .attach_printable("Error serializing having aggregate")?;
         let value = value
-            .to_sql()
+            .to_sql(&self.table_engine)
             .change_context(QueryBuildingError::SqlSerializeError)
             .attach_printable("Error serializing having value")?;
         let entry = (aggregate, filter_type, value);
@@ -453,16 +613,20 @@ where
         Ok(())
     }
 
+    pub fn add_outer_select_column(&mut self, column: impl ToSql<T>) -> QueryResult<()> {
+        self.outer_select.push(
+            column
+                .to_sql(&self.table_engine)
+                .change_context(QueryBuildingError::SqlSerializeError)
+                .attach_printable("Error serializing outer select column")?,
+        );
+        Ok(())
+    }
+
     pub fn get_filter_type_clause(&self) -> Option<String> {
         self.having.as_ref().map(|vec| {
             vec.iter()
-                .map(|(l, op, r)| match op {
-                    FilterTypes::Equal | FilterTypes::EqualBool => format!("{l} = {r}"),
-                    FilterTypes::In => format!("{l} IN ({r})"),
-                    FilterTypes::Gte => format!("{l} >= {r}"),
-                    FilterTypes::Lte => format!("{l} < {r}"),
-                    FilterTypes::Gt => format!("{l} > {r}"),
-                })
+                .map(|(l, op, r)| filter_type_to_sql(l, op, r))
                 .collect::<Vec<String>>()
                 .join(" AND ")
         })
@@ -471,6 +635,7 @@ where
     pub fn build_query(&mut self) -> QueryResult<String>
     where
         Aggregate<&'static str>: ToSql<T>,
+        Window<&'static str>: ToSql<T>,
     {
         if self.columns.is_empty() {
             Err(QueryBuildingError::InvalidQuery(
@@ -491,7 +656,7 @@ where
         query.push_str(
             &self
                 .table
-                .to_sql()
+                .to_sql(&self.table_engine)
                 .change_context(QueryBuildingError::SqlSerializeError)
                 .attach_printable("Error serializing table value")?,
         );
@@ -504,6 +669,16 @@ where
         if !self.group_by.is_empty() {
             query.push_str(" GROUP BY ");
             query.push_str(&self.get_group_by_clause());
+            if let TableEngine::CollapsingMergeTree { sign } = self.table_engine {
+                self.add_having_clause(
+                    Aggregate::Count {
+                        field: Some(sign),
+                        alias: None,
+                    },
+                    FilterTypes::Gte,
+                    "1",
+                )?;
+            }
         }
 
         if self.having.is_some() {
@@ -512,6 +687,22 @@ where
                 query.push_str(condition.as_str());
             }
         }
+
+        if !self.outer_select.is_empty() {
+            query.insert_str(
+                0,
+                format!("SELECT {} FROM (", &self.get_outer_select_clause()).as_str(),
+            );
+            query.push_str(") _");
+        }
+
+        if let Some(top_n) = &self.top_n {
+            query.insert_str(0, "SELECT * FROM (");
+            query.push_str(format!(") _ WHERE top_n <= {}", top_n.count).as_str());
+        }
+
+        println!("{}", query);
+
         Ok(query)
     }
 
@@ -522,6 +713,7 @@ where
     where
         P: LoadRow<R>,
         Aggregate<&'static str>: ToSql<T>,
+        Window<&'static str>: ToSql<T>,
     {
         let query = self
             .build_query()
diff --git a/crates/router/src/analytics/refunds.rs b/crates/analytics/src/refunds.rs
similarity index 81%
rename from crates/router/src/analytics/refunds.rs
rename to crates/analytics/src/refunds.rs
index a8b52effe76d..53481e232817 100644
--- a/crates/router/src/analytics/refunds.rs
+++ b/crates/analytics/src/refunds.rs
@@ -7,4 +7,4 @@ pub mod types;
 pub use accumulator::{RefundMetricAccumulator, RefundMetricsAccumulator};
 
 pub trait RefundAnalytics: metrics::RefundMetricAnalytics {}
-pub use self::core::get_metrics;
+pub use self::core::{get_filters, get_metrics};
diff --git a/crates/router/src/analytics/refunds/accumulator.rs b/crates/analytics/src/refunds/accumulator.rs
similarity index 98%
rename from crates/router/src/analytics/refunds/accumulator.rs
rename to crates/analytics/src/refunds/accumulator.rs
index 3d0c0e659f6c..9c51defdcf91 100644
--- a/crates/router/src/analytics/refunds/accumulator.rs
+++ b/crates/analytics/src/refunds/accumulator.rs
@@ -1,5 +1,5 @@
 use api_models::analytics::refunds::RefundMetricsBucketValue;
-use common_enums::enums as storage_enums;
+use diesel_models::enums as storage_enums;
 
 use super::metrics::RefundMetricRow;
 #[derive(Debug, Default)]
@@ -15,13 +15,11 @@ pub struct SuccessRateAccumulator {
     pub success: i64,
     pub total: i64,
 }
-
 #[derive(Debug, Default)]
 #[repr(transparent)]
 pub struct CountAccumulator {
     pub count: Option<i64>,
 }
-
 #[derive(Debug, Default)]
 #[repr(transparent)]
 pub struct SumAccumulator {
diff --git a/crates/analytics/src/refunds/core.rs b/crates/analytics/src/refunds/core.rs
new file mode 100644
index 000000000000..25a1e228f567
--- /dev/null
+++ b/crates/analytics/src/refunds/core.rs
@@ -0,0 +1,203 @@
+#![allow(dead_code)]
+use std::collections::HashMap;
+
+use api_models::analytics::{
+    refunds::{
+        RefundDimensions, RefundMetrics, RefundMetricsBucketIdentifier, RefundMetricsBucketResponse,
+    },
+    AnalyticsMetadata, GetRefundFilterRequest, GetRefundMetricRequest, MetricsResponse,
+    RefundFilterValue, RefundFiltersResponse,
+};
+use error_stack::{IntoReport, ResultExt};
+use router_env::{
+    logger,
+    tracing::{self, Instrument},
+};
+
+use super::{
+    filters::{get_refund_filter_for_dimension, RefundFilterRow},
+    RefundMetricsAccumulator,
+};
+use crate::{
+    errors::{AnalyticsError, AnalyticsResult},
+    metrics,
+    refunds::RefundMetricAccumulator,
+    AnalyticsProvider,
+};
+
+pub async fn get_metrics(
+    pool: &AnalyticsProvider,
+    merchant_id: &String,
+    req: GetRefundMetricRequest,
+) -> AnalyticsResult<MetricsResponse<RefundMetricsBucketResponse>> {
+    let mut metrics_accumulator: HashMap<RefundMetricsBucketIdentifier, RefundMetricsAccumulator> =
+        HashMap::new();
+    let mut set = tokio::task::JoinSet::new();
+    for metric_type in req.metrics.iter().cloned() {
+        let req = req.clone();
+        let pool = pool.clone();
+        let task_span = tracing::debug_span!(
+            "analytics_refund_query",
+            refund_metric = metric_type.as_ref()
+        );
+        // Currently JoinSet works with only static lifetime references even if the task pool does not outlive the given reference
+        // We can optimize away this clone once that is fixed
+        let merchant_id_scoped = merchant_id.to_owned();
+        set.spawn(
+            async move {
+                let data = pool
+                    .get_refund_metrics(
+                        &metric_type,
+                        &req.group_by_names.clone(),
+                        &merchant_id_scoped,
+                        &req.filters,
+                        &req.time_series.map(|t| t.granularity),
+                        &req.time_range,
+                    )
+                    .await
+                    .change_context(AnalyticsError::UnknownError);
+                (metric_type, data)
+            }
+            .instrument(task_span),
+        );
+    }
+
+    while let Some((metric, data)) = set
+        .join_next()
+        .await
+        .transpose()
+        .into_report()
+        .change_context(AnalyticsError::UnknownError)?
+    {
+        let data = data?;
+        let attributes = &[
+            metrics::request::add_attributes("metric_type", metric.to_string()),
+            metrics::request::add_attributes("source", pool.to_string()),
+        ];
+
+        let value = u64::try_from(data.len());
+        if let Ok(val) = value {
+            metrics::BUCKETS_FETCHED.record(&metrics::CONTEXT, val, attributes);
+            logger::debug!("Attributes: {:?}, Buckets fetched: {}", attributes, val);
+        }
+
+        for (id, value) in data {
+            logger::debug!(bucket_id=?id, bucket_value=?value, "Bucket row for metric {metric}");
+            let metrics_builder = metrics_accumulator.entry(id).or_default();
+            match metric {
+                RefundMetrics::RefundSuccessRate => metrics_builder
+                    .refund_success_rate
+                    .add_metrics_bucket(&value),
+                RefundMetrics::RefundCount => {
+                    metrics_builder.refund_count.add_metrics_bucket(&value)
+                }
+                RefundMetrics::RefundSuccessCount => {
+                    metrics_builder.refund_success.add_metrics_bucket(&value)
+                }
+                RefundMetrics::RefundProcessedAmount => {
+                    metrics_builder.processed_amount.add_metrics_bucket(&value)
+                }
+            }
+        }
+
+        logger::debug!(
+            "Analytics Accumulated Results: metric: {}, results: {:#?}",
+            metric,
+            metrics_accumulator
+        );
+    }
+    let query_data: Vec<RefundMetricsBucketResponse> = metrics_accumulator
+        .into_iter()
+        .map(|(id, val)| RefundMetricsBucketResponse {
+            values: val.collect(),
+            dimensions: id,
+        })
+        .collect();
+
+    Ok(MetricsResponse {
+        query_data,
+        meta_data: [AnalyticsMetadata {
+            current_time_range: req.time_range,
+        }],
+    })
+}
+
+pub async fn get_filters(
+    pool: &AnalyticsProvider,
+    req: GetRefundFilterRequest,
+    merchant_id: &String,
+) -> AnalyticsResult<RefundFiltersResponse> {
+    let mut res = RefundFiltersResponse::default();
+    for dim in req.group_by_names {
+        let values = match pool {
+                        AnalyticsProvider::Sqlx(pool) => {
+                get_refund_filter_for_dimension(dim, merchant_id, &req.time_range, pool)
+                    .await
+            }
+                        AnalyticsProvider::Clickhouse(pool) => {
+                get_refund_filter_for_dimension(dim, merchant_id, &req.time_range, pool)
+                    .await
+            }
+                    AnalyticsProvider::CombinedCkh(sqlx_pool, ckh_pool) => {
+                let ckh_result = get_refund_filter_for_dimension(
+                    dim,
+                    merchant_id,
+                    &req.time_range,
+                    ckh_pool,
+                )
+                .await;
+                let sqlx_result = get_refund_filter_for_dimension(
+                    dim,
+                    merchant_id,
+                    &req.time_range,
+                    sqlx_pool,
+                )
+                .await;
+                match (&sqlx_result, &ckh_result) {
+                    (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                        router_env::logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres refunds analytics filters")
+                    },
+                    _ => {}
+                };
+                ckh_result
+            }
+                    AnalyticsProvider::CombinedSqlx(sqlx_pool, ckh_pool) => {
+                let ckh_result = get_refund_filter_for_dimension(
+                    dim,
+                    merchant_id,
+                    &req.time_range,
+                    ckh_pool,
+                )
+                .await;
+                let sqlx_result = get_refund_filter_for_dimension(
+                    dim,
+                    merchant_id,
+                    &req.time_range,
+                    sqlx_pool,
+                )
+                .await;
+                match (&sqlx_result, &ckh_result) {
+                    (Ok(ref sqlx_res), Ok(ref ckh_res)) if sqlx_res != ckh_res => {
+                        router_env::logger::error!(clickhouse_result=?ckh_res, postgres_result=?sqlx_res, "Mismatch between clickhouse & postgres refunds analytics filters")
+                    },
+                    _ => {}
+                };
+                sqlx_result
+            }
+        }
+        .change_context(AnalyticsError::UnknownError)?
+        .into_iter()
+        .filter_map(|fil: RefundFilterRow| match dim {
+            RefundDimensions::Currency => fil.currency.map(|i| i.as_ref().to_string()),
+            RefundDimensions::RefundStatus => fil.refund_status.map(|i| i.as_ref().to_string()),
+            RefundDimensions::Connector => fil.connector,
+            RefundDimensions::RefundType => fil.refund_type.map(|i| i.as_ref().to_string()),
+        })
+        .collect::<Vec<String>>();
+        res.query_data.push(RefundFilterValue {
+            dimension: dim,
+            values,
+        })
+    }
+    Ok(res)
+}
diff --git a/crates/router/src/analytics/refunds/filters.rs b/crates/analytics/src/refunds/filters.rs
similarity index 90%
rename from crates/router/src/analytics/refunds/filters.rs
rename to crates/analytics/src/refunds/filters.rs
index 6b45e9194fad..29375483eb9a 100644
--- a/crates/router/src/analytics/refunds/filters.rs
+++ b/crates/analytics/src/refunds/filters.rs
@@ -2,13 +2,13 @@ use api_models::analytics::{
     refunds::{RefundDimensions, RefundType},
     Granularity, TimeRange,
 };
-use common_enums::enums::{Currency, RefundStatus};
 use common_utils::errors::ReportSwitchExt;
+use diesel_models::enums::{Currency, RefundStatus};
 use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
     types::{
         AnalyticsCollection, AnalyticsDataSource, DBEnumWrapper, FiltersError, FiltersResult,
         LoadRow,
@@ -28,6 +28,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::Refund);
 
@@ -49,8 +50,7 @@ where
         .change_context(FiltersError::QueryBuildingError)?
         .change_context(FiltersError::QueryExecutionFailure)
 }
-
-#[derive(Debug, serde::Serialize, Eq, PartialEq)]
+#[derive(Debug, serde::Serialize, Eq, PartialEq, serde::Deserialize)]
 pub struct RefundFilterRow {
     pub currency: Option<DBEnumWrapper<Currency>>,
     pub refund_status: Option<DBEnumWrapper<RefundStatus>>,
diff --git a/crates/router/src/analytics/refunds/metrics.rs b/crates/analytics/src/refunds/metrics.rs
similarity index 91%
rename from crates/router/src/analytics/refunds/metrics.rs
rename to crates/analytics/src/refunds/metrics.rs
index d4f509b4a1e3..10cd03546772 100644
--- a/crates/router/src/analytics/refunds/metrics.rs
+++ b/crates/analytics/src/refunds/metrics.rs
@@ -4,7 +4,7 @@ use api_models::analytics::{
     },
     Granularity, TimeRange,
 };
-use common_enums::enums as storage_enums;
+use diesel_models::enums as storage_enums;
 use time::PrimitiveDateTime;
 mod refund_count;
 mod refund_processed_amount;
@@ -15,12 +15,11 @@ use refund_processed_amount::RefundProcessedAmount;
 use refund_success_count::RefundSuccessCount;
 use refund_success_rate::RefundSuccessRate;
 
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, DBEnumWrapper, LoadRow, MetricsResult},
 };
-
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Debug, Eq, PartialEq, serde::Deserialize)]
 pub struct RefundMetricRow {
     pub currency: Option<DBEnumWrapper<storage_enums::Currency>>,
     pub refund_status: Option<DBEnumWrapper<storage_enums::RefundStatus>>,
@@ -28,7 +27,9 @@ pub struct RefundMetricRow {
     pub refund_type: Option<DBEnumWrapper<RefundType>>,
     pub total: Option<bigdecimal::BigDecimal>,
     pub count: Option<i64>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
     pub start_bucket: Option<PrimitiveDateTime>,
+    #[serde(with = "common_utils::custom_serde::iso8601::option")]
     pub end_bucket: Option<PrimitiveDateTime>,
 }
 
@@ -42,6 +43,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -62,6 +64,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
diff --git a/crates/router/src/analytics/refunds/metrics/refund_count.rs b/crates/analytics/src/refunds/metrics/refund_count.rs
similarity index 94%
rename from crates/router/src/analytics/refunds/metrics/refund_count.rs
rename to crates/analytics/src/refunds/metrics/refund_count.rs
index 471327235073..cf3c7a509278 100644
--- a/crates/router/src/analytics/refunds/metrics/refund_count.rs
+++ b/crates/analytics/src/refunds/metrics/refund_count.rs
@@ -7,8 +7,8 @@ use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::RefundMetricRow;
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 
@@ -23,6 +23,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -93,7 +94,7 @@ where
                 Ok((
                     RefundMetricsBucketIdentifier::new(
                         i.currency.as_ref().map(|i| i.0),
-                        i.refund_status.as_ref().map(|i| i.0),
+                        i.refund_status.as_ref().map(|i| i.0.to_string()),
                         i.connector.clone(),
                         i.refund_type.as_ref().map(|i| i.0.to_string()),
                         TimeRange {
@@ -110,7 +111,7 @@ where
                     i,
                 ))
             })
-            .collect::<error_stack::Result<Vec<_>, crate::analytics::query::PostProcessingError>>()
+            .collect::<error_stack::Result<Vec<_>, crate::query::PostProcessingError>>()
             .change_context(MetricsError::PostProcessingFailure)
     }
 }
diff --git a/crates/router/src/analytics/refunds/metrics/refund_processed_amount.rs b/crates/analytics/src/refunds/metrics/refund_processed_amount.rs
similarity index 95%
rename from crates/router/src/analytics/refunds/metrics/refund_processed_amount.rs
rename to crates/analytics/src/refunds/metrics/refund_processed_amount.rs
index c5f3a706aaef..661fca57b282 100644
--- a/crates/router/src/analytics/refunds/metrics/refund_processed_amount.rs
+++ b/crates/analytics/src/refunds/metrics/refund_processed_amount.rs
@@ -2,14 +2,14 @@ use api_models::analytics::{
     refunds::{RefundDimensions, RefundFilters, RefundMetricsBucketIdentifier},
     Granularity, TimeRange,
 };
-use common_enums::enums as storage_enums;
 use common_utils::errors::ReportSwitchExt;
+use diesel_models::enums as storage_enums;
 use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::RefundMetricRow;
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 #[derive(Default)]
@@ -23,6 +23,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -116,7 +117,7 @@ where
                     i,
                 ))
             })
-            .collect::<error_stack::Result<Vec<_>, crate::analytics::query::PostProcessingError>>()
+            .collect::<error_stack::Result<Vec<_>, crate::query::PostProcessingError>>()
             .change_context(MetricsError::PostProcessingFailure)
     }
 }
diff --git a/crates/router/src/analytics/refunds/metrics/refund_success_count.rs b/crates/analytics/src/refunds/metrics/refund_success_count.rs
similarity index 95%
rename from crates/router/src/analytics/refunds/metrics/refund_success_count.rs
rename to crates/analytics/src/refunds/metrics/refund_success_count.rs
index 0c8032908fd7..bc09d8b7ab64 100644
--- a/crates/router/src/analytics/refunds/metrics/refund_success_count.rs
+++ b/crates/analytics/src/refunds/metrics/refund_success_count.rs
@@ -2,14 +2,14 @@ use api_models::analytics::{
     refunds::{RefundDimensions, RefundFilters, RefundMetricsBucketIdentifier},
     Granularity, TimeRange,
 };
-use common_enums::enums as storage_enums;
 use common_utils::errors::ReportSwitchExt;
+use diesel_models::enums as storage_enums;
 use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::RefundMetricRow;
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 
@@ -24,6 +24,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -115,7 +116,7 @@ where
             })
             .collect::<error_stack::Result<
                 Vec<(RefundMetricsBucketIdentifier, RefundMetricRow)>,
-                crate::analytics::query::PostProcessingError,
+                crate::query::PostProcessingError,
             >>()
             .change_context(MetricsError::PostProcessingFailure)
     }
diff --git a/crates/router/src/analytics/refunds/metrics/refund_success_rate.rs b/crates/analytics/src/refunds/metrics/refund_success_rate.rs
similarity index 96%
rename from crates/router/src/analytics/refunds/metrics/refund_success_rate.rs
rename to crates/analytics/src/refunds/metrics/refund_success_rate.rs
index 42f9ccf8d3c0..29b73b885d8e 100644
--- a/crates/router/src/analytics/refunds/metrics/refund_success_rate.rs
+++ b/crates/analytics/src/refunds/metrics/refund_success_rate.rs
@@ -7,8 +7,8 @@ use error_stack::ResultExt;
 use time::PrimitiveDateTime;
 
 use super::RefundMetricRow;
-use crate::analytics::{
-    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql},
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window},
     types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
 };
 #[derive(Default)]
@@ -22,6 +22,7 @@ where
     AnalyticsCollection: ToSql<T>,
     Granularity: GroupByClause<T>,
     Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
 {
     async fn load_metrics(
         &self,
@@ -110,7 +111,7 @@ where
             })
             .collect::<error_stack::Result<
                 Vec<(RefundMetricsBucketIdentifier, RefundMetricRow)>,
-                crate::analytics::query::PostProcessingError,
+                crate::query::PostProcessingError,
             >>()
             .change_context(MetricsError::PostProcessingFailure)
     }
diff --git a/crates/router/src/analytics/refunds/types.rs b/crates/analytics/src/refunds/types.rs
similarity index 98%
rename from crates/router/src/analytics/refunds/types.rs
rename to crates/analytics/src/refunds/types.rs
index fbfd69972671..d7d739e1aba7 100644
--- a/crates/router/src/analytics/refunds/types.rs
+++ b/crates/analytics/src/refunds/types.rs
@@ -1,7 +1,7 @@
 use api_models::analytics::refunds::{RefundDimensions, RefundFilters};
 use error_stack::ResultExt;
 
-use crate::analytics::{
+use crate::{
     query::{QueryBuilder, QueryFilter, QueryResult, ToSql},
     types::{AnalyticsCollection, AnalyticsDataSource},
 };
diff --git a/crates/analytics/src/sdk_events.rs b/crates/analytics/src/sdk_events.rs
new file mode 100644
index 000000000000..fe8af7cfe2df
--- /dev/null
+++ b/crates/analytics/src/sdk_events.rs
@@ -0,0 +1,14 @@
+pub mod accumulator;
+mod core;
+pub mod events;
+pub mod filters;
+pub mod metrics;
+pub mod types;
+pub use accumulator::{SdkEventMetricAccumulator, SdkEventMetricsAccumulator};
+pub trait SDKEventAnalytics: events::SdkEventsFilterAnalytics {}
+pub trait SdkEventAnalytics:
+    metrics::SdkEventMetricAnalytics + filters::SdkEventFilterAnalytics
+{
+}
+
+pub use self::core::{get_filters, get_metrics, sdk_events_core};
diff --git a/crates/analytics/src/sdk_events/accumulator.rs b/crates/analytics/src/sdk_events/accumulator.rs
new file mode 100644
index 000000000000..ab9e9309434f
--- /dev/null
+++ b/crates/analytics/src/sdk_events/accumulator.rs
@@ -0,0 +1,98 @@
+use api_models::analytics::sdk_events::SdkEventMetricsBucketValue;
+use router_env::logger;
+
+use super::metrics::SdkEventMetricRow;
+
+#[derive(Debug, Default)]
+pub struct SdkEventMetricsAccumulator {
+    pub payment_attempts: CountAccumulator,
+    pub payment_success: CountAccumulator,
+    pub payment_methods_call_count: CountAccumulator,
+    pub average_payment_time: AverageAccumulator,
+    pub sdk_initiated_count: CountAccumulator,
+    pub sdk_rendered_count: CountAccumulator,
+    pub payment_method_selected_count: CountAccumulator,
+    pub payment_data_filled_count: CountAccumulator,
+}
+
+#[derive(Debug, Default)]
+#[repr(transparent)]
+pub struct CountAccumulator {
+    pub count: Option<i64>,
+}
+
+#[derive(Debug, Default)]
+pub struct AverageAccumulator {
+    pub total: u32,
+    pub count: u32,
+}
+
+pub trait SdkEventMetricAccumulator {
+    type MetricOutput;
+
+    fn add_metrics_bucket(&mut self, metrics: &SdkEventMetricRow);
+
+    fn collect(self) -> Self::MetricOutput;
+}
+
+impl SdkEventMetricAccumulator for CountAccumulator {
+    type MetricOutput = Option<u64>;
+    #[inline]
+    fn add_metrics_bucket(&mut self, metrics: &SdkEventMetricRow) {
+        self.count = match (self.count, metrics.count) {
+            (None, None) => None,
+            (None, i @ Some(_)) | (i @ Some(_), None) => i,
+            (Some(a), Some(b)) => Some(a + b),
+        }
+    }
+    #[inline]
+    fn collect(self) -> Self::MetricOutput {
+        self.count.and_then(|i| u64::try_from(i).ok())
+    }
+}
+
+impl SdkEventMetricAccumulator for AverageAccumulator {
+    type MetricOutput = Option<f64>;
+
+    fn add_metrics_bucket(&mut self, metrics: &SdkEventMetricRow) {
+        let total = metrics
+            .total
+            .as_ref()
+            .and_then(bigdecimal::ToPrimitive::to_u32);
+        let count = metrics.count.and_then(|total| u32::try_from(total).ok());
+
+        match (total, count) {
+            (Some(total), Some(count)) => {
+                self.total += total;
+                self.count += count;
+            }
+            _ => {
+                logger::error!(message="Dropping metrics for average accumulator", metric=?metrics);
+            }
+        }
+    }
+
+    fn collect(self) -> Self::MetricOutput {
+        if self.count == 0 {
+            None
+        } else {
+            Some(f64::from(self.total) / f64::from(self.count))
+        }
+    }
+}
+
+impl SdkEventMetricsAccumulator {
+    #[allow(dead_code)]
+    pub fn collect(self) -> SdkEventMetricsBucketValue {
+        SdkEventMetricsBucketValue {
+            payment_attempts: self.payment_attempts.collect(),
+            payment_success_count: self.payment_success.collect(),
+            payment_methods_call_count: self.payment_methods_call_count.collect(),
+            average_payment_time: self.average_payment_time.collect(),
+            sdk_initiated_count: self.sdk_initiated_count.collect(),
+            sdk_rendered_count: self.sdk_rendered_count.collect(),
+            payment_method_selected_count: self.payment_method_selected_count.collect(),
+            payment_data_filled_count: self.payment_data_filled_count.collect(),
+        }
+    }
+}
diff --git a/crates/analytics/src/sdk_events/core.rs b/crates/analytics/src/sdk_events/core.rs
new file mode 100644
index 000000000000..34f23c745b05
--- /dev/null
+++ b/crates/analytics/src/sdk_events/core.rs
@@ -0,0 +1,201 @@
+use std::collections::HashMap;
+
+use api_models::analytics::{
+    sdk_events::{
+        MetricsBucketResponse, SdkEventMetrics, SdkEventMetricsBucketIdentifier, SdkEventsRequest,
+    },
+    AnalyticsMetadata, GetSdkEventFiltersRequest, GetSdkEventMetricRequest, MetricsResponse,
+    SdkEventFiltersResponse,
+};
+use error_stack::{IntoReport, ResultExt};
+use router_env::{instrument, logger, tracing};
+
+use super::{
+    events::{get_sdk_event, SdkEventsResult},
+    SdkEventMetricsAccumulator,
+};
+use crate::{
+    errors::{AnalyticsError, AnalyticsResult},
+    sdk_events::SdkEventMetricAccumulator,
+    types::FiltersError,
+    AnalyticsProvider,
+};
+
+#[instrument(skip_all)]
+pub async fn sdk_events_core(
+    pool: &AnalyticsProvider,
+    req: SdkEventsRequest,
+    publishable_key: String,
+) -> AnalyticsResult<Vec<SdkEventsResult>> {
+    match pool {
+        AnalyticsProvider::Sqlx(_) => Err(FiltersError::NotImplemented)
+            .into_report()
+            .attach_printable("SQL Analytics is not implemented for Sdk Events"),
+        AnalyticsProvider::Clickhouse(pool) => get_sdk_event(&publishable_key, req, pool).await,
+        AnalyticsProvider::CombinedSqlx(_sqlx_pool, ckh_pool)
+        | AnalyticsProvider::CombinedCkh(_sqlx_pool, ckh_pool) => {
+            get_sdk_event(&publishable_key, req, ckh_pool).await
+        }
+    }
+    .change_context(AnalyticsError::UnknownError)
+}
+
+#[instrument(skip_all)]
+pub async fn get_metrics(
+    pool: &AnalyticsProvider,
+    publishable_key: Option<&String>,
+    req: GetSdkEventMetricRequest,
+) -> AnalyticsResult<MetricsResponse<MetricsBucketResponse>> {
+    let mut metrics_accumulator: HashMap<
+        SdkEventMetricsBucketIdentifier,
+        SdkEventMetricsAccumulator,
+    > = HashMap::new();
+
+    if let Some(publishable_key) = publishable_key {
+        let mut set = tokio::task::JoinSet::new();
+        for metric_type in req.metrics.iter().cloned() {
+            let req = req.clone();
+            let publishable_key_scoped = publishable_key.to_owned();
+            let pool = pool.clone();
+            set.spawn(async move {
+                let data = pool
+                    .get_sdk_event_metrics(
+                        &metric_type,
+                        &req.group_by_names.clone(),
+                        &publishable_key_scoped,
+                        &req.filters,
+                        &req.time_series.map(|t| t.granularity),
+                        &req.time_range,
+                    )
+                    .await
+                    .change_context(AnalyticsError::UnknownError);
+                (metric_type, data)
+            });
+        }
+
+        while let Some((metric, data)) = set
+            .join_next()
+            .await
+            .transpose()
+            .into_report()
+            .change_context(AnalyticsError::UnknownError)?
+        {
+            logger::info!("Logging Result {:?}", data);
+            for (id, value) in data? {
+                let metrics_builder = metrics_accumulator.entry(id).or_default();
+                match metric {
+                    SdkEventMetrics::PaymentAttempts => {
+                        metrics_builder.payment_attempts.add_metrics_bucket(&value)
+                    }
+                    SdkEventMetrics::PaymentSuccessCount => {
+                        metrics_builder.payment_success.add_metrics_bucket(&value)
+                    }
+                    SdkEventMetrics::PaymentMethodsCallCount => metrics_builder
+                        .payment_methods_call_count
+                        .add_metrics_bucket(&value),
+                    SdkEventMetrics::SdkRenderedCount => metrics_builder
+                        .sdk_rendered_count
+                        .add_metrics_bucket(&value),
+                    SdkEventMetrics::SdkInitiatedCount => metrics_builder
+                        .sdk_initiated_count
+                        .add_metrics_bucket(&value),
+                    SdkEventMetrics::PaymentMethodSelectedCount => metrics_builder
+                        .payment_method_selected_count
+                        .add_metrics_bucket(&value),
+                    SdkEventMetrics::PaymentDataFilledCount => metrics_builder
+                        .payment_data_filled_count
+                        .add_metrics_bucket(&value),
+                    SdkEventMetrics::AveragePaymentTime => metrics_builder
+                        .average_payment_time
+                        .add_metrics_bucket(&value),
+                }
+            }
+
+            logger::debug!(
+                "Analytics Accumulated Results: metric: {}, results: {:#?}",
+                metric,
+                metrics_accumulator
+            );
+        }
+
+        let query_data: Vec<MetricsBucketResponse> = metrics_accumulator
+            .into_iter()
+            .map(|(id, val)| MetricsBucketResponse {
+                values: val.collect(),
+                dimensions: id,
+            })
+            .collect();
+
+        Ok(MetricsResponse {
+            query_data,
+            meta_data: [AnalyticsMetadata {
+                current_time_range: req.time_range,
+            }],
+        })
+    } else {
+        logger::error!("Publishable key not present for merchant ID");
+        Ok(MetricsResponse {
+            query_data: vec![],
+            meta_data: [AnalyticsMetadata {
+                current_time_range: req.time_range,
+            }],
+        })
+    }
+}
+
+#[allow(dead_code)]
+pub async fn get_filters(
+    pool: &AnalyticsProvider,
+    req: GetSdkEventFiltersRequest,
+    publishable_key: Option<&String>,
+) -> AnalyticsResult<SdkEventFiltersResponse> {
+    use api_models::analytics::{sdk_events::SdkEventDimensions, SdkEventFilterValue};
+
+    use super::filters::get_sdk_event_filter_for_dimension;
+    use crate::sdk_events::filters::SdkEventFilter;
+
+    let mut res = SdkEventFiltersResponse::default();
+
+    if let Some(publishable_key) = publishable_key {
+        for dim in req.group_by_names {
+            let values = match pool {
+                AnalyticsProvider::Sqlx(_pool) => Err(FiltersError::NotImplemented)
+                    .into_report()
+                    .attach_printable("SQL Analytics is not implemented for SDK Events"),
+                AnalyticsProvider::Clickhouse(pool) => {
+                    get_sdk_event_filter_for_dimension(dim, publishable_key, &req.time_range, pool)
+                        .await
+                }
+                AnalyticsProvider::CombinedSqlx(_sqlx_pool, ckh_pool)
+                | AnalyticsProvider::CombinedCkh(_sqlx_pool, ckh_pool) => {
+                    get_sdk_event_filter_for_dimension(
+                        dim,
+                        publishable_key,
+                        &req.time_range,
+                        ckh_pool,
+                    )
+                    .await
+                }
+            }
+            .change_context(AnalyticsError::UnknownError)?
+            .into_iter()
+            .filter_map(|fil: SdkEventFilter| match dim {
+                SdkEventDimensions::PaymentMethod => fil.payment_method,
+                SdkEventDimensions::Platform => fil.platform,
+                SdkEventDimensions::BrowserName => fil.browser_name,
+                SdkEventDimensions::Source => fil.source,
+                SdkEventDimensions::Component => fil.component,
+                SdkEventDimensions::PaymentExperience => fil.payment_experience,
+            })
+            .collect::<Vec<String>>();
+            res.query_data.push(SdkEventFilterValue {
+                dimension: dim,
+                values,
+            })
+        }
+    } else {
+        router_env::logger::error!("Publishable key not found for merchant");
+    }
+
+    Ok(res)
+}
diff --git a/crates/analytics/src/sdk_events/events.rs b/crates/analytics/src/sdk_events/events.rs
new file mode 100644
index 000000000000..a4d044267e94
--- /dev/null
+++ b/crates/analytics/src/sdk_events/events.rs
@@ -0,0 +1,80 @@
+use api_models::analytics::{
+    sdk_events::{SdkEventNames, SdkEventsRequest},
+    Granularity,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use strum::IntoEnumIterator;
+use time::PrimitiveDateTime;
+
+use crate::{
+    query::{Aggregate, FilterTypes, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, FiltersError, FiltersResult, LoadRow},
+};
+pub trait SdkEventsFilterAnalytics: LoadRow<SdkEventsResult> {}
+
+pub async fn get_sdk_event<T>(
+    merchant_id: &str,
+    request: SdkEventsRequest,
+    pool: &T,
+) -> FiltersResult<Vec<SdkEventsResult>>
+where
+    T: AnalyticsDataSource + SdkEventsFilterAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    let static_event_list = SdkEventNames::iter()
+        .map(|i| format!("'{}'", i.as_ref()))
+        .collect::<Vec<String>>()
+        .join(",");
+    let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+    query_builder.add_select_column("*").switch()?;
+
+    query_builder
+        .add_filter_clause("merchant_id", merchant_id)
+        .switch()?;
+    query_builder
+        .add_filter_clause("payment_id", request.payment_id)
+        .switch()?;
+    query_builder
+        .add_custom_filter_clause("event_name", static_event_list, FilterTypes::In)
+        .switch()?;
+    let _ = &request
+        .time_range
+        .set_filter_clause(&mut query_builder)
+        .attach_printable("Error filtering time range")
+        .switch()?;
+
+    //TODO!: update the execute_query function to return reports instead of plain errors...
+    query_builder
+        .execute_query::<SdkEventsResult, _>(pool)
+        .await
+        .change_context(FiltersError::QueryBuildingError)?
+        .change_context(FiltersError::QueryExecutionFailure)
+}
+#[derive(Debug, serde::Serialize, serde::Deserialize)]
+pub struct SdkEventsResult {
+    pub merchant_id: String,
+    pub payment_id: String,
+    pub event_name: Option<String>,
+    pub log_type: Option<String>,
+    pub first_event: bool,
+    pub browser_name: Option<String>,
+    pub browser_version: Option<String>,
+    pub source: Option<String>,
+    pub category: Option<String>,
+    pub version: Option<String>,
+    pub value: Option<String>,
+    pub platform: Option<String>,
+    pub component: Option<String>,
+    pub payment_method: Option<String>,
+    pub payment_experience: Option<String>,
+    pub latency: Option<u64>,
+    #[serde(with = "common_utils::custom_serde::iso8601")]
+    pub created_at_precise: PrimitiveDateTime,
+    #[serde(with = "common_utils::custom_serde::iso8601")]
+    pub created_at: PrimitiveDateTime,
+}
diff --git a/crates/analytics/src/sdk_events/filters.rs b/crates/analytics/src/sdk_events/filters.rs
new file mode 100644
index 000000000000..9963f51ef947
--- /dev/null
+++ b/crates/analytics/src/sdk_events/filters.rs
@@ -0,0 +1,56 @@
+use api_models::analytics::{sdk_events::SdkEventDimensions, Granularity, TimeRange};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, FiltersError, FiltersResult, LoadRow},
+};
+
+pub trait SdkEventFilterAnalytics: LoadRow<SdkEventFilter> {}
+
+pub async fn get_sdk_event_filter_for_dimension<T>(
+    dimension: SdkEventDimensions,
+    publishable_key: &String,
+    time_range: &TimeRange,
+    pool: &T,
+) -> FiltersResult<Vec<SdkEventFilter>>
+where
+    T: AnalyticsDataSource + SdkEventFilterAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+
+    query_builder.add_select_column(dimension).switch()?;
+    time_range
+        .set_filter_clause(&mut query_builder)
+        .attach_printable("Error filtering time range")
+        .switch()?;
+
+    query_builder
+        .add_filter_clause("merchant_id", publishable_key)
+        .switch()?;
+
+    query_builder.set_distinct();
+
+    query_builder
+        .execute_query::<SdkEventFilter, _>(pool)
+        .await
+        .change_context(FiltersError::QueryBuildingError)?
+        .change_context(FiltersError::QueryExecutionFailure)
+}
+
+#[derive(Debug, serde::Serialize, Eq, PartialEq, serde::Deserialize)]
+pub struct SdkEventFilter {
+    pub payment_method: Option<String>,
+    pub platform: Option<String>,
+    pub browser_name: Option<String>,
+    pub source: Option<String>,
+    pub component: Option<String>,
+    pub payment_experience: Option<String>,
+}
diff --git a/crates/analytics/src/sdk_events/metrics.rs b/crates/analytics/src/sdk_events/metrics.rs
new file mode 100644
index 000000000000..354d2270d18a
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics.rs
@@ -0,0 +1,181 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetrics, SdkEventMetricsBucketIdentifier,
+    },
+    Granularity, TimeRange,
+};
+use time::PrimitiveDateTime;
+
+use crate::{
+    query::{Aggregate, GroupByClause, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, LoadRow, MetricsResult},
+};
+
+mod average_payment_time;
+mod payment_attempts;
+mod payment_data_filled_count;
+mod payment_method_selected_count;
+mod payment_methods_call_count;
+mod payment_success_count;
+mod sdk_initiated_count;
+mod sdk_rendered_count;
+
+use average_payment_time::AveragePaymentTime;
+use payment_attempts::PaymentAttempts;
+use payment_data_filled_count::PaymentDataFilledCount;
+use payment_method_selected_count::PaymentMethodSelectedCount;
+use payment_methods_call_count::PaymentMethodsCallCount;
+use payment_success_count::PaymentSuccessCount;
+use sdk_initiated_count::SdkInitiatedCount;
+use sdk_rendered_count::SdkRenderedCount;
+
+#[derive(Debug, PartialEq, Eq, serde::Deserialize)]
+pub struct SdkEventMetricRow {
+    pub total: Option<bigdecimal::BigDecimal>,
+    pub count: Option<i64>,
+    pub time_bucket: Option<String>,
+    pub payment_method: Option<String>,
+    pub platform: Option<String>,
+    pub browser_name: Option<String>,
+    pub source: Option<String>,
+    pub component: Option<String>,
+    pub payment_experience: Option<String>,
+}
+
+pub trait SdkEventMetricAnalytics: LoadRow<SdkEventMetricRow> {}
+
+#[async_trait::async_trait]
+pub trait SdkEventMetric<T>
+where
+    T: AnalyticsDataSource + SdkEventMetricAnalytics,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>>;
+}
+
+#[async_trait::async_trait]
+impl<T> SdkEventMetric<T> for SdkEventMetrics
+where
+    T: AnalyticsDataSource + SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        match self {
+            Self::PaymentAttempts => {
+                PaymentAttempts
+                    .load_metrics(
+                        dimensions,
+                        publishable_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::PaymentSuccessCount => {
+                PaymentSuccessCount
+                    .load_metrics(
+                        dimensions,
+                        publishable_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::PaymentMethodsCallCount => {
+                PaymentMethodsCallCount
+                    .load_metrics(
+                        dimensions,
+                        publishable_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::SdkRenderedCount => {
+                SdkRenderedCount
+                    .load_metrics(
+                        dimensions,
+                        publishable_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::SdkInitiatedCount => {
+                SdkInitiatedCount
+                    .load_metrics(
+                        dimensions,
+                        publishable_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::PaymentMethodSelectedCount => {
+                PaymentMethodSelectedCount
+                    .load_metrics(
+                        dimensions,
+                        publishable_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::PaymentDataFilledCount => {
+                PaymentDataFilledCount
+                    .load_metrics(
+                        dimensions,
+                        publishable_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+            Self::AveragePaymentTime => {
+                AveragePaymentTime
+                    .load_metrics(
+                        dimensions,
+                        publishable_key,
+                        filters,
+                        granularity,
+                        time_range,
+                        pool,
+                    )
+                    .await
+            }
+        }
+    }
+}
diff --git a/crates/analytics/src/sdk_events/metrics/average_payment_time.rs b/crates/analytics/src/sdk_events/metrics/average_payment_time.rs
new file mode 100644
index 000000000000..db7171524ae5
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics/average_payment_time.rs
@@ -0,0 +1,129 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetricsBucketIdentifier, SdkEventNames,
+    },
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::SdkEventMetricRow;
+use crate::{
+    query::{Aggregate, FilterTypes, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct AveragePaymentTime;
+
+#[async_trait::async_trait]
+impl<T> super::SdkEventMetric<T> for AveragePaymentTime
+where
+    T: AnalyticsDataSource + super::SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+        let dimensions = dimensions.to_vec();
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+
+        query_builder
+            .add_select_column(Aggregate::Sum {
+                field: "latency",
+                alias: Some("total"),
+            })
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            query_builder
+                .add_granularity_in_mins(granularity)
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", publishable_key)
+            .switch()?;
+
+        query_builder
+            .add_bool_filter_clause("first_event", 1)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("event_name", SdkEventNames::PaymentAttempt)
+            .switch()?;
+
+        query_builder
+            .add_custom_filter_clause("latency", 0, FilterTypes::Gt)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(_granularity) = granularity.as_ref() {
+            query_builder
+                .add_group_by_clause("time_bucket")
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<SdkEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    SdkEventMetricsBucketIdentifier::new(
+                        i.payment_method.clone(),
+                        i.platform.clone(),
+                        i.browser_name.clone(),
+                        i.source.clone(),
+                        i.component.clone(),
+                        i.payment_experience.clone(),
+                        i.time_bucket.clone(),
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/sdk_events/metrics/payment_attempts.rs b/crates/analytics/src/sdk_events/metrics/payment_attempts.rs
new file mode 100644
index 000000000000..b2a78188c4f2
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics/payment_attempts.rs
@@ -0,0 +1,118 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetricsBucketIdentifier, SdkEventNames,
+    },
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::SdkEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct PaymentAttempts;
+
+#[async_trait::async_trait]
+impl<T> super::SdkEventMetric<T> for PaymentAttempts
+where
+    T: AnalyticsDataSource + super::SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+        let dimensions = dimensions.to_vec();
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            query_builder
+                .add_granularity_in_mins(granularity)
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", publishable_key)
+            .switch()?;
+
+        query_builder
+            .add_bool_filter_clause("first_event", 1)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("event_name", SdkEventNames::PaymentAttempt)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(_granularity) = granularity.as_ref() {
+            query_builder
+                .add_group_by_clause("time_bucket")
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<SdkEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    SdkEventMetricsBucketIdentifier::new(
+                        i.payment_method.clone(),
+                        i.platform.clone(),
+                        i.browser_name.clone(),
+                        i.source.clone(),
+                        i.component.clone(),
+                        i.payment_experience.clone(),
+                        i.time_bucket.clone(),
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/sdk_events/metrics/payment_data_filled_count.rs b/crates/analytics/src/sdk_events/metrics/payment_data_filled_count.rs
new file mode 100644
index 000000000000..a3c94baeda26
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics/payment_data_filled_count.rs
@@ -0,0 +1,118 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetricsBucketIdentifier, SdkEventNames,
+    },
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::SdkEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct PaymentDataFilledCount;
+
+#[async_trait::async_trait]
+impl<T> super::SdkEventMetric<T> for PaymentDataFilledCount
+where
+    T: AnalyticsDataSource + super::SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+        let dimensions = dimensions.to_vec();
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            query_builder
+                .add_granularity_in_mins(granularity)
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", publishable_key)
+            .switch()?;
+
+        query_builder
+            .add_bool_filter_clause("first_event", 1)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("event_name", SdkEventNames::PaymentDataFilled)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(_granularity) = granularity.as_ref() {
+            query_builder
+                .add_group_by_clause("time_bucket")
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<SdkEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    SdkEventMetricsBucketIdentifier::new(
+                        i.payment_method.clone(),
+                        i.platform.clone(),
+                        i.browser_name.clone(),
+                        i.source.clone(),
+                        i.component.clone(),
+                        i.payment_experience.clone(),
+                        i.time_bucket.clone(),
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/sdk_events/metrics/payment_method_selected_count.rs b/crates/analytics/src/sdk_events/metrics/payment_method_selected_count.rs
new file mode 100644
index 000000000000..11aeac5e6ff9
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics/payment_method_selected_count.rs
@@ -0,0 +1,118 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetricsBucketIdentifier, SdkEventNames,
+    },
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::SdkEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct PaymentMethodSelectedCount;
+
+#[async_trait::async_trait]
+impl<T> super::SdkEventMetric<T> for PaymentMethodSelectedCount
+where
+    T: AnalyticsDataSource + super::SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+        let dimensions = dimensions.to_vec();
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            query_builder
+                .add_granularity_in_mins(granularity)
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", publishable_key)
+            .switch()?;
+
+        query_builder
+            .add_bool_filter_clause("first_event", 1)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("event_name", SdkEventNames::PaymentMethodChanged)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(_granularity) = granularity.as_ref() {
+            query_builder
+                .add_group_by_clause("time_bucket")
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<SdkEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    SdkEventMetricsBucketIdentifier::new(
+                        i.payment_method.clone(),
+                        i.platform.clone(),
+                        i.browser_name.clone(),
+                        i.source.clone(),
+                        i.component.clone(),
+                        i.payment_experience.clone(),
+                        i.time_bucket.clone(),
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/sdk_events/metrics/payment_methods_call_count.rs b/crates/analytics/src/sdk_events/metrics/payment_methods_call_count.rs
new file mode 100644
index 000000000000..7570f1292e5e
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics/payment_methods_call_count.rs
@@ -0,0 +1,126 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetricsBucketIdentifier, SdkEventNames,
+    },
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::SdkEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct PaymentMethodsCallCount;
+
+#[async_trait::async_trait]
+impl<T> super::SdkEventMetric<T> for PaymentMethodsCallCount
+where
+    T: AnalyticsDataSource + super::SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+        let dimensions = dimensions.to_vec();
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            query_builder
+                .add_granularity_in_mins(granularity)
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", publishable_key)
+            .switch()?;
+
+        query_builder
+            .add_bool_filter_clause("first_event", 1)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("event_name", SdkEventNames::PaymentMethodsCall)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("log_type", "INFO")
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("category", "API")
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(_granularity) = granularity.as_ref() {
+            query_builder
+                .add_group_by_clause("time_bucket")
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<SdkEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    SdkEventMetricsBucketIdentifier::new(
+                        i.payment_method.clone(),
+                        i.platform.clone(),
+                        i.browser_name.clone(),
+                        i.source.clone(),
+                        i.component.clone(),
+                        i.payment_experience.clone(),
+                        i.time_bucket.clone(),
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/sdk_events/metrics/payment_success_count.rs b/crates/analytics/src/sdk_events/metrics/payment_success_count.rs
new file mode 100644
index 000000000000..3faf8213632f
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics/payment_success_count.rs
@@ -0,0 +1,118 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetricsBucketIdentifier, SdkEventNames,
+    },
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::SdkEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct PaymentSuccessCount;
+
+#[async_trait::async_trait]
+impl<T> super::SdkEventMetric<T> for PaymentSuccessCount
+where
+    T: AnalyticsDataSource + super::SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+        let dimensions = dimensions.to_vec();
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            query_builder
+                .add_granularity_in_mins(granularity)
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", publishable_key)
+            .switch()?;
+
+        query_builder
+            .add_bool_filter_clause("first_event", 1)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("event_name", SdkEventNames::PaymentSuccess)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(_granularity) = granularity.as_ref() {
+            query_builder
+                .add_group_by_clause("time_bucket")
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<SdkEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    SdkEventMetricsBucketIdentifier::new(
+                        i.payment_method.clone(),
+                        i.platform.clone(),
+                        i.browser_name.clone(),
+                        i.source.clone(),
+                        i.component.clone(),
+                        i.payment_experience.clone(),
+                        i.time_bucket.clone(),
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/sdk_events/metrics/sdk_initiated_count.rs b/crates/analytics/src/sdk_events/metrics/sdk_initiated_count.rs
new file mode 100644
index 000000000000..a525e7890b75
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics/sdk_initiated_count.rs
@@ -0,0 +1,118 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetricsBucketIdentifier, SdkEventNames,
+    },
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::SdkEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct SdkInitiatedCount;
+
+#[async_trait::async_trait]
+impl<T> super::SdkEventMetric<T> for SdkInitiatedCount
+where
+    T: AnalyticsDataSource + super::SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+        let dimensions = dimensions.to_vec();
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            query_builder
+                .add_granularity_in_mins(granularity)
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", publishable_key)
+            .switch()?;
+
+        query_builder
+            .add_bool_filter_clause("first_event", 1)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("event_name", SdkEventNames::StripeElementsCalled)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(_granularity) = granularity.as_ref() {
+            query_builder
+                .add_group_by_clause("time_bucket")
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<SdkEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    SdkEventMetricsBucketIdentifier::new(
+                        i.payment_method.clone(),
+                        i.platform.clone(),
+                        i.browser_name.clone(),
+                        i.source.clone(),
+                        i.component.clone(),
+                        i.payment_experience.clone(),
+                        i.time_bucket.clone(),
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/sdk_events/metrics/sdk_rendered_count.rs b/crates/analytics/src/sdk_events/metrics/sdk_rendered_count.rs
new file mode 100644
index 000000000000..ed9e776423a8
--- /dev/null
+++ b/crates/analytics/src/sdk_events/metrics/sdk_rendered_count.rs
@@ -0,0 +1,118 @@
+use api_models::analytics::{
+    sdk_events::{
+        SdkEventDimensions, SdkEventFilters, SdkEventMetricsBucketIdentifier, SdkEventNames,
+    },
+    Granularity, TimeRange,
+};
+use common_utils::errors::ReportSwitchExt;
+use error_stack::ResultExt;
+use time::PrimitiveDateTime;
+
+use super::SdkEventMetricRow;
+use crate::{
+    query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, ToSql, Window},
+    types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult},
+};
+
+#[derive(Default)]
+pub(super) struct SdkRenderedCount;
+
+#[async_trait::async_trait]
+impl<T> super::SdkEventMetric<T> for SdkRenderedCount
+where
+    T: AnalyticsDataSource + super::SdkEventMetricAnalytics,
+    PrimitiveDateTime: ToSql<T>,
+    AnalyticsCollection: ToSql<T>,
+    Granularity: GroupByClause<T>,
+    Aggregate<&'static str>: ToSql<T>,
+    Window<&'static str>: ToSql<T>,
+{
+    async fn load_metrics(
+        &self,
+        dimensions: &[SdkEventDimensions],
+        publishable_key: &str,
+        filters: &SdkEventFilters,
+        granularity: &Option<Granularity>,
+        time_range: &TimeRange,
+        pool: &T,
+    ) -> MetricsResult<Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>> {
+        let mut query_builder: QueryBuilder<T> = QueryBuilder::new(AnalyticsCollection::SdkEvents);
+        let dimensions = dimensions.to_vec();
+
+        for dim in dimensions.iter() {
+            query_builder.add_select_column(dim).switch()?;
+        }
+
+        query_builder
+            .add_select_column(Aggregate::Count {
+                field: None,
+                alias: Some("count"),
+            })
+            .switch()?;
+
+        if let Some(granularity) = granularity.as_ref() {
+            query_builder
+                .add_granularity_in_mins(granularity)
+                .switch()?;
+        }
+
+        filters.set_filter_clause(&mut query_builder).switch()?;
+
+        query_builder
+            .add_filter_clause("merchant_id", publishable_key)
+            .switch()?;
+
+        query_builder
+            .add_bool_filter_clause("first_event", 1)
+            .switch()?;
+
+        query_builder
+            .add_filter_clause("event_name", SdkEventNames::AppRendered)
+            .switch()?;
+
+        time_range
+            .set_filter_clause(&mut query_builder)
+            .attach_printable("Error filtering time range")
+            .switch()?;
+
+        for dim in dimensions.iter() {
+            query_builder
+                .add_group_by_clause(dim)
+                .attach_printable("Error grouping by dimensions")
+                .switch()?;
+        }
+
+        if let Some(_granularity) = granularity.as_ref() {
+            query_builder
+                .add_group_by_clause("time_bucket")
+                .attach_printable("Error adding granularity")
+                .switch()?;
+        }
+
+        query_builder
+            .execute_query::<SdkEventMetricRow, _>(pool)
+            .await
+            .change_context(MetricsError::QueryBuildingError)?
+            .change_context(MetricsError::QueryExecutionFailure)?
+            .into_iter()
+            .map(|i| {
+                Ok((
+                    SdkEventMetricsBucketIdentifier::new(
+                        i.payment_method.clone(),
+                        i.platform.clone(),
+                        i.browser_name.clone(),
+                        i.source.clone(),
+                        i.component.clone(),
+                        i.payment_experience.clone(),
+                        i.time_bucket.clone(),
+                    ),
+                    i,
+                ))
+            })
+            .collect::<error_stack::Result<
+                Vec<(SdkEventMetricsBucketIdentifier, SdkEventMetricRow)>,
+                crate::query::PostProcessingError,
+            >>()
+            .change_context(MetricsError::PostProcessingFailure)
+    }
+}
diff --git a/crates/analytics/src/sdk_events/types.rs b/crates/analytics/src/sdk_events/types.rs
new file mode 100644
index 000000000000..d631b3158ed4
--- /dev/null
+++ b/crates/analytics/src/sdk_events/types.rs
@@ -0,0 +1,50 @@
+use api_models::analytics::sdk_events::{SdkEventDimensions, SdkEventFilters};
+use error_stack::ResultExt;
+
+use crate::{
+    query::{QueryBuilder, QueryFilter, QueryResult, ToSql},
+    types::{AnalyticsCollection, AnalyticsDataSource},
+};
+
+impl<T> QueryFilter<T> for SdkEventFilters
+where
+    T: AnalyticsDataSource,
+    AnalyticsCollection: ToSql<T>,
+{
+    fn set_filter_clause(&self, builder: &mut QueryBuilder<T>) -> QueryResult<()> {
+        if !self.payment_method.is_empty() {
+            builder
+                .add_filter_in_range_clause(SdkEventDimensions::PaymentMethod, &self.payment_method)
+                .attach_printable("Error adding payment method filter")?;
+        }
+        if !self.platform.is_empty() {
+            builder
+                .add_filter_in_range_clause(SdkEventDimensions::Platform, &self.platform)
+                .attach_printable("Error adding platform filter")?;
+        }
+        if !self.browser_name.is_empty() {
+            builder
+                .add_filter_in_range_clause(SdkEventDimensions::BrowserName, &self.browser_name)
+                .attach_printable("Error adding browser name filter")?;
+        }
+        if !self.source.is_empty() {
+            builder
+                .add_filter_in_range_clause(SdkEventDimensions::Source, &self.source)
+                .attach_printable("Error adding source filter")?;
+        }
+        if !self.component.is_empty() {
+            builder
+                .add_filter_in_range_clause(SdkEventDimensions::Component, &self.component)
+                .attach_printable("Error adding component filter")?;
+        }
+        if !self.payment_experience.is_empty() {
+            builder
+                .add_filter_in_range_clause(
+                    SdkEventDimensions::PaymentExperience,
+                    &self.payment_experience,
+                )
+                .attach_printable("Error adding payment experience filter")?;
+        }
+        Ok(())
+    }
+}
diff --git a/crates/router/src/analytics/sqlx.rs b/crates/analytics/src/sqlx.rs
similarity index 64%
rename from crates/router/src/analytics/sqlx.rs
rename to crates/analytics/src/sqlx.rs
index b88a2065f0b0..cdd2647e4e71 100644
--- a/crates/router/src/analytics/sqlx.rs
+++ b/crates/analytics/src/sqlx.rs
@@ -1,14 +1,11 @@
 use std::{fmt::Display, str::FromStr};
 
 use api_models::analytics::refunds::RefundType;
-use common_enums::enums::{
+use common_utils::errors::{CustomResult, ParsingError};
+use diesel_models::enums::{
     AttemptStatus, AuthenticationType, Currency, PaymentMethod, RefundStatus,
 };
-use common_utils::errors::{CustomResult, ParsingError};
 use error_stack::{IntoReport, ResultExt};
-#[cfg(feature = "kms")]
-use external_services::{kms, kms::decrypt::KmsDecrypt};
-#[cfg(not(feature = "kms"))]
 use masking::PeekInterface;
 use sqlx::{
     postgres::{PgArgumentBuffer, PgPoolOptions, PgRow, PgTypeInfo, PgValueRef},
@@ -16,15 +13,16 @@ use sqlx::{
     Error::ColumnNotFound,
     FromRow, Pool, Postgres, Row,
 };
+use storage_impl::config::Database;
 use time::PrimitiveDateTime;
 
 use super::{
-    query::{Aggregate, ToSql},
+    query::{Aggregate, ToSql, Window},
     types::{
         AnalyticsCollection, AnalyticsDataSource, DBEnumWrapper, LoadRow, QueryExecutionError,
+        TableEngine,
     },
 };
-use crate::configs::settings::Database;
 
 #[derive(Debug, Clone)]
 pub struct SqlxClient {
@@ -47,19 +45,7 @@ impl Default for SqlxClient {
 }
 
 impl SqlxClient {
-    pub async fn from_conf(
-        conf: &Database,
-        #[cfg(feature = "kms")] kms_client: &kms::KmsClient,
-    ) -> Self {
-        #[cfg(feature = "kms")]
-        #[allow(clippy::expect_used)]
-        let password = conf
-            .password
-            .decrypt_inner(kms_client)
-            .await
-            .expect("Failed to KMS decrypt database password");
-
-        #[cfg(not(feature = "kms"))]
+    pub async fn from_conf(conf: &Database) -> Self {
         let password = &conf.password.peek();
         let database_url = format!(
             "postgres://{}:{}@{}:{}/{}",
@@ -154,6 +140,7 @@ where
 
 impl super::payments::filters::PaymentFilterAnalytics for SqlxClient {}
 impl super::payments::metrics::PaymentMetricAnalytics for SqlxClient {}
+impl super::payments::distribution::PaymentDistributionAnalytics for SqlxClient {}
 impl super::refunds::metrics::RefundMetricAnalytics for SqlxClient {}
 impl super::refunds::filters::RefundFilterAnalytics for SqlxClient {}
 
@@ -207,7 +194,7 @@ impl<'a> FromRow<'a, PgRow> for super::refunds::metrics::RefundMetricRow {
             ColumnNotFound(_) => Ok(Default::default()),
             e => Err(e),
         })?;
-
+        // Removing millisecond precision to get accurate diffs against clickhouse
         let start_bucket: Option<PrimitiveDateTime> = row
             .try_get::<Option<PrimitiveDateTime>, _>("start_bucket")?
             .and_then(|dt| dt.replace_millisecond(0).ok());
@@ -253,6 +240,11 @@ impl<'a> FromRow<'a, PgRow> for super::payments::metrics::PaymentMetricRow {
                 ColumnNotFound(_) => Ok(Default::default()),
                 e => Err(e),
             })?;
+        let payment_method_type: Option<String> =
+            row.try_get("payment_method_type").or_else(|e| match e {
+                ColumnNotFound(_) => Ok(Default::default()),
+                e => Err(e),
+            })?;
         let total: Option<bigdecimal::BigDecimal> = row.try_get("total").or_else(|e| match e {
             ColumnNotFound(_) => Ok(Default::default()),
             e => Err(e),
@@ -261,7 +253,72 @@ impl<'a> FromRow<'a, PgRow> for super::payments::metrics::PaymentMetricRow {
             ColumnNotFound(_) => Ok(Default::default()),
             e => Err(e),
         })?;
+        // Removing millisecond precision to get accurate diffs against clickhouse
+        let start_bucket: Option<PrimitiveDateTime> = row
+            .try_get::<Option<PrimitiveDateTime>, _>("start_bucket")?
+            .and_then(|dt| dt.replace_millisecond(0).ok());
+        let end_bucket: Option<PrimitiveDateTime> = row
+            .try_get::<Option<PrimitiveDateTime>, _>("end_bucket")?
+            .and_then(|dt| dt.replace_millisecond(0).ok());
+        Ok(Self {
+            currency,
+            status,
+            connector,
+            authentication_type,
+            payment_method,
+            payment_method_type,
+            total,
+            count,
+            start_bucket,
+            end_bucket,
+        })
+    }
+}
 
+impl<'a> FromRow<'a, PgRow> for super::payments::distribution::PaymentDistributionRow {
+    fn from_row(row: &'a PgRow) -> sqlx::Result<Self> {
+        let currency: Option<DBEnumWrapper<Currency>> =
+            row.try_get("currency").or_else(|e| match e {
+                ColumnNotFound(_) => Ok(Default::default()),
+                e => Err(e),
+            })?;
+        let status: Option<DBEnumWrapper<AttemptStatus>> =
+            row.try_get("status").or_else(|e| match e {
+                ColumnNotFound(_) => Ok(Default::default()),
+                e => Err(e),
+            })?;
+        let connector: Option<String> = row.try_get("connector").or_else(|e| match e {
+            ColumnNotFound(_) => Ok(Default::default()),
+            e => Err(e),
+        })?;
+        let authentication_type: Option<DBEnumWrapper<AuthenticationType>> =
+            row.try_get("authentication_type").or_else(|e| match e {
+                ColumnNotFound(_) => Ok(Default::default()),
+                e => Err(e),
+            })?;
+        let payment_method: Option<String> =
+            row.try_get("payment_method").or_else(|e| match e {
+                ColumnNotFound(_) => Ok(Default::default()),
+                e => Err(e),
+            })?;
+        let payment_method_type: Option<String> =
+            row.try_get("payment_method_type").or_else(|e| match e {
+                ColumnNotFound(_) => Ok(Default::default()),
+                e => Err(e),
+            })?;
+        let total: Option<bigdecimal::BigDecimal> = row.try_get("total").or_else(|e| match e {
+            ColumnNotFound(_) => Ok(Default::default()),
+            e => Err(e),
+        })?;
+        let count: Option<i64> = row.try_get("count").or_else(|e| match e {
+            ColumnNotFound(_) => Ok(Default::default()),
+            e => Err(e),
+        })?;
+        let error_message: Option<String> = row.try_get("error_message").or_else(|e| match e {
+            ColumnNotFound(_) => Ok(Default::default()),
+            e => Err(e),
+        })?;
+        // Removing millisecond precision to get accurate diffs against clickhouse
         let start_bucket: Option<PrimitiveDateTime> = row
             .try_get::<Option<PrimitiveDateTime>, _>("start_bucket")?
             .and_then(|dt| dt.replace_millisecond(0).ok());
@@ -274,8 +331,10 @@ impl<'a> FromRow<'a, PgRow> for super::payments::metrics::PaymentMetricRow {
             connector,
             authentication_type,
             payment_method,
+            payment_method_type,
             total,
             count,
+            error_message,
             start_bucket,
             end_bucket,
         })
@@ -308,12 +367,18 @@ impl<'a> FromRow<'a, PgRow> for super::payments::filters::FilterRow {
                 ColumnNotFound(_) => Ok(Default::default()),
                 e => Err(e),
             })?;
+        let payment_method_type: Option<String> =
+            row.try_get("payment_method_type").or_else(|e| match e {
+                ColumnNotFound(_) => Ok(Default::default()),
+                e => Err(e),
+            })?;
         Ok(Self {
             currency,
             status,
             connector,
             authentication_type,
             payment_method,
+            payment_method_type,
         })
     }
 }
@@ -349,16 +414,21 @@ impl<'a> FromRow<'a, PgRow> for super::refunds::filters::RefundFilterRow {
 }
 
 impl ToSql<SqlxClient> for PrimitiveDateTime {
-    fn to_sql(&self) -> error_stack::Result<String, ParsingError> {
+    fn to_sql(&self, _table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
         Ok(self.to_string())
     }
 }
 
 impl ToSql<SqlxClient> for AnalyticsCollection {
-    fn to_sql(&self) -> error_stack::Result<String, ParsingError> {
+    fn to_sql(&self, _table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
         match self {
             Self::Payment => Ok("payment_attempt".to_string()),
             Self::Refund => Ok("refund".to_string()),
+            Self::SdkEvents => Err(error_stack::report!(ParsingError::UnknownError)
+                .attach_printable("SdkEvents table is not implemented for Sqlx"))?,
+            Self::ApiEvents => Err(error_stack::report!(ParsingError::UnknownError)
+                .attach_printable("ApiEvents table is not implemented for Sqlx"))?,
+            Self::PaymentIntent => Ok("payment_intent".to_string()),
         }
     }
 }
@@ -367,7 +437,7 @@ impl<T> ToSql<SqlxClient> for Aggregate<T>
 where
     T: ToSql<SqlxClient>,
 {
-    fn to_sql(&self) -> error_stack::Result<String, ParsingError> {
+    fn to_sql(&self, table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
         Ok(match self {
             Self::Count { field: _, alias } => {
                 format!(
@@ -378,21 +448,86 @@ where
             Self::Sum { field, alias } => {
                 format!(
                     "sum({}){}",
-                    field.to_sql().attach_printable("Failed to sum aggregate")?,
+                    field
+                        .to_sql(table_engine)
+                        .attach_printable("Failed to sum aggregate")?,
                     alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
                 )
             }
             Self::Min { field, alias } => {
                 format!(
                     "min({}){}",
-                    field.to_sql().attach_printable("Failed to min aggregate")?,
+                    field
+                        .to_sql(table_engine)
+                        .attach_printable("Failed to min aggregate")?,
                     alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
                 )
             }
             Self::Max { field, alias } => {
                 format!(
                     "max({}){}",
-                    field.to_sql().attach_printable("Failed to max aggregate")?,
+                    field
+                        .to_sql(table_engine)
+                        .attach_printable("Failed to max aggregate")?,
+                    alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
+                )
+            }
+        })
+    }
+}
+
+impl<T> ToSql<SqlxClient> for Window<T>
+where
+    T: ToSql<SqlxClient>,
+{
+    fn to_sql(&self, table_engine: &TableEngine) -> error_stack::Result<String, ParsingError> {
+        Ok(match self {
+            Self::Sum {
+                field,
+                partition_by,
+                order_by,
+                alias,
+            } => {
+                format!(
+                    "sum({}) over ({}{}){}",
+                    field
+                        .to_sql(table_engine)
+                        .attach_printable("Failed to sum window")?,
+                    partition_by.as_ref().map_or_else(
+                        || "".to_owned(),
+                        |partition_by| format!("partition by {}", partition_by.to_owned())
+                    ),
+                    order_by.as_ref().map_or_else(
+                        || "".to_owned(),
+                        |(order_column, order)| format!(
+                            " order by {} {}",
+                            order_column.to_owned(),
+                            order.to_string()
+                        )
+                    ),
+                    alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
+                )
+            }
+            Self::RowNumber {
+                field: _,
+                partition_by,
+                order_by,
+                alias,
+            } => {
+                format!(
+                    "row_number() over ({}{}){}",
+                    partition_by.as_ref().map_or_else(
+                        || "".to_owned(),
+                        |partition_by| format!("partition by {}", partition_by.to_owned())
+                    ),
+                    order_by.as_ref().map_or_else(
+                        || "".to_owned(),
+                        |(order_column, order)| format!(
+                            " order by {} {}",
+                            order_column.to_owned(),
+                            order.to_string()
+                        )
+                    ),
                     alias.map_or_else(|| "".to_owned(), |alias| format!(" as {}", alias))
                 )
             }
diff --git a/crates/router/src/analytics/types.rs b/crates/analytics/src/types.rs
similarity index 83%
rename from crates/router/src/analytics/types.rs
rename to crates/analytics/src/types.rs
index fe20e812a9b8..16d342d3d2ee 100644
--- a/crates/router/src/analytics/types.rs
+++ b/crates/analytics/src/types.rs
@@ -2,25 +2,36 @@ use std::{fmt::Display, str::FromStr};
 
 use common_utils::{
     errors::{CustomResult, ErrorSwitch, ParsingError},
-    events::ApiEventMetric,
+    events::{ApiEventMetric, ApiEventsType},
+    impl_misc_api_event_type,
 };
 use error_stack::{report, Report, ResultExt};
 
 use super::query::QueryBuildingError;
 
-#[derive(serde::Deserialize, Debug, masking::Serialize)]
+#[derive(serde::Deserialize, Debug, serde::Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum AnalyticsDomain {
     Payments,
     Refunds,
+    SdkEvents,
+    ApiEvents,
 }
 
-impl ApiEventMetric for AnalyticsDomain {}
-
 #[derive(Debug, strum::AsRefStr, strum::Display, Clone, Copy)]
 pub enum AnalyticsCollection {
     Payment,
     Refund,
+    SdkEvents,
+    ApiEvents,
+    PaymentIntent,
+}
+
+#[allow(dead_code)]
+#[derive(Debug)]
+pub enum TableEngine {
+    CollapsingMergeTree { sign: &'static str },
+    BasicTree,
 }
 
 #[derive(Debug, serde::Serialize, serde::Deserialize, Eq, PartialEq)]
@@ -50,6 +61,7 @@ where
 // Analytics Framework
 
 pub trait RefundAnalytics {}
+pub trait SdkEventAnalytics {}
 
 #[async_trait::async_trait]
 pub trait AnalyticsDataSource
@@ -60,6 +72,10 @@ where
     async fn load_results<T>(&self, query: &str) -> CustomResult<Vec<T>, QueryExecutionError>
     where
         Self: LoadRow<T>;
+
+    fn get_table_engine(_table: AnalyticsCollection) -> TableEngine {
+        TableEngine::BasicTree
+    }
 }
 
 pub trait LoadRow<T>
@@ -117,3 +133,5 @@ impl ErrorSwitch<FiltersError> for QueryBuildingError {
         FiltersError::QueryBuildingError
     }
 }
+
+impl_misc_api_event_type!(AnalyticsDomain);
diff --git a/crates/router/src/analytics/utils.rs b/crates/analytics/src/utils.rs
similarity index 52%
rename from crates/router/src/analytics/utils.rs
rename to crates/analytics/src/utils.rs
index f7e6ea69dc37..6a0aa973a1e7 100644
--- a/crates/router/src/analytics/utils.rs
+++ b/crates/analytics/src/utils.rs
@@ -1,6 +1,8 @@
 use api_models::analytics::{
+    api_event::{ApiEventDimensions, ApiEventMetrics},
     payments::{PaymentDimensions, PaymentMetrics},
     refunds::{RefundDimensions, RefundMetrics},
+    sdk_events::{SdkEventDimensions, SdkEventMetrics},
     NameDescription,
 };
 use strum::IntoEnumIterator;
@@ -13,6 +15,14 @@ pub fn get_refund_dimensions() -> Vec<NameDescription> {
     RefundDimensions::iter().map(Into::into).collect()
 }
 
+pub fn get_sdk_event_dimensions() -> Vec<NameDescription> {
+    SdkEventDimensions::iter().map(Into::into).collect()
+}
+
+pub fn get_api_event_dimensions() -> Vec<NameDescription> {
+    ApiEventDimensions::iter().map(Into::into).collect()
+}
+
 pub fn get_payment_metrics_info() -> Vec<NameDescription> {
     PaymentMetrics::iter().map(Into::into).collect()
 }
@@ -20,3 +30,11 @@ pub fn get_payment_metrics_info() -> Vec<NameDescription> {
 pub fn get_refund_metrics_info() -> Vec<NameDescription> {
     RefundMetrics::iter().map(Into::into).collect()
 }
+
+pub fn get_sdk_event_metrics_info() -> Vec<NameDescription> {
+    SdkEventMetrics::iter().map(Into::into).collect()
+}
+
+pub fn get_api_event_metrics_info() -> Vec<NameDescription> {
+    ApiEventMetrics::iter().map(Into::into).collect()
+}
diff --git a/crates/api_models/Cargo.toml b/crates/api_models/Cargo.toml
index ce882e913282..cb2e243745de 100644
--- a/crates/api_models/Cargo.toml
+++ b/crates/api_models/Cargo.toml
@@ -14,7 +14,7 @@ connector_choice_bcompat = []
 errors = ["dep:actix-web", "dep:reqwest"]
 backwards_compatibility = ["connector_choice_bcompat"]
 connector_choice_mca_id = ["euclid/connector_choice_mca_id"]
-dummy_connector = ["euclid/dummy_connector"]
+dummy_connector = ["euclid/dummy_connector", "common_enums/dummy_connector"]
 detailed_errors = []
 payouts = []
 
@@ -25,7 +25,7 @@ mime = "0.3.17"
 reqwest = { version = "0.11.18", optional = true }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
-strum = { version = "0.24.1", features = ["derive"] }
+strum = { version = "0.25", features = ["derive"] }
 time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
 url = { version = "2.4.0", features = ["serde"] }
 utoipa = { version = "3.3.0", features = ["preserve_order"] }
diff --git a/crates/api_models/src/admin.rs b/crates/api_models/src/admin.rs
index 735bd9f605e8..7e057db262e6 100644
--- a/crates/api_models/src/admin.rs
+++ b/crates/api_models/src/admin.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use common_utils::{
     crypto::{Encryptable, OptionalEncryptableName},
     pii,
@@ -590,6 +592,36 @@ pub struct MerchantConnectorCreate {
     pub status: Option<api_enums::ConnectorStatus>,
 }
 
+// Different patterns of authentication.
+#[derive(Default, Debug, Clone, serde::Deserialize, serde::Serialize)]
+#[serde(tag = "auth_type")]
+pub enum ConnectorAuthType {
+    TemporaryAuth,
+    HeaderKey {
+        api_key: Secret<String>,
+    },
+    BodyKey {
+        api_key: Secret<String>,
+        key1: Secret<String>,
+    },
+    SignatureKey {
+        api_key: Secret<String>,
+        key1: Secret<String>,
+        api_secret: Secret<String>,
+    },
+    MultiAuthKey {
+        api_key: Secret<String>,
+        key1: Secret<String>,
+        api_secret: Secret<String>,
+        key2: Secret<String>,
+    },
+    CurrencyAuthKey {
+        auth_key_map: HashMap<common_enums::Currency, pii::SecretSerdeValue>,
+    },
+    #[default]
+    NoKey,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 #[serde(deny_unknown_fields)]
 pub struct MerchantConnectorWebhookDetails {
diff --git a/crates/api_models/src/analytics.rs b/crates/api_models/src/analytics.rs
index 0358b6b313cf..0263427b0fde 100644
--- a/crates/api_models/src/analytics.rs
+++ b/crates/api_models/src/analytics.rs
@@ -1,15 +1,20 @@
 use std::collections::HashSet;
 
-use common_utils::events::ApiEventMetric;
-use time::PrimitiveDateTime;
+use common_utils::pii::EmailStrategy;
+use masking::Secret;
 
 use self::{
-    payments::{PaymentDimensions, PaymentMetrics},
+    api_event::{ApiEventDimensions, ApiEventMetrics},
+    payments::{PaymentDimensions, PaymentDistributions, PaymentMetrics},
     refunds::{RefundDimensions, RefundMetrics},
+    sdk_events::{SdkEventDimensions, SdkEventMetrics},
 };
+pub use crate::payments::TimeRange;
 
+pub mod api_event;
 pub mod payments;
 pub mod refunds;
+pub mod sdk_events;
 
 #[derive(Debug, serde::Serialize)]
 pub struct NameDescription {
@@ -25,23 +30,12 @@ pub struct GetInfoResponse {
     pub dimensions: Vec<NameDescription>,
 }
 
-impl ApiEventMetric for GetInfoResponse {}
-
-#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, PartialEq, Eq, Hash)]
-#[serde(rename_all = "camelCase")]
-pub struct TimeRange {
-    #[serde(with = "common_utils::custom_serde::iso8601")]
-    pub start_time: PrimitiveDateTime,
-    #[serde(default, with = "common_utils::custom_serde::iso8601::option")]
-    pub end_time: Option<PrimitiveDateTime>,
-}
-
-#[derive(Clone, Copy, Debug, serde::Deserialize, masking::Serialize)]
+#[derive(Clone, Copy, Debug, serde::Deserialize, serde::Serialize)]
 pub struct TimeSeries {
     pub granularity: Granularity,
 }
 
-#[derive(Clone, Copy, Debug, serde::Deserialize, masking::Serialize)]
+#[derive(Clone, Copy, Debug, serde::Deserialize, serde::Serialize)]
 pub enum Granularity {
     #[serde(rename = "G_ONEMIN")]
     OneMin,
@@ -57,7 +51,7 @@ pub enum Granularity {
     OneDay,
 }
 
-#[derive(Clone, Debug, serde::Deserialize, masking::Serialize)]
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GetPaymentMetricRequest {
     pub time_series: Option<TimeSeries>,
@@ -67,13 +61,51 @@ pub struct GetPaymentMetricRequest {
     #[serde(default)]
     pub filters: payments::PaymentFilters,
     pub metrics: HashSet<PaymentMetrics>,
+    pub distribution: Option<Distribution>,
     #[serde(default)]
     pub delta: bool,
 }
 
-impl ApiEventMetric for GetPaymentMetricRequest {}
+#[derive(Clone, Copy, Debug, serde::Deserialize, serde::Serialize)]
+pub enum QueryLimit {
+    #[serde(rename = "TOP_5")]
+    Top5,
+    #[serde(rename = "TOP_10")]
+    Top10,
+}
+
+#[allow(clippy::from_over_into)]
+impl Into<u64> for QueryLimit {
+    fn into(self) -> u64 {
+        match self {
+            Self::Top5 => 5,
+            Self::Top10 => 10,
+        }
+    }
+}
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Distribution {
+    pub distribution_for: PaymentDistributions,
+    pub distribution_cardinality: QueryLimit,
+}
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ReportRequest {
+    pub time_range: TimeRange,
+}
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GenerateReportRequest {
+    pub request: ReportRequest,
+    pub merchant_id: String,
+    pub email: Secret<String, EmailStrategy>,
+}
 
-#[derive(Clone, Debug, serde::Deserialize, masking::Serialize)]
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GetRefundMetricRequest {
     pub time_series: Option<TimeSeries>,
@@ -87,14 +119,26 @@ pub struct GetRefundMetricRequest {
     pub delta: bool,
 }
 
-impl ApiEventMetric for GetRefundMetricRequest {}
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GetSdkEventMetricRequest {
+    pub time_series: Option<TimeSeries>,
+    pub time_range: TimeRange,
+    #[serde(default)]
+    pub group_by_names: Vec<SdkEventDimensions>,
+    #[serde(default)]
+    pub filters: sdk_events::SdkEventFilters,
+    pub metrics: HashSet<SdkEventMetrics>,
+    #[serde(default)]
+    pub delta: bool,
+}
 
 #[derive(Debug, serde::Serialize)]
 pub struct AnalyticsMetadata {
     pub current_time_range: TimeRange,
 }
 
-#[derive(Debug, serde::Deserialize, masking::Serialize)]
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GetPaymentFiltersRequest {
     pub time_range: TimeRange,
@@ -102,16 +146,12 @@ pub struct GetPaymentFiltersRequest {
     pub group_by_names: Vec<PaymentDimensions>,
 }
 
-impl ApiEventMetric for GetPaymentFiltersRequest {}
-
 #[derive(Debug, Default, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PaymentFiltersResponse {
     pub query_data: Vec<FilterValue>,
 }
 
-impl ApiEventMetric for PaymentFiltersResponse {}
-
 #[derive(Debug, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FilterValue {
@@ -119,34 +159,88 @@ pub struct FilterValue {
     pub values: Vec<String>,
 }
 
-#[derive(Debug, serde::Deserialize, masking::Serialize)]
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
+
 pub struct GetRefundFilterRequest {
     pub time_range: TimeRange,
     #[serde(default)]
     pub group_by_names: Vec<RefundDimensions>,
 }
 
-impl ApiEventMetric for GetRefundFilterRequest {}
-
 #[derive(Debug, Default, serde::Serialize, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct RefundFiltersResponse {
     pub query_data: Vec<RefundFilterValue>,
 }
 
-impl ApiEventMetric for RefundFiltersResponse {}
-
 #[derive(Debug, serde::Serialize, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
+
 pub struct RefundFilterValue {
     pub dimension: RefundDimensions,
     pub values: Vec<String>,
 }
 
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GetSdkEventFiltersRequest {
+    pub time_range: TimeRange,
+    #[serde(default)]
+    pub group_by_names: Vec<SdkEventDimensions>,
+}
+
+#[derive(Debug, Default, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SdkEventFiltersResponse {
+    pub query_data: Vec<SdkEventFilterValue>,
+}
+
+#[derive(Debug, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SdkEventFilterValue {
+    pub dimension: SdkEventDimensions,
+    pub values: Vec<String>,
+}
+
 #[derive(Debug, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MetricsResponse<T> {
     pub query_data: Vec<T>,
     pub meta_data: [AnalyticsMetadata; 1],
 }
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GetApiEventFiltersRequest {
+    pub time_range: TimeRange,
+    #[serde(default)]
+    pub group_by_names: Vec<ApiEventDimensions>,
+}
+
+#[derive(Debug, Default, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ApiEventFiltersResponse {
+    pub query_data: Vec<ApiEventFilterValue>,
+}
+
+#[derive(Debug, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ApiEventFilterValue {
+    pub dimension: ApiEventDimensions,
+    pub values: Vec<String>,
+}
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GetApiEventMetricRequest {
+    pub time_series: Option<TimeSeries>,
+    pub time_range: TimeRange,
+    #[serde(default)]
+    pub group_by_names: Vec<ApiEventDimensions>,
+    #[serde(default)]
+    pub filters: api_event::ApiEventFilters,
+    pub metrics: HashSet<ApiEventMetrics>,
+    #[serde(default)]
+    pub delta: bool,
+}
diff --git a/crates/api_models/src/analytics/api_event.rs b/crates/api_models/src/analytics/api_event.rs
new file mode 100644
index 000000000000..62fe829f01b9
--- /dev/null
+++ b/crates/api_models/src/analytics/api_event.rs
@@ -0,0 +1,148 @@
+use std::{
+    collections::hash_map::DefaultHasher,
+    hash::{Hash, Hasher},
+};
+
+use super::{NameDescription, TimeRange};
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+pub struct ApiLogsRequest {
+    #[serde(flatten)]
+    pub query_param: QueryType,
+    pub api_name_filter: Option<Vec<String>>,
+}
+
+pub enum FilterType {
+    ApiCountFilter,
+    LatencyFilter,
+    StatusCodeFilter,
+}
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(tag = "type")]
+pub enum QueryType {
+    Payment {
+        payment_id: String,
+    },
+    Refund {
+        payment_id: String,
+        refund_id: String,
+    },
+}
+
+#[derive(
+    Debug,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::AsRefStr,
+    PartialEq,
+    PartialOrd,
+    Eq,
+    Ord,
+    strum::Display,
+    strum::EnumIter,
+    Clone,
+    Copy,
+)]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
+pub enum ApiEventDimensions {
+    // Do not change the order of these enums
+    // Consult the Dashboard FE folks since these also affects the order of metrics on FE
+    StatusCode,
+    FlowType,
+    ApiFlow,
+}
+
+impl From<ApiEventDimensions> for NameDescription {
+    fn from(value: ApiEventDimensions) -> Self {
+        Self {
+            name: value.to_string(),
+            desc: String::new(),
+        }
+    }
+}
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+pub struct ApiEventFilters {
+    pub status_code: Vec<u64>,
+    pub flow_type: Vec<String>,
+    pub api_flow: Vec<String>,
+}
+
+#[derive(
+    Clone,
+    Debug,
+    Hash,
+    PartialEq,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::Display,
+    strum::EnumIter,
+    strum::AsRefStr,
+)]
+#[strum(serialize_all = "snake_case")]
+#[serde(rename_all = "snake_case")]
+pub enum ApiEventMetrics {
+    Latency,
+    ApiCount,
+    StatusCodeCount,
+}
+
+impl From<ApiEventMetrics> for NameDescription {
+    fn from(value: ApiEventMetrics) -> Self {
+        Self {
+            name: value.to_string(),
+            desc: String::new(),
+        }
+    }
+}
+
+#[derive(Debug, serde::Serialize, Eq)]
+pub struct ApiEventMetricsBucketIdentifier {
+    #[serde(rename = "time_range")]
+    pub time_bucket: TimeRange,
+    // Coz FE sucks
+    #[serde(rename = "time_bucket")]
+    #[serde(with = "common_utils::custom_serde::iso8601custom")]
+    pub start_time: time::PrimitiveDateTime,
+}
+
+impl ApiEventMetricsBucketIdentifier {
+    pub fn new(normalized_time_range: TimeRange) -> Self {
+        Self {
+            time_bucket: normalized_time_range,
+            start_time: normalized_time_range.start_time,
+        }
+    }
+}
+
+impl Hash for ApiEventMetricsBucketIdentifier {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.time_bucket.hash(state);
+    }
+}
+
+impl PartialEq for ApiEventMetricsBucketIdentifier {
+    fn eq(&self, other: &Self) -> bool {
+        let mut left = DefaultHasher::new();
+        self.hash(&mut left);
+        let mut right = DefaultHasher::new();
+        other.hash(&mut right);
+        left.finish() == right.finish()
+    }
+}
+
+#[derive(Debug, serde::Serialize)]
+pub struct ApiEventMetricsBucketValue {
+    pub latency: Option<u64>,
+    pub api_count: Option<u64>,
+    pub status_code_count: Option<u64>,
+}
+
+#[derive(Debug, serde::Serialize)]
+pub struct ApiMetricsBucketResponse {
+    #[serde(flatten)]
+    pub values: ApiEventMetricsBucketValue,
+    #[serde(flatten)]
+    pub dimensions: ApiEventMetricsBucketIdentifier,
+}
diff --git a/crates/api_models/src/analytics/payments.rs b/crates/api_models/src/analytics/payments.rs
index b5e5852d6283..2d7ae262f489 100644
--- a/crates/api_models/src/analytics/payments.rs
+++ b/crates/api_models/src/analytics/payments.rs
@@ -3,13 +3,12 @@ use std::{
     hash::{Hash, Hasher},
 };
 
-use common_enums::enums::{AttemptStatus, AuthenticationType, Currency, PaymentMethod};
-use common_utils::events::ApiEventMetric;
-
 use super::{NameDescription, TimeRange};
-use crate::{analytics::MetricsResponse, enums::Connector};
+use crate::enums::{
+    AttemptStatus, AuthenticationType, Connector, Currency, PaymentMethod, PaymentMethodType,
+};
 
-#[derive(Clone, Debug, Default, serde::Deserialize, masking::Serialize)]
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
 pub struct PaymentFilters {
     #[serde(default)]
     pub currency: Vec<Currency>,
@@ -21,6 +20,8 @@ pub struct PaymentFilters {
     pub auth_type: Vec<AuthenticationType>,
     #[serde(default)]
     pub payment_method: Vec<PaymentMethod>,
+    #[serde(default)]
+    pub payment_method_type: Vec<PaymentMethodType>,
 }
 
 #[derive(
@@ -44,6 +45,7 @@ pub enum PaymentDimensions {
     // Consult the Dashboard FE folks since these also affects the order of metrics on FE
     Connector,
     PaymentMethod,
+    PaymentMethodType,
     Currency,
     #[strum(serialize = "authentication_type")]
     #[serde(rename = "authentication_type")]
@@ -73,6 +75,35 @@ pub enum PaymentMetrics {
     PaymentSuccessCount,
     PaymentProcessedAmount,
     AvgTicketSize,
+    RetriesCount,
+    ConnectorSuccessRate,
+}
+
+#[derive(Debug, Default, serde::Serialize)]
+pub struct ErrorResult {
+    pub reason: String,
+    pub count: i64,
+    pub percentage: f64,
+}
+
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Hash,
+    PartialEq,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::Display,
+    strum::EnumIter,
+    strum::AsRefStr,
+)]
+#[strum(serialize_all = "snake_case")]
+#[serde(rename_all = "snake_case")]
+pub enum PaymentDistributions {
+    #[strum(serialize = "error_message")]
+    PaymentErrorMessage,
 }
 
 pub mod metric_behaviour {
@@ -109,6 +140,7 @@ pub struct PaymentMetricsBucketIdentifier {
     #[serde(rename = "authentication_type")]
     pub auth_type: Option<AuthenticationType>,
     pub payment_method: Option<String>,
+    pub payment_method_type: Option<String>,
     #[serde(rename = "time_range")]
     pub time_bucket: TimeRange,
     // Coz FE sucks
@@ -124,6 +156,7 @@ impl PaymentMetricsBucketIdentifier {
         connector: Option<String>,
         auth_type: Option<AuthenticationType>,
         payment_method: Option<String>,
+        payment_method_type: Option<String>,
         normalized_time_range: TimeRange,
     ) -> Self {
         Self {
@@ -132,6 +165,7 @@ impl PaymentMetricsBucketIdentifier {
             connector,
             auth_type,
             payment_method,
+            payment_method_type,
             time_bucket: normalized_time_range,
             start_time: normalized_time_range.start_time,
         }
@@ -145,6 +179,7 @@ impl Hash for PaymentMetricsBucketIdentifier {
         self.connector.hash(state);
         self.auth_type.map(|i| i.to_string()).hash(state);
         self.payment_method.hash(state);
+        self.payment_method_type.hash(state);
         self.time_bucket.hash(state);
     }
 }
@@ -166,6 +201,10 @@ pub struct PaymentMetricsBucketValue {
     pub payment_success_count: Option<u64>,
     pub payment_processed_amount: Option<u64>,
     pub avg_ticket_size: Option<f64>,
+    pub payment_error_message: Option<Vec<ErrorResult>>,
+    pub retries_count: Option<u64>,
+    pub retries_amount_processed: Option<u64>,
+    pub connector_success_rate: Option<f64>,
 }
 
 #[derive(Debug, serde::Serialize)]
@@ -175,6 +214,3 @@ pub struct MetricsBucketResponse {
     #[serde(flatten)]
     pub dimensions: PaymentMetricsBucketIdentifier,
 }
-
-impl ApiEventMetric for MetricsBucketResponse {}
-impl ApiEventMetric for MetricsResponse<MetricsBucketResponse> {}
diff --git a/crates/api_models/src/analytics/refunds.rs b/crates/api_models/src/analytics/refunds.rs
index c5d444338d38..5ecdf1cecb3f 100644
--- a/crates/api_models/src/analytics/refunds.rs
+++ b/crates/api_models/src/analytics/refunds.rs
@@ -3,10 +3,7 @@ use std::{
     hash::{Hash, Hasher},
 };
 
-use common_enums::enums::{Currency, RefundStatus};
-use common_utils::events::ApiEventMetric;
-
-use crate::analytics::MetricsResponse;
+use crate::{enums::Currency, refunds::RefundStatus};
 
 #[derive(
     Clone,
@@ -20,7 +17,7 @@ use crate::analytics::MetricsResponse;
     strum::Display,
     strum::EnumString,
 )]
-// TODO RefundType common_enums need to mapped to storage_model
+// TODO RefundType api_models_oss need to mapped to storage_model
 #[serde(rename_all = "snake_case")]
 #[strum(serialize_all = "snake_case")]
 pub enum RefundType {
@@ -31,7 +28,7 @@ pub enum RefundType {
 }
 
 use super::{NameDescription, TimeRange};
-#[derive(Clone, Debug, Default, serde::Deserialize, masking::Serialize)]
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
 pub struct RefundFilters {
     #[serde(default)]
     pub currency: Vec<Currency>,
@@ -115,8 +112,9 @@ impl From<RefundDimensions> for NameDescription {
 #[derive(Debug, serde::Serialize, Eq)]
 pub struct RefundMetricsBucketIdentifier {
     pub currency: Option<Currency>,
-    pub refund_status: Option<RefundStatus>,
+    pub refund_status: Option<String>,
     pub connector: Option<String>,
+
     pub refund_type: Option<String>,
     #[serde(rename = "time_range")]
     pub time_bucket: TimeRange,
@@ -128,7 +126,7 @@ pub struct RefundMetricsBucketIdentifier {
 impl Hash for RefundMetricsBucketIdentifier {
     fn hash<H: Hasher>(&self, state: &mut H) {
         self.currency.hash(state);
-        self.refund_status.map(|i| i.to_string()).hash(state);
+        self.refund_status.hash(state);
         self.connector.hash(state);
         self.refund_type.hash(state);
         self.time_bucket.hash(state);
@@ -147,7 +145,7 @@ impl PartialEq for RefundMetricsBucketIdentifier {
 impl RefundMetricsBucketIdentifier {
     pub fn new(
         currency: Option<Currency>,
-        refund_status: Option<RefundStatus>,
+        refund_status: Option<String>,
         connector: Option<String>,
         refund_type: Option<String>,
         normalized_time_range: TimeRange,
@@ -162,7 +160,6 @@ impl RefundMetricsBucketIdentifier {
         }
     }
 }
-
 #[derive(Debug, serde::Serialize)]
 pub struct RefundMetricsBucketValue {
     pub refund_success_rate: Option<f64>,
@@ -170,7 +167,6 @@ pub struct RefundMetricsBucketValue {
     pub refund_success_count: Option<u64>,
     pub refund_processed_amount: Option<u64>,
 }
-
 #[derive(Debug, serde::Serialize)]
 pub struct RefundMetricsBucketResponse {
     #[serde(flatten)]
@@ -178,6 +174,3 @@ pub struct RefundMetricsBucketResponse {
     #[serde(flatten)]
     pub dimensions: RefundMetricsBucketIdentifier,
 }
-
-impl ApiEventMetric for RefundMetricsBucketResponse {}
-impl ApiEventMetric for MetricsResponse<RefundMetricsBucketResponse> {}
diff --git a/crates/api_models/src/analytics/sdk_events.rs b/crates/api_models/src/analytics/sdk_events.rs
new file mode 100644
index 000000000000..76ccb29867f2
--- /dev/null
+++ b/crates/api_models/src/analytics/sdk_events.rs
@@ -0,0 +1,215 @@
+use std::{
+    collections::hash_map::DefaultHasher,
+    hash::{Hash, Hasher},
+};
+
+use super::{NameDescription, TimeRange};
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SdkEventsRequest {
+    pub payment_id: String,
+    pub time_range: TimeRange,
+}
+
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+pub struct SdkEventFilters {
+    #[serde(default)]
+    pub payment_method: Vec<String>,
+    #[serde(default)]
+    pub platform: Vec<String>,
+    #[serde(default)]
+    pub browser_name: Vec<String>,
+    #[serde(default)]
+    pub source: Vec<String>,
+    #[serde(default)]
+    pub component: Vec<String>,
+    #[serde(default)]
+    pub payment_experience: Vec<String>,
+}
+
+#[derive(
+    Debug,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::AsRefStr,
+    PartialEq,
+    PartialOrd,
+    Eq,
+    Ord,
+    strum::Display,
+    strum::EnumIter,
+    Clone,
+    Copy,
+)]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
+pub enum SdkEventDimensions {
+    // Do not change the order of these enums
+    // Consult the Dashboard FE folks since these also affects the order of metrics on FE
+    PaymentMethod,
+    Platform,
+    BrowserName,
+    Source,
+    Component,
+    PaymentExperience,
+}
+
+#[derive(
+    Clone,
+    Debug,
+    Hash,
+    PartialEq,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::Display,
+    strum::EnumIter,
+    strum::AsRefStr,
+)]
+#[strum(serialize_all = "snake_case")]
+#[serde(rename_all = "snake_case")]
+pub enum SdkEventMetrics {
+    PaymentAttempts,
+    PaymentSuccessCount,
+    PaymentMethodsCallCount,
+    SdkRenderedCount,
+    SdkInitiatedCount,
+    PaymentMethodSelectedCount,
+    PaymentDataFilledCount,
+    AveragePaymentTime,
+}
+
+#[derive(
+    Clone,
+    Debug,
+    Hash,
+    PartialEq,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::Display,
+    strum::EnumIter,
+    strum::AsRefStr,
+)]
+#[strum(serialize_all = "SCREAMING_SNAKE_CASE")]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum SdkEventNames {
+    StripeElementsCalled,
+    AppRendered,
+    PaymentMethodChanged,
+    PaymentDataFilled,
+    PaymentAttempt,
+    PaymentSuccess,
+    PaymentMethodsCall,
+    ConfirmCall,
+    SessionsCall,
+    CustomerPaymentMethodsCall,
+    RedirectingUser,
+    DisplayBankTransferInfoPage,
+    DisplayQrCodeInfoPage,
+}
+
+pub mod metric_behaviour {
+    pub struct PaymentAttempts;
+    pub struct PaymentSuccessCount;
+    pub struct PaymentMethodsCallCount;
+    pub struct SdkRenderedCount;
+    pub struct SdkInitiatedCount;
+    pub struct PaymentMethodSelectedCount;
+    pub struct PaymentDataFilledCount;
+    pub struct AveragePaymentTime;
+}
+
+impl From<SdkEventMetrics> for NameDescription {
+    fn from(value: SdkEventMetrics) -> Self {
+        Self {
+            name: value.to_string(),
+            desc: String::new(),
+        }
+    }
+}
+
+impl From<SdkEventDimensions> for NameDescription {
+    fn from(value: SdkEventDimensions) -> Self {
+        Self {
+            name: value.to_string(),
+            desc: String::new(),
+        }
+    }
+}
+
+#[derive(Debug, serde::Serialize, Eq)]
+pub struct SdkEventMetricsBucketIdentifier {
+    pub payment_method: Option<String>,
+    pub platform: Option<String>,
+    pub browser_name: Option<String>,
+    pub source: Option<String>,
+    pub component: Option<String>,
+    pub payment_experience: Option<String>,
+    pub time_bucket: Option<String>,
+}
+
+impl SdkEventMetricsBucketIdentifier {
+    pub fn new(
+        payment_method: Option<String>,
+        platform: Option<String>,
+        browser_name: Option<String>,
+        source: Option<String>,
+        component: Option<String>,
+        payment_experience: Option<String>,
+        time_bucket: Option<String>,
+    ) -> Self {
+        Self {
+            payment_method,
+            platform,
+            browser_name,
+            source,
+            component,
+            payment_experience,
+            time_bucket,
+        }
+    }
+}
+
+impl Hash for SdkEventMetricsBucketIdentifier {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.payment_method.hash(state);
+        self.platform.hash(state);
+        self.browser_name.hash(state);
+        self.source.hash(state);
+        self.component.hash(state);
+        self.payment_experience.hash(state);
+        self.time_bucket.hash(state);
+    }
+}
+
+impl PartialEq for SdkEventMetricsBucketIdentifier {
+    fn eq(&self, other: &Self) -> bool {
+        let mut left = DefaultHasher::new();
+        self.hash(&mut left);
+        let mut right = DefaultHasher::new();
+        other.hash(&mut right);
+        left.finish() == right.finish()
+    }
+}
+
+#[derive(Debug, serde::Serialize)]
+pub struct SdkEventMetricsBucketValue {
+    pub payment_attempts: Option<u64>,
+    pub payment_success_count: Option<u64>,
+    pub payment_methods_call_count: Option<u64>,
+    pub average_payment_time: Option<f64>,
+    pub sdk_rendered_count: Option<u64>,
+    pub sdk_initiated_count: Option<u64>,
+    pub payment_method_selected_count: Option<u64>,
+    pub payment_data_filled_count: Option<u64>,
+}
+
+#[derive(Debug, serde::Serialize)]
+pub struct MetricsBucketResponse {
+    #[serde(flatten)]
+    pub values: SdkEventMetricsBucketValue,
+    #[serde(flatten)]
+    pub dimensions: SdkEventMetricsBucketIdentifier,
+}
diff --git a/crates/api_models/src/currency.rs b/crates/api_models/src/currency.rs
new file mode 100644
index 000000000000..c1d7e422d041
--- /dev/null
+++ b/crates/api_models/src/currency.rs
@@ -0,0 +1,21 @@
+use common_utils::events::ApiEventMetric;
+
+/// QueryParams to be send to convert the amount -> from_currency -> to_currency
+#[derive(Debug, serde::Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub struct CurrencyConversionParams {
+    pub amount: i64,
+    pub to_currency: String,
+    pub from_currency: String,
+}
+
+/// Response to be send for convert currency route
+#[derive(Debug, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub struct CurrencyConversionResponse {
+    pub converted_amount: String,
+    pub currency: String,
+}
+
+impl ApiEventMetric for CurrencyConversionResponse {}
+impl ApiEventMetric for CurrencyConversionParams {}
diff --git a/crates/api_models/src/enums.rs b/crates/api_models/src/enums.rs
index ffefaa2ad2c4..535be4dfb159 100644
--- a/crates/api_models/src/enums.rs
+++ b/crates/api_models/src/enums.rs
@@ -147,104 +147,6 @@ impl Connector {
     }
 }
 
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Eq,
-    Hash,
-    PartialEq,
-    serde::Serialize,
-    serde::Deserialize,
-    strum::Display,
-    strum::EnumString,
-    strum::EnumIter,
-    strum::EnumVariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-#[strum(serialize_all = "snake_case")]
-pub enum RoutableConnectors {
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "phonypay")]
-    #[strum(serialize = "phonypay")]
-    DummyConnector1,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "fauxpay")]
-    #[strum(serialize = "fauxpay")]
-    DummyConnector2,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "pretendpay")]
-    #[strum(serialize = "pretendpay")]
-    DummyConnector3,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "stripe_test")]
-    #[strum(serialize = "stripe_test")]
-    DummyConnector4,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "adyen_test")]
-    #[strum(serialize = "adyen_test")]
-    DummyConnector5,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "checkout_test")]
-    #[strum(serialize = "checkout_test")]
-    DummyConnector6,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "paypal_test")]
-    #[strum(serialize = "paypal_test")]
-    DummyConnector7,
-    Aci,
-    Adyen,
-    Airwallex,
-    Authorizedotnet,
-    Bankofamerica,
-    Bitpay,
-    Bambora,
-    Bluesnap,
-    Boku,
-    Braintree,
-    Cashtocode,
-    Checkout,
-    Coinbase,
-    Cryptopay,
-    Cybersource,
-    Dlocal,
-    Fiserv,
-    Forte,
-    Globalpay,
-    Globepay,
-    Gocardless,
-    Helcim,
-    Iatapay,
-    Klarna,
-    Mollie,
-    Multisafepay,
-    Nexinets,
-    Nmi,
-    Noon,
-    Nuvei,
-    // Opayo, added as template code for future usage
-    Opennode,
-    // Payeezy, As psync and rsync are not supported by this connector, it is added as template code for future usage
-    Payme,
-    Paypal,
-    Payu,
-    Powertranz,
-    Prophetpay,
-    Rapyd,
-    Shift4,
-    Square,
-    Stax,
-    Stripe,
-    Trustpay,
-    // Tsys,
-    Tsys,
-    Volt,
-    Wise,
-    Worldline,
-    Worldpay,
-    Zen,
-}
-
 #[cfg(feature = "payouts")]
 #[derive(
     Clone,
diff --git a/crates/api_models/src/events.rs b/crates/api_models/src/events.rs
index 782c02be7a3a..345f827daeac 100644
--- a/crates/api_models/src/events.rs
+++ b/crates/api_models/src/events.rs
@@ -14,8 +14,16 @@ use common_utils::{
 };
 
 use crate::{
-    admin::*, api_keys::*, cards_info::*, disputes::*, files::*, mandates::*, payment_methods::*,
-    payments::*, verifications::*,
+    admin::*,
+    analytics::{api_event::*, sdk_events::*, *},
+    api_keys::*,
+    cards_info::*,
+    disputes::*,
+    files::*,
+    mandates::*,
+    payment_methods::*,
+    payments::*,
+    verifications::*,
 };
 
 impl ApiEventMetric for TimeRange {}
@@ -63,7 +71,23 @@ impl_misc_api_event_type!(
     ApplepayMerchantVerificationRequest,
     ApplepayMerchantResponse,
     ApplepayVerifiedDomainsResponse,
-    UpdateApiKeyRequest
+    UpdateApiKeyRequest,
+    GetApiEventFiltersRequest,
+    ApiEventFiltersResponse,
+    GetInfoResponse,
+    GetPaymentMetricRequest,
+    GetRefundMetricRequest,
+    GetSdkEventMetricRequest,
+    GetPaymentFiltersRequest,
+    PaymentFiltersResponse,
+    GetRefundFilterRequest,
+    RefundFiltersResponse,
+    GetSdkEventFiltersRequest,
+    SdkEventFiltersResponse,
+    ApiLogsRequest,
+    GetApiEventMetricRequest,
+    SdkEventsRequest,
+    ReportRequest
 );
 
 #[cfg(feature = "stripe")]
@@ -76,3 +100,9 @@ impl_misc_api_event_type!(
     CustomerPaymentMethodListResponse,
     CreateCustomerResponse
 );
+
+impl<T> ApiEventMetric for MetricsResponse<T> {
+    fn get_api_event_type(&self) -> Option<ApiEventsType> {
+        Some(ApiEventsType::Miscellaneous)
+    }
+}
diff --git a/crates/api_models/src/events/user.rs b/crates/api_models/src/events/user.rs
index 4e9f2f284173..edfdcf1d6652 100644
--- a/crates/api_models/src/events/user.rs
+++ b/crates/api_models/src/events/user.rs
@@ -1,6 +1,11 @@
 use common_utils::events::{ApiEventMetric, ApiEventsType};
 
-use crate::user::{ChangePasswordRequest, ConnectAccountRequest, ConnectAccountResponse};
+use crate::user::{
+    dashboard_metadata::{
+        GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,
+    },
+    ChangePasswordRequest, ConnectAccountRequest, ConnectAccountResponse,
+};
 
 impl ApiEventMetric for ConnectAccountResponse {
     fn get_api_event_type(&self) -> Option<ApiEventsType> {
@@ -13,4 +18,10 @@ impl ApiEventMetric for ConnectAccountResponse {
 
 impl ApiEventMetric for ConnectAccountRequest {}
 
-common_utils::impl_misc_api_event_type!(ChangePasswordRequest);
+common_utils::impl_misc_api_event_type!(
+    ChangePasswordRequest,
+    GetMultipleMetaDataPayload,
+    GetMetaDataResponse,
+    GetMetaDataRequest,
+    SetMetaDataRequest
+);
diff --git a/crates/api_models/src/lib.rs b/crates/api_models/src/lib.rs
index 1abeff7b6ddb..8ef40d319140 100644
--- a/crates/api_models/src/lib.rs
+++ b/crates/api_models/src/lib.rs
@@ -5,6 +5,7 @@ pub mod api_keys;
 pub mod bank_accounts;
 pub mod cards_info;
 pub mod conditional_configs;
+pub mod currency;
 pub mod customers;
 pub mod disputes;
 pub mod enums;
@@ -26,4 +27,5 @@ pub mod routing;
 pub mod surcharge_decision_configs;
 pub mod user;
 pub mod verifications;
+pub mod verify_connector;
 pub mod webhooks;
diff --git a/crates/api_models/src/payments.rs b/crates/api_models/src/payments.rs
index 4b236e27d8c8..608c52167b69 100644
--- a/crates/api_models/src/payments.rs
+++ b/crates/api_models/src/payments.rs
@@ -316,6 +316,9 @@ pub struct PaymentsRequest {
     /// The type of the payment that differentiates between normal and various types of mandate payments
     #[schema(value_type = Option<PaymentType>)]
     pub payment_type: Option<api_enums::PaymentType>,
+
+    ///Request for an incremental authorization
+    pub request_incremental_authorization: Option<bool>,
 }
 
 impl PaymentsRequest {
@@ -723,6 +726,14 @@ pub struct Card {
     pub nick_name: Option<Secret<String>>,
 }
 
+#[derive(Eq, PartialEq, Debug, serde::Deserialize, serde::Serialize, Clone, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct CardToken {
+    /// The card holder's name
+    #[schema(value_type = String, example = "John Test")]
+    pub card_holder_name: Option<Secret<String>>,
+}
+
 #[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum CardRedirectData {
@@ -852,6 +863,7 @@ pub enum PaymentMethodData {
     Upi(UpiData),
     Voucher(VoucherData),
     GiftCard(Box<GiftCardData>),
+    CardToken(CardToken),
 }
 
 impl PaymentMethodData {
@@ -879,7 +891,8 @@ impl PaymentMethodData {
             | Self::Reward
             | Self::Upi(_)
             | Self::Voucher(_)
-            | Self::GiftCard(_) => None,
+            | Self::GiftCard(_)
+            | Self::CardToken(_) => None,
         }
     }
 }
@@ -1098,6 +1111,7 @@ pub enum AdditionalPaymentData {
     GiftCard {},
     Voucher {},
     CardRedirect {},
+    CardToken {},
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, serde::Deserialize, serde::Serialize, ToSchema)]
@@ -1199,10 +1213,10 @@ pub enum BankRedirectData {
     OpenBankingUk {
         // Issuer banks
         #[schema(value_type = BankNames)]
-        issuer: api_enums::BankNames,
+        issuer: Option<api_enums::BankNames>,
         /// The country for bank payment
         #[schema(value_type = CountryAlpha2, example = "US")]
-        country: api_enums::CountryAlpha2,
+        country: Option<api_enums::CountryAlpha2>,
     },
     Przelewy24 {
         //Issuer banks
@@ -1666,6 +1680,7 @@ pub enum PaymentMethodDataResponse {
     Voucher,
     GiftCard,
     CardRedirect,
+    CardToken,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize, ToSchema)]
@@ -2204,6 +2219,9 @@ pub struct PaymentsResponse {
 
     /// Identifier of the connector ( merchant connector account ) which was chosen to make the payment
     pub merchant_connector_id: Option<String>,
+
+    /// If true incremental authorization can be performed on this payment
+    pub incremental_authorization_allowed: Option<bool>,
 }
 
 #[derive(Clone, Debug, serde::Deserialize, ToSchema, serde::Serialize)]
@@ -2333,9 +2351,11 @@ pub struct PaymentListFilters {
 pub struct TimeRange {
     /// The start time to filter payments list or to get list of filters. To get list of filters start time is needed to be passed
     #[serde(with = "common_utils::custom_serde::iso8601")]
+    #[serde(alias = "startTime")]
     pub start_time: PrimitiveDateTime,
     /// The end time to filter payments list or to get list of filters. If not passed the default time is now
     #[serde(default, with = "common_utils::custom_serde::iso8601::option")]
+    #[serde(alias = "endTime")]
     pub end_time: Option<PrimitiveDateTime>,
 }
 
@@ -2461,6 +2481,7 @@ impl From<AdditionalPaymentData> for PaymentMethodDataResponse {
             AdditionalPaymentData::Voucher {} => Self::Voucher,
             AdditionalPaymentData::GiftCard {} => Self::GiftCard,
             AdditionalPaymentData::CardRedirect {} => Self::CardRedirect,
+            AdditionalPaymentData::CardToken {} => Self::CardToken,
         }
     }
 }
diff --git a/crates/api_models/src/routing.rs b/crates/api_models/src/routing.rs
index 47a44ea7443e..2236714da1d1 100644
--- a/crates/api_models/src/routing.rs
+++ b/crates/api_models/src/routing.rs
@@ -4,7 +4,6 @@ use common_utils::errors::ParsingError;
 use error_stack::IntoReport;
 use euclid::{
     dssa::types::EuclidAnalysable,
-    enums as euclid_enums,
     frontend::{
         ast,
         dir::{DirKeyKind, EuclidDirFilter},
@@ -287,71 +286,7 @@ impl From<RoutableConnectorChoice> for RoutableChoiceSerde {
 impl From<RoutableConnectorChoice> for ast::ConnectorChoice {
     fn from(value: RoutableConnectorChoice) -> Self {
         Self {
-            connector: match value.connector {
-                #[cfg(feature = "dummy_connector")]
-                RoutableConnectors::DummyConnector1 => euclid_enums::Connector::DummyConnector1,
-                #[cfg(feature = "dummy_connector")]
-                RoutableConnectors::DummyConnector2 => euclid_enums::Connector::DummyConnector2,
-                #[cfg(feature = "dummy_connector")]
-                RoutableConnectors::DummyConnector3 => euclid_enums::Connector::DummyConnector3,
-                #[cfg(feature = "dummy_connector")]
-                RoutableConnectors::DummyConnector4 => euclid_enums::Connector::DummyConnector4,
-                #[cfg(feature = "dummy_connector")]
-                RoutableConnectors::DummyConnector5 => euclid_enums::Connector::DummyConnector5,
-                #[cfg(feature = "dummy_connector")]
-                RoutableConnectors::DummyConnector6 => euclid_enums::Connector::DummyConnector6,
-                #[cfg(feature = "dummy_connector")]
-                RoutableConnectors::DummyConnector7 => euclid_enums::Connector::DummyConnector7,
-                RoutableConnectors::Aci => euclid_enums::Connector::Aci,
-                RoutableConnectors::Adyen => euclid_enums::Connector::Adyen,
-                RoutableConnectors::Airwallex => euclid_enums::Connector::Airwallex,
-                RoutableConnectors::Authorizedotnet => euclid_enums::Connector::Authorizedotnet,
-                RoutableConnectors::Bambora => euclid_enums::Connector::Bambora,
-                RoutableConnectors::Bankofamerica => euclid_enums::Connector::Bankofamerica,
-                RoutableConnectors::Bitpay => euclid_enums::Connector::Bitpay,
-                RoutableConnectors::Bluesnap => euclid_enums::Connector::Bluesnap,
-                RoutableConnectors::Boku => euclid_enums::Connector::Boku,
-                RoutableConnectors::Braintree => euclid_enums::Connector::Braintree,
-                RoutableConnectors::Cashtocode => euclid_enums::Connector::Cashtocode,
-                RoutableConnectors::Checkout => euclid_enums::Connector::Checkout,
-                RoutableConnectors::Coinbase => euclid_enums::Connector::Coinbase,
-                RoutableConnectors::Cryptopay => euclid_enums::Connector::Cryptopay,
-                RoutableConnectors::Cybersource => euclid_enums::Connector::Cybersource,
-                RoutableConnectors::Dlocal => euclid_enums::Connector::Dlocal,
-                RoutableConnectors::Fiserv => euclid_enums::Connector::Fiserv,
-                RoutableConnectors::Forte => euclid_enums::Connector::Forte,
-                RoutableConnectors::Globalpay => euclid_enums::Connector::Globalpay,
-                RoutableConnectors::Globepay => euclid_enums::Connector::Globepay,
-                RoutableConnectors::Gocardless => euclid_enums::Connector::Gocardless,
-                RoutableConnectors::Helcim => euclid_enums::Connector::Helcim,
-                RoutableConnectors::Iatapay => euclid_enums::Connector::Iatapay,
-                RoutableConnectors::Klarna => euclid_enums::Connector::Klarna,
-                RoutableConnectors::Mollie => euclid_enums::Connector::Mollie,
-                RoutableConnectors::Multisafepay => euclid_enums::Connector::Multisafepay,
-                RoutableConnectors::Nexinets => euclid_enums::Connector::Nexinets,
-                RoutableConnectors::Nmi => euclid_enums::Connector::Nmi,
-                RoutableConnectors::Noon => euclid_enums::Connector::Noon,
-                RoutableConnectors::Nuvei => euclid_enums::Connector::Nuvei,
-                RoutableConnectors::Opennode => euclid_enums::Connector::Opennode,
-                RoutableConnectors::Payme => euclid_enums::Connector::Payme,
-                RoutableConnectors::Paypal => euclid_enums::Connector::Paypal,
-                RoutableConnectors::Payu => euclid_enums::Connector::Payu,
-                RoutableConnectors::Powertranz => euclid_enums::Connector::Powertranz,
-                RoutableConnectors::Prophetpay => euclid_enums::Connector::Prophetpay,
-                RoutableConnectors::Rapyd => euclid_enums::Connector::Rapyd,
-                RoutableConnectors::Shift4 => euclid_enums::Connector::Shift4,
-                RoutableConnectors::Square => euclid_enums::Connector::Square,
-                RoutableConnectors::Stax => euclid_enums::Connector::Stax,
-                RoutableConnectors::Stripe => euclid_enums::Connector::Stripe,
-                RoutableConnectors::Trustpay => euclid_enums::Connector::Trustpay,
-                RoutableConnectors::Tsys => euclid_enums::Connector::Tsys,
-                RoutableConnectors::Volt => euclid_enums::Connector::Volt,
-                RoutableConnectors::Wise => euclid_enums::Connector::Wise,
-                RoutableConnectors::Worldline => euclid_enums::Connector::Worldline,
-                RoutableConnectors::Worldpay => euclid_enums::Connector::Worldpay,
-                RoutableConnectors::Zen => euclid_enums::Connector::Zen,
-            },
-
+            connector: value.connector,
             #[cfg(not(feature = "connector_choice_mca_id"))]
             sub_label: value.sub_label,
         }
diff --git a/crates/api_models/src/user.rs b/crates/api_models/src/user.rs
index 41ea9cc5193a..84659432aa6a 100644
--- a/crates/api_models/src/user.rs
+++ b/crates/api_models/src/user.rs
@@ -1,5 +1,6 @@
 use common_utils::pii;
 use masking::Secret;
+pub mod dashboard_metadata;
 
 #[derive(serde::Deserialize, Debug, Clone, serde::Serialize)]
 pub struct ConnectAccountRequest {
diff --git a/crates/api_models/src/user/dashboard_metadata.rs b/crates/api_models/src/user/dashboard_metadata.rs
new file mode 100644
index 000000000000..04cda3bd7075
--- /dev/null
+++ b/crates/api_models/src/user/dashboard_metadata.rs
@@ -0,0 +1,110 @@
+use masking::Secret;
+use strum::EnumString;
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub enum SetMetaDataRequest {
+    ProductionAgreement(ProductionAgreementRequest),
+    SetupProcessor(SetupProcessor),
+    ConfigureEndpoint,
+    SetupComplete,
+    FirstProcessorConnected(ProcessorConnected),
+    SecondProcessorConnected(ProcessorConnected),
+    ConfiguredRouting(ConfiguredRouting),
+    TestPayment(TestPayment),
+    IntegrationMethod(IntegrationMethod),
+    IntegrationCompleted,
+    SPRoutingConfigured(ConfiguredRouting),
+    SPTestPayment,
+    DownloadWoocom,
+    ConfigureWoocom,
+    SetupWoocomWebhook,
+    IsMultipleConfiguration,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct ProductionAgreementRequest {
+    pub version: String,
+    #[serde(skip_deserializing)]
+    pub ip_address: Option<Secret<String, common_utils::pii::IpAddress>>,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct SetupProcessor {
+    pub connector_id: String,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct ProcessorConnected {
+    pub processor_id: String,
+    pub processor_name: String,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct ConfiguredRouting {
+    pub routing_id: String,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct TestPayment {
+    pub payment_id: String,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct IntegrationMethod {
+    pub integration_type: String,
+}
+
+#[derive(Debug, serde::Deserialize, EnumString, serde::Serialize)]
+pub enum GetMetaDataRequest {
+    ProductionAgreement,
+    SetupProcessor,
+    ConfigureEndpoint,
+    SetupComplete,
+    FirstProcessorConnected,
+    SecondProcessorConnected,
+    ConfiguredRouting,
+    TestPayment,
+    IntegrationMethod,
+    IntegrationCompleted,
+    StripeConnected,
+    PaypalConnected,
+    SPRoutingConfigured,
+    SPTestPayment,
+    DownloadWoocom,
+    ConfigureWoocom,
+    SetupWoocomWebhook,
+    IsMultipleConfiguration,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+#[serde(transparent)]
+pub struct GetMultipleMetaDataPayload {
+    pub results: Vec<GetMetaDataRequest>,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct GetMultipleMetaDataRequest {
+    pub keys: String,
+}
+
+#[derive(Debug, serde::Serialize)]
+pub enum GetMetaDataResponse {
+    ProductionAgreement(bool),
+    SetupProcessor(Option<SetupProcessor>),
+    ConfigureEndpoint(bool),
+    SetupComplete(bool),
+    FirstProcessorConnected(Option<ProcessorConnected>),
+    SecondProcessorConnected(Option<ProcessorConnected>),
+    ConfiguredRouting(Option<ConfiguredRouting>),
+    TestPayment(Option<TestPayment>),
+    IntegrationMethod(Option<IntegrationMethod>),
+    IntegrationCompleted(bool),
+    StripeConnected(Option<ProcessorConnected>),
+    PaypalConnected(Option<ProcessorConnected>),
+    SPRoutingConfigured(Option<ConfiguredRouting>),
+    SPTestPayment(bool),
+    DownloadWoocom(bool),
+    ConfigureWoocom(bool),
+    SetupWoocomWebhook(bool),
+    IsMultipleConfiguration(bool),
+}
diff --git a/crates/api_models/src/verify_connector.rs b/crates/api_models/src/verify_connector.rs
new file mode 100644
index 000000000000..1db5a19a030a
--- /dev/null
+++ b/crates/api_models/src/verify_connector.rs
@@ -0,0 +1,11 @@
+use common_utils::events::{ApiEventMetric, ApiEventsType};
+
+use crate::{admin, enums};
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+pub struct VerifyConnectorRequest {
+    pub connector_name: enums::Connector,
+    pub connector_account_details: admin::ConnectorAuthType,
+}
+
+common_utils::impl_misc_api_event_type!(VerifyConnectorRequest);
diff --git a/crates/cards/src/validate.rs b/crates/cards/src/validate.rs
index db6957057ecc..d083a420a1e5 100644
--- a/crates/cards/src/validate.rs
+++ b/crates/cards/src/validate.rs
@@ -72,7 +72,7 @@ impl<'de> Deserialize<'de> for CardNumber {
     }
 }
 
-pub struct CardNumberStrategy;
+pub enum CardNumberStrategy {}
 
 impl<T> Strategy<T> for CardNumberStrategy
 where
diff --git a/crates/common_enums/Cargo.toml b/crates/common_enums/Cargo.toml
index 88628825ca64..72d9f6bb0bb1 100644
--- a/crates/common_enums/Cargo.toml
+++ b/crates/common_enums/Cargo.toml
@@ -7,6 +7,9 @@ rust-version.workspace = true
 readme = "README.md"
 license.workspace = true
 
+[features]
+dummy_connector = []
+
 [dependencies]
 diesel = { version = "2.1.0", features = ["postgres"] }
 serde = { version = "1.0.160", features = ["derive"] }
diff --git a/crates/common_enums/src/enums.rs b/crates/common_enums/src/enums.rs
index 063e35933c43..8da4a2da54cc 100644
--- a/crates/common_enums/src/enums.rs
+++ b/crates/common_enums/src/enums.rs
@@ -12,6 +12,7 @@ pub mod diesel_exports {
         DbFutureUsage as FutureUsage, DbIntentStatus as IntentStatus,
         DbMandateStatus as MandateStatus, DbPaymentMethodIssuerCode as PaymentMethodIssuerCode,
         DbPaymentType as PaymentType, DbRefundStatus as RefundStatus,
+        DbRequestIncrementalAuthorization as RequestIncrementalAuthorization,
     };
 }
 
@@ -59,6 +60,105 @@ pub enum AttemptStatus {
     DeviceDataCollectionPending,
 }
 
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    Hash,
+    PartialEq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::Display,
+    strum::EnumString,
+    strum::EnumIter,
+    strum::EnumVariantNames,
+)]
+#[router_derive::diesel_enum(storage_type = "db_enum")]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
+pub enum RoutableConnectors {
+    #[cfg(feature = "dummy_connector")]
+    #[serde(rename = "phonypay")]
+    #[strum(serialize = "phonypay")]
+    DummyConnector1,
+    #[cfg(feature = "dummy_connector")]
+    #[serde(rename = "fauxpay")]
+    #[strum(serialize = "fauxpay")]
+    DummyConnector2,
+    #[cfg(feature = "dummy_connector")]
+    #[serde(rename = "pretendpay")]
+    #[strum(serialize = "pretendpay")]
+    DummyConnector3,
+    #[cfg(feature = "dummy_connector")]
+    #[serde(rename = "stripe_test")]
+    #[strum(serialize = "stripe_test")]
+    DummyConnector4,
+    #[cfg(feature = "dummy_connector")]
+    #[serde(rename = "adyen_test")]
+    #[strum(serialize = "adyen_test")]
+    DummyConnector5,
+    #[cfg(feature = "dummy_connector")]
+    #[serde(rename = "checkout_test")]
+    #[strum(serialize = "checkout_test")]
+    DummyConnector6,
+    #[cfg(feature = "dummy_connector")]
+    #[serde(rename = "paypal_test")]
+    #[strum(serialize = "paypal_test")]
+    DummyConnector7,
+    Aci,
+    Adyen,
+    Airwallex,
+    Authorizedotnet,
+    Bankofamerica,
+    Bitpay,
+    Bambora,
+    Bluesnap,
+    Boku,
+    Braintree,
+    Cashtocode,
+    Checkout,
+    Coinbase,
+    Cryptopay,
+    Cybersource,
+    Dlocal,
+    Fiserv,
+    Forte,
+    Globalpay,
+    Globepay,
+    Gocardless,
+    Helcim,
+    Iatapay,
+    Klarna,
+    Mollie,
+    Multisafepay,
+    Nexinets,
+    Nmi,
+    Noon,
+    Nuvei,
+    // Opayo, added as template code for future usage
+    Opennode,
+    // Payeezy, As psync and rsync are not supported by this connector, it is added as template code for future usage
+    Payme,
+    Paypal,
+    Payu,
+    Powertranz,
+    Prophetpay,
+    Rapyd,
+    Shift4,
+    Square,
+    Stax,
+    Stripe,
+    Trustpay,
+    // Tsys,
+    Tsys,
+    Volt,
+    Wise,
+    Worldline,
+    Worldpay,
+    Zen,
+}
+
 impl AttemptStatus {
     pub fn is_terminal_status(self) -> bool {
         match self {
@@ -1288,6 +1388,29 @@ pub enum CountryAlpha2 {
     US
 }
 
+#[derive(
+    Clone,
+    Debug,
+    Copy,
+    Default,
+    Eq,
+    Hash,
+    PartialEq,
+    serde::Deserialize,
+    serde::Serialize,
+    strum::Display,
+    strum::EnumString,
+)]
+#[router_derive::diesel_enum(storage_type = "db_enum")]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
+pub enum RequestIncrementalAuthorization {
+    True,
+    False,
+    #[default]
+    Default,
+}
+
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
 #[rustfmt::skip]
 pub enum CountryAlpha3 {
diff --git a/crates/common_utils/src/pii.rs b/crates/common_utils/src/pii.rs
index c246d2042269..39793de5c2b5 100644
--- a/crates/common_utils/src/pii.rs
+++ b/crates/common_utils/src/pii.rs
@@ -27,7 +27,7 @@ pub type SecretSerdeValue = Secret<serde_json::Value>;
 
 /// Strategy for masking a PhoneNumber
 #[derive(Debug)]
-pub struct PhoneNumberStrategy;
+pub enum PhoneNumberStrategy {}
 
 /// Phone Number
 #[derive(Debug, serde::Deserialize, serde::Serialize)]
@@ -144,7 +144,7 @@ where
 
 /// Strategy for Encryption
 #[derive(Debug)]
-pub struct EncryptionStratergy;
+pub enum EncryptionStratergy {}
 
 impl<T> Strategy<T> for EncryptionStratergy
 where
@@ -157,7 +157,7 @@ where
 
 /// Client secret
 #[derive(Debug)]
-pub struct ClientSecret;
+pub enum ClientSecret {}
 
 impl<T> Strategy<T> for ClientSecret
 where
@@ -189,7 +189,7 @@ where
 
 /// Strategy for masking Email
 #[derive(Debug)]
-pub struct EmailStrategy;
+pub enum EmailStrategy {}
 
 impl<T> Strategy<T> for EmailStrategy
 where
@@ -305,7 +305,7 @@ impl FromStr for Email {
 
 /// IP address
 #[derive(Debug)]
-pub struct IpAddress;
+pub enum IpAddress {}
 
 impl<T> Strategy<T> for IpAddress
 where
@@ -332,7 +332,7 @@ where
 /// Strategy for masking UPI VPA's
 
 #[derive(Debug)]
-pub struct UpiVpaMaskingStrategy;
+pub enum UpiVpaMaskingStrategy {}
 
 impl<T> Strategy<T> for UpiVpaMaskingStrategy
 where
diff --git a/crates/currency_conversion/Cargo.toml b/crates/currency_conversion/Cargo.toml
new file mode 100644
index 000000000000..7eb3af7d526d
--- /dev/null
+++ b/crates/currency_conversion/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "currency_conversion"
+description = "Currency conversion for cost based routing"
+version = "0.1.0"
+edition.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[dependencies]
+# First party crates
+common_enums = { version = "0.1.0", path = "../common_enums", package = "common_enums" }
+
+# Third party crates
+rust_decimal = "1.29"
+rusty-money = { version = "0.4.0", features = ["iso", "crypto"] }
+serde = { version = "1.0.163", features = ["derive"] }
+thiserror = "1.0.43"
diff --git a/crates/currency_conversion/src/conversion.rs b/crates/currency_conversion/src/conversion.rs
new file mode 100644
index 000000000000..4cdca8fe0ea2
--- /dev/null
+++ b/crates/currency_conversion/src/conversion.rs
@@ -0,0 +1,101 @@
+use common_enums::Currency;
+use rust_decimal::Decimal;
+use rusty_money::Money;
+
+use crate::{
+    error::CurrencyConversionError,
+    types::{currency_match, ExchangeRates},
+};
+
+pub fn convert(
+    ex_rates: &ExchangeRates,
+    from_currency: Currency,
+    to_currency: Currency,
+    amount: i64,
+) -> Result<Decimal, CurrencyConversionError> {
+    let money_minor = Money::from_minor(amount, currency_match(from_currency));
+    let base_currency = ex_rates.base_currency;
+    if to_currency == base_currency {
+        ex_rates.forward_conversion(*money_minor.amount(), from_currency)
+    } else if from_currency == base_currency {
+        ex_rates.backward_conversion(*money_minor.amount(), to_currency)
+    } else {
+        let base_conversion_amt =
+            ex_rates.forward_conversion(*money_minor.amount(), from_currency)?;
+        ex_rates.backward_conversion(base_conversion_amt, to_currency)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #![allow(clippy::expect_used)]
+    use std::collections::HashMap;
+
+    use crate::types::CurrencyFactors;
+    #[test]
+    fn currency_to_currency_conversion() {
+        use super::*;
+        let mut conversion: HashMap<Currency, CurrencyFactors> = HashMap::new();
+        let inr_conversion_rates =
+            CurrencyFactors::new(Decimal::new(823173, 4), Decimal::new(1214, 5));
+        let szl_conversion_rates =
+            CurrencyFactors::new(Decimal::new(194423, 4), Decimal::new(514, 4));
+        let convert_from = Currency::SZL;
+        let convert_to = Currency::INR;
+        let amount = 2000;
+        let base_currency = Currency::USD;
+        conversion.insert(convert_from, inr_conversion_rates);
+        conversion.insert(convert_to, szl_conversion_rates);
+        let sample_rate = ExchangeRates::new(base_currency, conversion);
+        let res =
+            convert(&sample_rate, convert_from, convert_to, amount).expect("converted_currency");
+        println!(
+            "The conversion from {} {} to {} is {:?}",
+            amount, convert_from, convert_to, res
+        );
+    }
+
+    #[test]
+    fn currency_to_base_conversion() {
+        use super::*;
+        let mut conversion: HashMap<Currency, CurrencyFactors> = HashMap::new();
+        let inr_conversion_rates =
+            CurrencyFactors::new(Decimal::new(823173, 4), Decimal::new(1214, 5));
+        let usd_conversion_rates = CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));
+        let convert_from = Currency::INR;
+        let convert_to = Currency::USD;
+        let amount = 2000;
+        let base_currency = Currency::USD;
+        conversion.insert(convert_from, inr_conversion_rates);
+        conversion.insert(convert_to, usd_conversion_rates);
+        let sample_rate = ExchangeRates::new(base_currency, conversion);
+        let res =
+            convert(&sample_rate, convert_from, convert_to, amount).expect("converted_currency");
+        println!(
+            "The conversion from {} {} to {} is {:?}",
+            amount, convert_from, convert_to, res
+        );
+    }
+
+    #[test]
+    fn base_to_currency_conversion() {
+        use super::*;
+        let mut conversion: HashMap<Currency, CurrencyFactors> = HashMap::new();
+        let inr_conversion_rates =
+            CurrencyFactors::new(Decimal::new(823173, 4), Decimal::new(1214, 5));
+        let usd_conversion_rates = CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));
+        let convert_from = Currency::USD;
+        let convert_to = Currency::INR;
+        let amount = 2000;
+        let base_currency = Currency::USD;
+        conversion.insert(convert_from, usd_conversion_rates);
+        conversion.insert(convert_to, inr_conversion_rates);
+        let sample_rate = ExchangeRates::new(base_currency, conversion);
+        let res =
+            convert(&sample_rate, convert_from, convert_to, amount).expect("converted_currency");
+        println!(
+            "The conversion from {} {} to {} is {:?}",
+            amount, convert_from, convert_to, res
+        );
+    }
+}
diff --git a/crates/currency_conversion/src/error.rs b/crates/currency_conversion/src/error.rs
new file mode 100644
index 000000000000..b04c147147c3
--- /dev/null
+++ b/crates/currency_conversion/src/error.rs
@@ -0,0 +1,8 @@
+#[derive(Debug, thiserror::Error, serde::Serialize)]
+#[serde(tag = "type", content = "info", rename_all = "snake_case")]
+pub enum CurrencyConversionError {
+    #[error("Currency Conversion isn't possible")]
+    DecimalMultiplicationFailed,
+    #[error("Currency not supported: '{0}'")]
+    ConversionNotSupported(String),
+}
diff --git a/crates/currency_conversion/src/lib.rs b/crates/currency_conversion/src/lib.rs
new file mode 100644
index 000000000000..48e1ae11e5d3
--- /dev/null
+++ b/crates/currency_conversion/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod conversion;
+pub mod error;
+pub mod types;
diff --git a/crates/currency_conversion/src/types.rs b/crates/currency_conversion/src/types.rs
new file mode 100644
index 000000000000..fec25b9fc601
--- /dev/null
+++ b/crates/currency_conversion/src/types.rs
@@ -0,0 +1,201 @@
+use std::collections::HashMap;
+
+use common_enums::Currency;
+use rust_decimal::Decimal;
+use rusty_money::iso;
+
+use crate::error::CurrencyConversionError;
+
+/// Cached currency store of base currency
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct ExchangeRates {
+    pub base_currency: Currency,
+    pub conversion: HashMap<Currency, CurrencyFactors>,
+}
+
+/// Stores the multiplicative factor for  conversion between currency to base and vice versa
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct CurrencyFactors {
+    /// The factor that will be multiplied to provide Currency output
+    pub to_factor: Decimal,
+    /// The factor that will be multiplied to provide for the base output
+    pub from_factor: Decimal,
+}
+
+impl CurrencyFactors {
+    pub fn new(to_factor: Decimal, from_factor: Decimal) -> Self {
+        Self {
+            to_factor,
+            from_factor,
+        }
+    }
+}
+
+impl ExchangeRates {
+    pub fn new(base_currency: Currency, conversion: HashMap<Currency, CurrencyFactors>) -> Self {
+        Self {
+            base_currency,
+            conversion,
+        }
+    }
+
+    /// The flow here is from_currency -> base_currency -> to_currency
+    /// from to_currency -> base currency
+    pub fn forward_conversion(
+        &self,
+        amt: Decimal,
+        from_currency: Currency,
+    ) -> Result<Decimal, CurrencyConversionError> {
+        let from_factor = self
+            .conversion
+            .get(&from_currency)
+            .ok_or_else(|| {
+                CurrencyConversionError::ConversionNotSupported(from_currency.to_string())
+            })?
+            .from_factor;
+        amt.checked_mul(from_factor)
+            .ok_or(CurrencyConversionError::DecimalMultiplicationFailed)
+    }
+
+    /// from base_currency -> to_currency
+    pub fn backward_conversion(
+        &self,
+        amt: Decimal,
+        to_currency: Currency,
+    ) -> Result<Decimal, CurrencyConversionError> {
+        let to_factor = self
+            .conversion
+            .get(&to_currency)
+            .ok_or_else(|| {
+                CurrencyConversionError::ConversionNotSupported(to_currency.to_string())
+            })?
+            .to_factor;
+        amt.checked_mul(to_factor)
+            .ok_or(CurrencyConversionError::DecimalMultiplicationFailed)
+    }
+}
+
+pub fn currency_match(currency: Currency) -> &'static iso::Currency {
+    match currency {
+        Currency::AED => iso::AED,
+        Currency::ALL => iso::ALL,
+        Currency::AMD => iso::AMD,
+        Currency::ANG => iso::ANG,
+        Currency::ARS => iso::ARS,
+        Currency::AUD => iso::AUD,
+        Currency::AWG => iso::AWG,
+        Currency::AZN => iso::AZN,
+        Currency::BBD => iso::BBD,
+        Currency::BDT => iso::BDT,
+        Currency::BHD => iso::BHD,
+        Currency::BIF => iso::BIF,
+        Currency::BMD => iso::BMD,
+        Currency::BND => iso::BND,
+        Currency::BOB => iso::BOB,
+        Currency::BRL => iso::BRL,
+        Currency::BSD => iso::BSD,
+        Currency::BWP => iso::BWP,
+        Currency::BZD => iso::BZD,
+        Currency::CAD => iso::CAD,
+        Currency::CHF => iso::CHF,
+        Currency::CLP => iso::CLP,
+        Currency::CNY => iso::CNY,
+        Currency::COP => iso::COP,
+        Currency::CRC => iso::CRC,
+        Currency::CUP => iso::CUP,
+        Currency::CZK => iso::CZK,
+        Currency::DJF => iso::DJF,
+        Currency::DKK => iso::DKK,
+        Currency::DOP => iso::DOP,
+        Currency::DZD => iso::DZD,
+        Currency::EGP => iso::EGP,
+        Currency::ETB => iso::ETB,
+        Currency::EUR => iso::EUR,
+        Currency::FJD => iso::FJD,
+        Currency::GBP => iso::GBP,
+        Currency::GHS => iso::GHS,
+        Currency::GIP => iso::GIP,
+        Currency::GMD => iso::GMD,
+        Currency::GNF => iso::GNF,
+        Currency::GTQ => iso::GTQ,
+        Currency::GYD => iso::GYD,
+        Currency::HKD => iso::HKD,
+        Currency::HNL => iso::HNL,
+        Currency::HRK => iso::HRK,
+        Currency::HTG => iso::HTG,
+        Currency::HUF => iso::HUF,
+        Currency::IDR => iso::IDR,
+        Currency::ILS => iso::ILS,
+        Currency::INR => iso::INR,
+        Currency::JMD => iso::JMD,
+        Currency::JOD => iso::JOD,
+        Currency::JPY => iso::JPY,
+        Currency::KES => iso::KES,
+        Currency::KGS => iso::KGS,
+        Currency::KHR => iso::KHR,
+        Currency::KMF => iso::KMF,
+        Currency::KRW => iso::KRW,
+        Currency::KWD => iso::KWD,
+        Currency::KYD => iso::KYD,
+        Currency::KZT => iso::KZT,
+        Currency::LAK => iso::LAK,
+        Currency::LBP => iso::LBP,
+        Currency::LKR => iso::LKR,
+        Currency::LRD => iso::LRD,
+        Currency::LSL => iso::LSL,
+        Currency::MAD => iso::MAD,
+        Currency::MDL => iso::MDL,
+        Currency::MGA => iso::MGA,
+        Currency::MKD => iso::MKD,
+        Currency::MMK => iso::MMK,
+        Currency::MNT => iso::MNT,
+        Currency::MOP => iso::MOP,
+        Currency::MUR => iso::MUR,
+        Currency::MVR => iso::MVR,
+        Currency::MWK => iso::MWK,
+        Currency::MXN => iso::MXN,
+        Currency::MYR => iso::MYR,
+        Currency::NAD => iso::NAD,
+        Currency::NGN => iso::NGN,
+        Currency::NIO => iso::NIO,
+        Currency::NOK => iso::NOK,
+        Currency::NPR => iso::NPR,
+        Currency::NZD => iso::NZD,
+        Currency::OMR => iso::OMR,
+        Currency::PEN => iso::PEN,
+        Currency::PGK => iso::PGK,
+        Currency::PHP => iso::PHP,
+        Currency::PKR => iso::PKR,
+        Currency::PLN => iso::PLN,
+        Currency::PYG => iso::PYG,
+        Currency::QAR => iso::QAR,
+        Currency::RON => iso::RON,
+        Currency::RUB => iso::RUB,
+        Currency::RWF => iso::RWF,
+        Currency::SAR => iso::SAR,
+        Currency::SCR => iso::SCR,
+        Currency::SEK => iso::SEK,
+        Currency::SGD => iso::SGD,
+        Currency::SLL => iso::SLL,
+        Currency::SOS => iso::SOS,
+        Currency::SSP => iso::SSP,
+        Currency::SVC => iso::SVC,
+        Currency::SZL => iso::SZL,
+        Currency::THB => iso::THB,
+        Currency::TTD => iso::TTD,
+        Currency::TRY => iso::TRY,
+        Currency::TWD => iso::TWD,
+        Currency::TZS => iso::TZS,
+        Currency::UGX => iso::UGX,
+        Currency::USD => iso::USD,
+        Currency::UYU => iso::UYU,
+        Currency::UZS => iso::UZS,
+        Currency::VND => iso::VND,
+        Currency::VUV => iso::VUV,
+        Currency::XAF => iso::XAF,
+        Currency::XOF => iso::XOF,
+        Currency::XPF => iso::XPF,
+        Currency::YER => iso::YER,
+        Currency::ZAR => iso::ZAR,
+    }
+}
diff --git a/crates/data_models/Cargo.toml b/crates/data_models/Cargo.toml
index 57ae1ec1ec87..857d53b6999e 100644
--- a/crates/data_models/Cargo.toml
+++ b/crates/data_models/Cargo.toml
@@ -18,7 +18,6 @@ common_enums = { version = "0.1.0", path = "../common_enums" }
 common_utils = { version = "0.1.0", path = "../common_utils" }
 masking = { version = "0.1.0", path = "../masking" }
 
-
 # Third party deps
 async-trait = "0.1.68"
 error-stack = "0.3.1"
diff --git a/crates/data_models/src/payments.rs b/crates/data_models/src/payments.rs
index 4e7a0923f6a9..af2076bfa10d 100644
--- a/crates/data_models/src/payments.rs
+++ b/crates/data_models/src/payments.rs
@@ -50,4 +50,6 @@ pub struct PaymentIntent {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
+    pub request_incremental_authorization: storage_enums::RequestIncrementalAuthorization,
+    pub incremental_authorization_allowed: Option<bool>,
 }
diff --git a/crates/data_models/src/payments/payment_attempt.rs b/crates/data_models/src/payments/payment_attempt.rs
index a937c785902f..44aa48b142ad 100644
--- a/crates/data_models/src/payments/payment_attempt.rs
+++ b/crates/data_models/src/payments/payment_attempt.rs
@@ -36,6 +36,13 @@ pub trait PaymentAttemptInterface {
         storage_scheme: storage_enums::MerchantStorageScheme,
     ) -> error_stack::Result<PaymentAttempt, errors::StorageError>;
 
+    async fn find_payment_attempt_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        storage_scheme: storage_enums::MerchantStorageScheme,
+    ) -> error_stack::Result<PaymentAttempt, errors::StorageError>;
+
     async fn find_payment_attempt_by_merchant_id_connector_txn_id(
         &self,
         merchant_id: &str,
diff --git a/crates/data_models/src/payments/payment_intent.rs b/crates/data_models/src/payments/payment_intent.rs
index 2c5914f5b37f..d8f927a4e2c5 100644
--- a/crates/data_models/src/payments/payment_intent.rs
+++ b/crates/data_models/src/payments/payment_intent.rs
@@ -107,6 +107,8 @@ pub struct PaymentIntentNew {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
+    pub request_incremental_authorization: storage_enums::RequestIncrementalAuthorization,
+    pub incremental_authorization_allowed: Option<bool>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -116,6 +118,7 @@ pub enum PaymentIntentUpdate {
         amount_captured: Option<i64>,
         return_url: Option<String>,
         updated_by: String,
+        incremental_authorization_allowed: Option<bool>,
     },
     MetadataUpdate {
         metadata: pii::SecretSerdeValue,
@@ -137,6 +140,7 @@ pub enum PaymentIntentUpdate {
     },
     PGStatusUpdate {
         status: storage_enums::IntentStatus,
+        incremental_authorization_allowed: Option<bool>,
         updated_by: String,
     },
     Update {
@@ -213,6 +217,7 @@ pub struct PaymentIntentUpdateInternal {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
+    pub incremental_authorization_allowed: Option<bool>,
 }
 
 impl From<PaymentIntentUpdate> for PaymentIntentUpdateInternal {
@@ -283,10 +288,15 @@ impl From<PaymentIntentUpdate> for PaymentIntentUpdateInternal {
                 updated_by,
                 ..Default::default()
             },
-            PaymentIntentUpdate::PGStatusUpdate { status, updated_by } => Self {
+            PaymentIntentUpdate::PGStatusUpdate {
+                status,
+                updated_by,
+                incremental_authorization_allowed,
+            } => Self {
                 status: Some(status),
                 modified_at: Some(common_utils::date_time::now()),
                 updated_by,
+                incremental_authorization_allowed,
                 ..Default::default()
             },
             PaymentIntentUpdate::MerchantStatusUpdate {
@@ -310,6 +320,7 @@ impl From<PaymentIntentUpdate> for PaymentIntentUpdateInternal {
                 // customer_id,
                 return_url,
                 updated_by,
+                incremental_authorization_allowed,
             } => Self {
                 // amount,
                 // currency: Some(currency),
@@ -319,6 +330,7 @@ impl From<PaymentIntentUpdate> for PaymentIntentUpdateInternal {
                 return_url,
                 modified_at: Some(common_utils::date_time::now()),
                 updated_by,
+                incremental_authorization_allowed,
                 ..Default::default()
             },
             PaymentIntentUpdate::PaymentAttemptAndAttemptCountUpdate {
diff --git a/crates/diesel_models/src/business_profile.rs b/crates/diesel_models/src/business_profile.rs
index fa49ecb21d7f..f294999025bf 100644
--- a/crates/diesel_models/src/business_profile.rs
+++ b/crates/diesel_models/src/business_profile.rs
@@ -107,16 +107,30 @@ impl From<BusinessProfileNew> for BusinessProfile {
 
 impl BusinessProfileUpdateInternal {
     pub fn apply_changeset(self, source: BusinessProfile) -> BusinessProfile {
+        let Self {
+            profile_name,
+            modified_at: _,
+            return_url,
+            enable_payment_response_hash,
+            payment_response_hash_key,
+            redirect_to_merchant_with_http_post,
+            webhook_details,
+            metadata,
+            routing_algorithm,
+            intent_fulfillment_time,
+            frm_routing_algorithm,
+            payout_routing_algorithm,
+            is_recon_enabled,
+            applepay_verified_domains,
+        } = self;
         BusinessProfile {
-            profile_name: self.profile_name.unwrap_or(source.profile_name),
-            modified_at: self.modified_at.unwrap_or(source.modified_at),
-            return_url: self.return_url,
-            enable_payment_response_hash: self
-                .enable_payment_response_hash
+            profile_name: profile_name.unwrap_or(source.profile_name),
+            modified_at: common_utils::date_time::now(),
+            return_url,
+            enable_payment_response_hash: enable_payment_response_hash
                 .unwrap_or(source.enable_payment_response_hash),
-            payment_response_hash_key: self.payment_response_hash_key,
-            redirect_to_merchant_with_http_post: self
-                .redirect_to_merchant_with_http_post
+            payment_response_hash_key,
+            redirect_to_merchant_with_http_post: redirect_to_merchant_with_http_post
                 .unwrap_or(source.redirect_to_merchant_with_http_post),
             webhook_details: self.webhook_details,
             metadata: self.metadata,
diff --git a/crates/diesel_models/src/capture.rs b/crates/diesel_models/src/capture.rs
index 30eee900cff1..adc313ca3dde 100644
--- a/crates/diesel_models/src/capture.rs
+++ b/crates/diesel_models/src/capture.rs
@@ -83,13 +83,24 @@ pub struct CaptureUpdateInternal {
 
 impl CaptureUpdate {
     pub fn apply_changeset(self, source: Capture) -> Capture {
-        let capture_update: CaptureUpdateInternal = self.into();
+        let CaptureUpdateInternal {
+            status,
+            error_message,
+            error_code,
+            error_reason,
+            modified_at: _,
+            connector_capture_id,
+            connector_response_reference_id,
+        } = self.into();
         Capture {
-            status: capture_update.status.unwrap_or(source.status),
-            error_message: capture_update.error_message.or(source.error_message),
-            error_code: capture_update.error_code.or(source.error_code),
-            error_reason: capture_update.error_reason.or(source.error_reason),
+            status: status.unwrap_or(source.status),
+            error_message: error_message.or(source.error_message),
+            error_code: error_code.or(source.error_code),
+            error_reason: error_reason.or(source.error_reason),
             modified_at: common_utils::date_time::now(),
+            connector_capture_id: connector_capture_id.or(source.connector_capture_id),
+            connector_response_reference_id: connector_response_reference_id
+                .or(source.connector_response_reference_id),
             ..source
         }
     }
diff --git a/crates/diesel_models/src/enums.rs b/crates/diesel_models/src/enums.rs
index dc4a7614f587..3f8b37cd03f7 100644
--- a/crates/diesel_models/src/enums.rs
+++ b/crates/diesel_models/src/enums.rs
@@ -15,6 +15,7 @@ pub mod diesel_exports {
         DbPaymentType as PaymentType, DbPayoutStatus as PayoutStatus, DbPayoutType as PayoutType,
         DbProcessTrackerStatus as ProcessTrackerStatus, DbReconStatus as ReconStatus,
         DbRefundStatus as RefundStatus, DbRefundType as RefundType,
+        DbRequestIncrementalAuthorization as RequestIncrementalAuthorization,
         DbRoutingAlgorithmKind as RoutingAlgorithmKind,
     };
 }
@@ -425,3 +426,39 @@ pub enum UserStatus {
     #[default]
     InvitationSent,
 }
+
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    PartialEq,
+    serde::Deserialize,
+    serde::Serialize,
+    strum::Display,
+    strum::EnumString,
+    frunk::LabelledGeneric,
+)]
+#[router_derive::diesel_enum(storage_type = "text")]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
+pub enum DashboardMetadata {
+    ProductionAgreement,
+    SetupProcessor,
+    ConfigureEndpoint,
+    SetupComplete,
+    FirstProcessorConnected,
+    SecondProcessorConnected,
+    ConfiguredRouting,
+    TestPayment,
+    IntegrationMethod,
+    IntegrationCompleted,
+    StripeConnected,
+    PaypalConnected,
+    SpRoutingConfigured,
+    SpTestPayment,
+    DownloadWoocom,
+    ConfigureWoocom,
+    SetupWoocomWebhook,
+    IsMultipleConfiguration,
+}
diff --git a/crates/diesel_models/src/payment_attempt.rs b/crates/diesel_models/src/payment_attempt.rs
index 9cc6632c638e..216801fa8fb1 100644
--- a/crates/diesel_models/src/payment_attempt.rs
+++ b/crates/diesel_models/src/payment_attempt.rs
@@ -314,60 +314,83 @@ pub struct PaymentAttemptUpdateInternal {
 
 impl PaymentAttemptUpdate {
     pub fn apply_changeset(self, source: PaymentAttempt) -> PaymentAttempt {
-        let pa_update: PaymentAttemptUpdateInternal = self.into();
+        let PaymentAttemptUpdateInternal {
+            amount,
+            currency,
+            status,
+            connector_transaction_id,
+            amount_to_capture,
+            connector,
+            authentication_type,
+            payment_method,
+            error_message,
+            payment_method_id,
+            cancellation_reason,
+            modified_at: _,
+            mandate_id,
+            browser_info,
+            payment_token,
+            error_code,
+            connector_metadata,
+            payment_method_data,
+            payment_method_type,
+            payment_experience,
+            business_sub_label,
+            straight_through_algorithm,
+            preprocessing_step_id,
+            error_reason,
+            capture_method,
+            connector_response_reference_id,
+            multiple_capture_count,
+            surcharge_amount,
+            tax_amount,
+            amount_capturable,
+            updated_by,
+            merchant_connector_id,
+            authentication_data,
+            encoded_data,
+            unified_code,
+            unified_message,
+        } = self.into();
         PaymentAttempt {
-            amount: pa_update.amount.unwrap_or(source.amount),
-            currency: pa_update.currency.or(source.currency),
-            status: pa_update.status.unwrap_or(source.status),
-            connector_transaction_id: pa_update
-                .connector_transaction_id
-                .or(source.connector_transaction_id),
-            amount_to_capture: pa_update.amount_to_capture.or(source.amount_to_capture),
-            connector: pa_update.connector.or(source.connector),
-            authentication_type: pa_update.authentication_type.or(source.authentication_type),
-            payment_method: pa_update.payment_method.or(source.payment_method),
-            error_message: pa_update.error_message.unwrap_or(source.error_message),
-            payment_method_id: pa_update
-                .payment_method_id
-                .unwrap_or(source.payment_method_id),
-            cancellation_reason: pa_update.cancellation_reason.or(source.cancellation_reason),
+            amount: amount.unwrap_or(source.amount),
+            currency: currency.or(source.currency),
+            status: status.unwrap_or(source.status),
+            connector_transaction_id: connector_transaction_id.or(source.connector_transaction_id),
+            amount_to_capture: amount_to_capture.or(source.amount_to_capture),
+            connector: connector.or(source.connector),
+            authentication_type: authentication_type.or(source.authentication_type),
+            payment_method: payment_method.or(source.payment_method),
+            error_message: error_message.unwrap_or(source.error_message),
+            payment_method_id: payment_method_id.unwrap_or(source.payment_method_id),
+            cancellation_reason: cancellation_reason.or(source.cancellation_reason),
             modified_at: common_utils::date_time::now(),
-            mandate_id: pa_update.mandate_id.or(source.mandate_id),
-            browser_info: pa_update.browser_info.or(source.browser_info),
-            payment_token: pa_update.payment_token.or(source.payment_token),
-            error_code: pa_update.error_code.unwrap_or(source.error_code),
-            connector_metadata: pa_update.connector_metadata.or(source.connector_metadata),
-            payment_method_data: pa_update.payment_method_data.or(source.payment_method_data),
-            payment_method_type: pa_update.payment_method_type.or(source.payment_method_type),
-            payment_experience: pa_update.payment_experience.or(source.payment_experience),
-            business_sub_label: pa_update.business_sub_label.or(source.business_sub_label),
-            straight_through_algorithm: pa_update
-                .straight_through_algorithm
+            mandate_id: mandate_id.or(source.mandate_id),
+            browser_info: browser_info.or(source.browser_info),
+            payment_token: payment_token.or(source.payment_token),
+            error_code: error_code.unwrap_or(source.error_code),
+            connector_metadata: connector_metadata.or(source.connector_metadata),
+            payment_method_data: payment_method_data.or(source.payment_method_data),
+            payment_method_type: payment_method_type.or(source.payment_method_type),
+            payment_experience: payment_experience.or(source.payment_experience),
+            business_sub_label: business_sub_label.or(source.business_sub_label),
+            straight_through_algorithm: straight_through_algorithm
                 .or(source.straight_through_algorithm),
-            preprocessing_step_id: pa_update
-                .preprocessing_step_id
-                .or(source.preprocessing_step_id),
-            error_reason: pa_update.error_reason.unwrap_or(source.error_reason),
-            capture_method: pa_update.capture_method.or(source.capture_method),
-            connector_response_reference_id: pa_update
-                .connector_response_reference_id
+            preprocessing_step_id: preprocessing_step_id.or(source.preprocessing_step_id),
+            error_reason: error_reason.unwrap_or(source.error_reason),
+            capture_method: capture_method.or(source.capture_method),
+            connector_response_reference_id: connector_response_reference_id
                 .or(source.connector_response_reference_id),
-            multiple_capture_count: pa_update
-                .multiple_capture_count
-                .or(source.multiple_capture_count),
-            surcharge_amount: pa_update.surcharge_amount.or(source.surcharge_amount),
-            tax_amount: pa_update.tax_amount.or(source.tax_amount),
-            amount_capturable: pa_update
-                .amount_capturable
-                .unwrap_or(source.amount_capturable),
-            updated_by: pa_update.updated_by,
-            merchant_connector_id: pa_update
-                .merchant_connector_id
-                .or(source.merchant_connector_id),
-            authentication_data: pa_update.authentication_data.or(source.authentication_data),
-            encoded_data: pa_update.encoded_data.or(source.encoded_data),
-            unified_code: pa_update.unified_code.unwrap_or(source.unified_code),
-            unified_message: pa_update.unified_message.unwrap_or(source.unified_message),
+            multiple_capture_count: multiple_capture_count.or(source.multiple_capture_count),
+            surcharge_amount: surcharge_amount.or(source.surcharge_amount),
+            tax_amount: tax_amount.or(source.tax_amount),
+            amount_capturable: amount_capturable.unwrap_or(source.amount_capturable),
+            updated_by,
+            merchant_connector_id: merchant_connector_id.or(source.merchant_connector_id),
+            authentication_data: authentication_data.or(source.authentication_data),
+            encoded_data: encoded_data.or(source.encoded_data),
+            unified_code: unified_code.unwrap_or(source.unified_code),
+            unified_message: unified_message.unwrap_or(source.unified_message),
             ..source
         }
     }
diff --git a/crates/diesel_models/src/payment_intent.rs b/crates/diesel_models/src/payment_intent.rs
index 2ffa857026ba..8d752466103e 100644
--- a/crates/diesel_models/src/payment_intent.rs
+++ b/crates/diesel_models/src/payment_intent.rs
@@ -1,3 +1,4 @@
+use common_enums::RequestIncrementalAuthorization;
 use common_utils::pii;
 use diesel::{AsChangeset, Identifiable, Insertable, Queryable};
 use serde::{Deserialize, Serialize};
@@ -51,6 +52,8 @@ pub struct PaymentIntent {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
+    pub request_incremental_authorization: RequestIncrementalAuthorization,
+    pub incremental_authorization_allowed: Option<bool>,
 }
 
 #[derive(
@@ -106,6 +109,8 @@ pub struct PaymentIntentNew {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
+    pub request_incremental_authorization: RequestIncrementalAuthorization,
+    pub incremental_authorization_allowed: Option<bool>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -115,6 +120,7 @@ pub enum PaymentIntentUpdate {
         amount_captured: Option<i64>,
         return_url: Option<String>,
         updated_by: String,
+        incremental_authorization_allowed: Option<bool>,
     },
     MetadataUpdate {
         metadata: pii::SecretSerdeValue,
@@ -137,6 +143,7 @@ pub enum PaymentIntentUpdate {
     PGStatusUpdate {
         status: storage_enums::IntentStatus,
         updated_by: String,
+        incremental_authorization_allowed: Option<bool>,
     },
     Update {
         amount: i64,
@@ -213,54 +220,69 @@ pub struct PaymentIntentUpdateInternal {
 
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
+    pub incremental_authorization_allowed: Option<bool>,
 }
 
 impl PaymentIntentUpdate {
     pub fn apply_changeset(self, source: PaymentIntent) -> PaymentIntent {
-        let internal_update: PaymentIntentUpdateInternal = self.into();
+        let PaymentIntentUpdateInternal {
+            amount,
+            currency,
+            status,
+            amount_captured,
+            customer_id,
+            return_url,
+            setup_future_usage,
+            off_session,
+            metadata,
+            billing_address_id,
+            shipping_address_id,
+            modified_at: _,
+            active_attempt_id,
+            business_country,
+            business_label,
+            description,
+            statement_descriptor_name,
+            statement_descriptor_suffix,
+            order_details,
+            attempt_count,
+            profile_id,
+            merchant_decision,
+            payment_confirm_source,
+            updated_by,
+            surcharge_applicable,
+            incremental_authorization_allowed,
+        } = self.into();
         PaymentIntent {
-            amount: internal_update.amount.unwrap_or(source.amount),
-            currency: internal_update.currency.or(source.currency),
-            status: internal_update.status.unwrap_or(source.status),
-            amount_captured: internal_update.amount_captured.or(source.amount_captured),
-            customer_id: internal_update.customer_id.or(source.customer_id),
-            return_url: internal_update.return_url.or(source.return_url),
-            setup_future_usage: internal_update
-                .setup_future_usage
-                .or(source.setup_future_usage),
-            off_session: internal_update.off_session.or(source.off_session),
-            metadata: internal_update.metadata.or(source.metadata),
-            billing_address_id: internal_update
-                .billing_address_id
-                .or(source.billing_address_id),
-            shipping_address_id: internal_update
-                .shipping_address_id
-                .or(source.shipping_address_id),
+            amount: amount.unwrap_or(source.amount),
+            currency: currency.or(source.currency),
+            status: status.unwrap_or(source.status),
+            amount_captured: amount_captured.or(source.amount_captured),
+            customer_id: customer_id.or(source.customer_id),
+            return_url: return_url.or(source.return_url),
+            setup_future_usage: setup_future_usage.or(source.setup_future_usage),
+            off_session: off_session.or(source.off_session),
+            metadata: metadata.or(source.metadata),
+            billing_address_id: billing_address_id.or(source.billing_address_id),
+            shipping_address_id: shipping_address_id.or(source.shipping_address_id),
             modified_at: common_utils::date_time::now(),
-            active_attempt_id: internal_update
-                .active_attempt_id
-                .unwrap_or(source.active_attempt_id),
-            business_country: internal_update.business_country.or(source.business_country),
-            business_label: internal_update.business_label.or(source.business_label),
-            description: internal_update.description.or(source.description),
-            statement_descriptor_name: internal_update
-                .statement_descriptor_name
+            active_attempt_id: active_attempt_id.unwrap_or(source.active_attempt_id),
+            business_country: business_country.or(source.business_country),
+            business_label: business_label.or(source.business_label),
+            description: description.or(source.description),
+            statement_descriptor_name: statement_descriptor_name
                 .or(source.statement_descriptor_name),
-            statement_descriptor_suffix: internal_update
-                .statement_descriptor_suffix
+            statement_descriptor_suffix: statement_descriptor_suffix
                 .or(source.statement_descriptor_suffix),
-            order_details: internal_update.order_details.or(source.order_details),
-            attempt_count: internal_update
-                .attempt_count
-                .unwrap_or(source.attempt_count),
-            profile_id: internal_update.profile_id.or(source.profile_id),
-            merchant_decision: internal_update
-                .merchant_decision
-                .or(source.merchant_decision),
-            payment_confirm_source: internal_update
-                .payment_confirm_source
-                .or(source.payment_confirm_source),
-            updated_by: internal_update.updated_by,
+            order_details: order_details.or(source.order_details),
+            attempt_count: attempt_count.unwrap_or(source.attempt_count),
+            profile_id: profile_id.or(source.profile_id),
+            merchant_decision: merchant_decision.or(source.merchant_decision),
+            payment_confirm_source: payment_confirm_source.or(source.payment_confirm_source),
+            updated_by,
+            surcharge_applicable: surcharge_applicable.or(source.surcharge_applicable),
+
+            incremental_authorization_allowed,
             ..source
         }
     }
@@ -334,10 +356,15 @@ impl From<PaymentIntentUpdate> for PaymentIntentUpdateInternal {
                 updated_by,
                 ..Default::default()
             },
-            PaymentIntentUpdate::PGStatusUpdate { status, updated_by } => Self {
+            PaymentIntentUpdate::PGStatusUpdate {
+                status,
+                updated_by,
+                incremental_authorization_allowed,
+            } => Self {
                 status: Some(status),
                 modified_at: Some(common_utils::date_time::now()),
                 updated_by,
+                incremental_authorization_allowed,
                 ..Default::default()
             },
             PaymentIntentUpdate::MerchantStatusUpdate {
@@ -361,6 +388,7 @@ impl From<PaymentIntentUpdate> for PaymentIntentUpdateInternal {
                 // customer_id,
                 return_url,
                 updated_by,
+                incremental_authorization_allowed,
             } => Self {
                 // amount,
                 // currency: Some(currency),
@@ -370,6 +398,7 @@ impl From<PaymentIntentUpdate> for PaymentIntentUpdateInternal {
                 return_url,
                 modified_at: Some(common_utils::date_time::now()),
                 updated_by,
+                incremental_authorization_allowed,
                 ..Default::default()
             },
             PaymentIntentUpdate::PaymentAttemptAndAttemptCountUpdate {
diff --git a/crates/diesel_models/src/query.rs b/crates/diesel_models/src/query.rs
index cf5a993c2686..b0537d0a287b 100644
--- a/crates/diesel_models/src/query.rs
+++ b/crates/diesel_models/src/query.rs
@@ -6,6 +6,7 @@ pub mod cards_info;
 pub mod configs;
 
 pub mod customers;
+pub mod dashboard_metadata;
 pub mod dispute;
 pub mod events;
 pub mod file;
diff --git a/crates/diesel_models/src/query/dashboard_metadata.rs b/crates/diesel_models/src/query/dashboard_metadata.rs
new file mode 100644
index 000000000000..03e4a2dab38b
--- /dev/null
+++ b/crates/diesel_models/src/query/dashboard_metadata.rs
@@ -0,0 +1,64 @@
+use diesel::{associations::HasTable, BoolExpressionMethods, ExpressionMethods};
+use router_env::tracing::{self, instrument};
+
+use crate::{
+    enums,
+    query::generics,
+    schema::dashboard_metadata::dsl,
+    user::dashboard_metadata::{DashboardMetadata, DashboardMetadataNew},
+    PgPooledConn, StorageResult,
+};
+
+impl DashboardMetadataNew {
+    #[instrument(skip(conn))]
+    pub async fn insert(self, conn: &PgPooledConn) -> StorageResult<DashboardMetadata> {
+        generics::generic_insert(conn, self).await
+    }
+}
+
+impl DashboardMetadata {
+    pub async fn find_user_scoped_dashboard_metadata(
+        conn: &PgPooledConn,
+        user_id: String,
+        merchant_id: String,
+        org_id: String,
+        data_types: Vec<enums::DashboardMetadata>,
+    ) -> StorageResult<Vec<Self>> {
+        let predicate = dsl::user_id
+            .eq(user_id)
+            .and(dsl::merchant_id.eq(merchant_id))
+            .and(dsl::org_id.eq(org_id))
+            .and(dsl::data_key.eq_any(data_types));
+
+        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(
+            conn,
+            predicate,
+            None,
+            None,
+            Some(dsl::last_modified_at.asc()),
+        )
+        .await
+    }
+
+    pub async fn find_merchant_scoped_dashboard_metadata(
+        conn: &PgPooledConn,
+        merchant_id: String,
+        org_id: String,
+        data_types: Vec<enums::DashboardMetadata>,
+    ) -> StorageResult<Vec<Self>> {
+        let predicate = dsl::user_id
+            .is_null()
+            .and(dsl::merchant_id.eq(merchant_id))
+            .and(dsl::org_id.eq(org_id))
+            .and(dsl::data_key.eq_any(data_types));
+
+        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(
+            conn,
+            predicate,
+            None,
+            None,
+            Some(dsl::last_modified_at.asc()),
+        )
+        .await
+    }
+}
diff --git a/crates/diesel_models/src/query/payment_attempt.rs b/crates/diesel_models/src/query/payment_attempt.rs
index 4737233e3048..9e9195f5e0bb 100644
--- a/crates/diesel_models/src/query/payment_attempt.rs
+++ b/crates/diesel_models/src/query/payment_attempt.rs
@@ -120,6 +120,42 @@ impl PaymentAttempt {
         )
     }
 
+    pub async fn find_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+        conn: &PgPooledConn,
+        payment_id: &str,
+        merchant_id: &str,
+    ) -> StorageResult<Self> {
+        // perform ordering on the application level instead of database level
+        generics::generic_filter::<
+            <Self as HasTable>::Table,
+            _,
+            <<Self as HasTable>::Table as Table>::PrimaryKey,
+            Self,
+        >(
+            conn,
+            dsl::payment_id
+                .eq(payment_id.to_owned())
+                .and(dsl::merchant_id.eq(merchant_id.to_owned()))
+                .and(
+                    dsl::status
+                        .eq(enums::AttemptStatus::Charged)
+                        .or(dsl::status.eq(enums::AttemptStatus::PartialCharged)),
+                ),
+            None,
+            None,
+            None,
+        )
+        .await?
+        .into_iter()
+        .fold(
+            Err(DatabaseError::NotFound).into_report(),
+            |acc, cur| match acc {
+                Ok(value) if value.modified_at > cur.modified_at => Ok(value),
+                _ => Ok(cur),
+            },
+        )
+    }
+
     #[instrument(skip(conn))]
     pub async fn find_by_merchant_id_connector_txn_id(
         conn: &PgPooledConn,
diff --git a/crates/diesel_models/src/refund.rs b/crates/diesel_models/src/refund.rs
index 62aec3fb27d8..bb805fb646c5 100644
--- a/crates/diesel_models/src/refund.rs
+++ b/crates/diesel_models/src/refund.rs
@@ -202,19 +202,27 @@ impl From<RefundUpdate> for RefundUpdateInternal {
 
 impl RefundUpdate {
     pub fn apply_changeset(self, source: Refund) -> Refund {
-        let pa_update: RefundUpdateInternal = self.into();
+        let RefundUpdateInternal {
+            connector_refund_id,
+            refund_status,
+            sent_to_gateway,
+            refund_error_message,
+            refund_arn,
+            metadata,
+            refund_reason,
+            refund_error_code,
+            updated_by,
+        } = self.into();
         Refund {
-            connector_refund_id: pa_update.connector_refund_id.or(source.connector_refund_id),
-            refund_status: pa_update.refund_status.unwrap_or(source.refund_status),
-            sent_to_gateway: pa_update.sent_to_gateway.unwrap_or(source.sent_to_gateway),
-            refund_error_message: pa_update
-                .refund_error_message
-                .or(source.refund_error_message),
-            refund_error_code: pa_update.refund_error_code.or(source.refund_error_code),
-            refund_arn: pa_update.refund_arn.or(source.refund_arn),
-            metadata: pa_update.metadata.or(source.metadata),
-            refund_reason: pa_update.refund_reason.or(source.refund_reason),
-            updated_by: pa_update.updated_by,
+            connector_refund_id: connector_refund_id.or(source.connector_refund_id),
+            refund_status: refund_status.unwrap_or(source.refund_status),
+            sent_to_gateway: sent_to_gateway.unwrap_or(source.sent_to_gateway),
+            refund_error_message: refund_error_message.or(source.refund_error_message),
+            refund_error_code: refund_error_code.or(source.refund_error_code),
+            refund_arn: refund_arn.or(source.refund_arn),
+            metadata: metadata.or(source.metadata),
+            refund_reason: refund_reason.or(source.refund_reason),
+            updated_by,
             ..source
         }
     }
diff --git a/crates/diesel_models/src/schema.rs b/crates/diesel_models/src/schema.rs
index aa897922f932..4fcadcba216c 100644
--- a/crates/diesel_models/src/schema.rs
+++ b/crates/diesel_models/src/schema.rs
@@ -184,6 +184,30 @@ diesel::table! {
     }
 }
 
+diesel::table! {
+    use diesel::sql_types::*;
+    use crate::enums::diesel_exports::*;
+
+    dashboard_metadata (id) {
+        id -> Int4,
+        #[max_length = 64]
+        user_id -> Nullable<Varchar>,
+        #[max_length = 64]
+        merchant_id -> Varchar,
+        #[max_length = 64]
+        org_id -> Varchar,
+        #[max_length = 64]
+        data_key -> Varchar,
+        data_value -> Json,
+        #[max_length = 64]
+        created_by -> Varchar,
+        created_at -> Timestamp,
+        #[max_length = 64]
+        last_modified_by -> Varchar,
+        last_modified_at -> Timestamp,
+    }
+}
+
 diesel::table! {
     use diesel::sql_types::*;
     use crate::enums::diesel_exports::*;
@@ -654,6 +678,8 @@ diesel::table! {
         #[max_length = 32]
         updated_by -> Varchar,
         surcharge_applicable -> Nullable<Bool>,
+        request_incremental_authorization -> RequestIncrementalAuthorization,
+        incremental_authorization_allowed -> Nullable<Bool>,
     }
 }
 
@@ -965,6 +991,7 @@ diesel::allow_tables_to_appear_in_same_query!(
     cards_info,
     configs,
     customers,
+    dashboard_metadata,
     dispute,
     events,
     file_metadata,
diff --git a/crates/diesel_models/src/user.rs b/crates/diesel_models/src/user.rs
index 6a2e864b291c..4eec710ea185 100644
--- a/crates/diesel_models/src/user.rs
+++ b/crates/diesel_models/src/user.rs
@@ -5,6 +5,8 @@ use time::PrimitiveDateTime;
 
 use crate::schema::users;
 
+pub mod dashboard_metadata;
+
 #[derive(Clone, Debug, Identifiable, Queryable)]
 #[diesel(table_name = users)]
 pub struct User {
diff --git a/crates/diesel_models/src/user/dashboard_metadata.rs b/crates/diesel_models/src/user/dashboard_metadata.rs
new file mode 100644
index 000000000000..018808f1c0db
--- /dev/null
+++ b/crates/diesel_models/src/user/dashboard_metadata.rs
@@ -0,0 +1,35 @@
+use diesel::{query_builder::AsChangeset, Identifiable, Insertable, Queryable};
+use time::PrimitiveDateTime;
+
+use crate::{enums, schema::dashboard_metadata};
+
+#[derive(Clone, Debug, Identifiable, Queryable)]
+#[diesel(table_name = dashboard_metadata)]
+pub struct DashboardMetadata {
+    pub id: i32,
+    pub user_id: Option<String>,
+    pub merchant_id: String,
+    pub org_id: String,
+    pub data_key: enums::DashboardMetadata,
+    pub data_value: serde_json::Value,
+    pub created_by: String,
+    pub created_at: PrimitiveDateTime,
+    pub last_modified_by: String,
+    pub last_modified_at: PrimitiveDateTime,
+}
+
+#[derive(
+    router_derive::Setter, Clone, Debug, Insertable, router_derive::DebugAsDisplay, AsChangeset,
+)]
+#[diesel(table_name = dashboard_metadata)]
+pub struct DashboardMetadataNew {
+    pub user_id: Option<String>,
+    pub merchant_id: String,
+    pub org_id: String,
+    pub data_key: enums::DashboardMetadata,
+    pub data_value: serde_json::Value,
+    pub created_by: String,
+    pub created_at: PrimitiveDateTime,
+    pub last_modified_by: String,
+    pub last_modified_at: PrimitiveDateTime,
+}
diff --git a/crates/euclid/src/enums.rs b/crates/euclid/src/enums.rs
index dc6d9f66a58f..68e081c7aa92 100644
--- a/crates/euclid/src/enums.rs
+++ b/crates/euclid/src/enums.rs
@@ -1,8 +1,7 @@
 pub use common_enums::{
     AuthenticationType, CaptureMethod, CardNetwork, Country, Currency,
-    FutureUsage as SetupFutureUsage, PaymentMethod, PaymentMethodType,
+    FutureUsage as SetupFutureUsage, PaymentMethod, PaymentMethodType, RoutableConnectors,
 };
-use serde::{Deserialize, Serialize};
 use strum::VariantNames;
 
 pub trait CollectVariants {
@@ -24,6 +23,7 @@ macro_rules! collect_variants {
 pub(crate) use collect_variants;
 
 collect_variants!(PaymentMethod);
+collect_variants!(RoutableConnectors);
 collect_variants!(PaymentType);
 collect_variants!(MandateType);
 collect_variants!(MandateAcceptanceType);
@@ -33,105 +33,8 @@ collect_variants!(AuthenticationType);
 collect_variants!(CaptureMethod);
 collect_variants!(Currency);
 collect_variants!(Country);
-collect_variants!(Connector);
 collect_variants!(SetupFutureUsage);
 
-#[derive(
-    Debug,
-    Copy,
-    Clone,
-    PartialEq,
-    Eq,
-    Hash,
-    Serialize,
-    Deserialize,
-    strum::Display,
-    strum::EnumVariantNames,
-    strum::EnumIter,
-    strum::EnumString,
-    frunk::LabelledGeneric,
-)]
-#[serde(rename_all = "snake_case")]
-#[strum(serialize_all = "snake_case")]
-pub enum Connector {
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "phonypay")]
-    #[strum(serialize = "phonypay")]
-    DummyConnector1,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "fauxpay")]
-    #[strum(serialize = "fauxpay")]
-    DummyConnector2,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "pretendpay")]
-    #[strum(serialize = "pretendpay")]
-    DummyConnector3,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "stripe_test")]
-    #[strum(serialize = "stripe_test")]
-    DummyConnector4,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "adyen_test")]
-    #[strum(serialize = "adyen_test")]
-    DummyConnector5,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "checkout_test")]
-    #[strum(serialize = "checkout_test")]
-    DummyConnector6,
-    #[cfg(feature = "dummy_connector")]
-    #[serde(rename = "paypal_test")]
-    #[strum(serialize = "paypal_test")]
-    DummyConnector7,
-    Aci,
-    Adyen,
-    Airwallex,
-    Authorizedotnet,
-    Bambora,
-    Bankofamerica,
-    Bitpay,
-    Bluesnap,
-    Boku,
-    Braintree,
-    Cashtocode,
-    Checkout,
-    Coinbase,
-    Cryptopay,
-    Cybersource,
-    Dlocal,
-    Fiserv,
-    Forte,
-    Globalpay,
-    Globepay,
-    Gocardless,
-    Helcim,
-    Iatapay,
-    Klarna,
-    Mollie,
-    Multisafepay,
-    Nexinets,
-    Nmi,
-    Noon,
-    Nuvei,
-    Opennode,
-    Payme,
-    Paypal,
-    Payu,
-    Powertranz,
-    Prophetpay,
-    Rapyd,
-    Shift4,
-    Square,
-    Stax,
-    Stripe,
-    Trustpay,
-    Tsys,
-    Volt,
-    Wise,
-    Worldline,
-    Worldpay,
-    Zen,
-}
-
 #[derive(
     Clone,
     Debug,
diff --git a/crates/euclid/src/frontend/ast.rs b/crates/euclid/src/frontend/ast.rs
index 3adb06ab1873..0dad9b53c323 100644
--- a/crates/euclid/src/frontend/ast.rs
+++ b/crates/euclid/src/frontend/ast.rs
@@ -2,16 +2,14 @@ pub mod lowering;
 #[cfg(feature = "ast_parser")]
 pub mod parser;
 
+use common_enums::RoutableConnectors;
 use serde::{Deserialize, Serialize};
 
-use crate::{
-    enums::Connector,
-    types::{DataType, Metadata},
-};
+use crate::types::{DataType, Metadata};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct ConnectorChoice {
-    pub connector: Connector,
+    pub connector: RoutableConnectors,
     #[cfg(not(feature = "connector_choice_mca_id"))]
     pub sub_label: Option<String>,
 }
diff --git a/crates/euclid/src/frontend/dir.rs b/crates/euclid/src/frontend/dir.rs
index 7f2fc252d232..f8cef1f92955 100644
--- a/crates/euclid/src/frontend/dir.rs
+++ b/crates/euclid/src/frontend/dir.rs
@@ -13,7 +13,7 @@ macro_rules! dirval {
     (Connector = $name:ident) => {
         $crate::frontend::dir::DirValue::Connector(Box::new(
             $crate::frontend::ast::ConnectorChoice {
-                connector: $crate::frontend::dir::enums::Connector::$name,
+                connector: $crate::enums::RoutableConnectors::$name,
             },
         ))
     };
@@ -51,7 +51,7 @@ macro_rules! dirval {
     (Connector = $name:ident) => {
         $crate::frontend::dir::DirValue::Connector(Box::new(
             $crate::frontend::ast::ConnectorChoice {
-                connector: $crate::frontend::dir::enums::Connector::$name,
+                connector: $crate::enums::RoutableConnectors::$name,
                 sub_label: None,
             },
         ))
@@ -60,7 +60,7 @@ macro_rules! dirval {
     (Connector = ($name:ident, $sub_label:literal)) => {
         $crate::frontend::dir::DirValue::Connector(Box::new(
             $crate::frontend::ast::ConnectorChoice {
-                connector: $crate::frontend::dir::enums::Connector::$name,
+                connector: $crate::enums::RoutableConnectors::$name,
                 sub_label: Some($sub_label.to_string()),
             },
         ))
@@ -464,7 +464,7 @@ impl DirKeyKind {
                     .collect(),
             ),
             Self::Connector => Some(
-                enums::Connector::iter()
+                common_enums::RoutableConnectors::iter()
                     .map(|connector| {
                         DirValue::Connector(Box::new(ast::ConnectorChoice {
                             connector,
diff --git a/crates/euclid/src/frontend/dir/enums.rs b/crates/euclid/src/frontend/dir/enums.rs
index f049ad35328e..0b71f916d033 100644
--- a/crates/euclid/src/frontend/dir/enums.rs
+++ b/crates/euclid/src/frontend/dir/enums.rs
@@ -2,9 +2,9 @@ use strum::VariantNames;
 
 use crate::enums::collect_variants;
 pub use crate::enums::{
-    AuthenticationType, CaptureMethod, CardNetwork, Connector, Country, Country as BusinessCountry,
+    AuthenticationType, CaptureMethod, CardNetwork, Country, Country as BusinessCountry,
     Country as BillingCountry, Currency as PaymentCurrency, MandateAcceptanceType, MandateType,
-    PaymentMethod, PaymentType, SetupFutureUsage,
+    PaymentMethod, PaymentType, RoutableConnectors, SetupFutureUsage,
 };
 
 #[derive(
diff --git a/crates/euclid_wasm/Cargo.toml b/crates/euclid_wasm/Cargo.toml
index 4fc8cd970f40..8c96a7f67da2 100644
--- a/crates/euclid_wasm/Cargo.toml
+++ b/crates/euclid_wasm/Cargo.toml
@@ -17,8 +17,10 @@ dummy_connector = ["kgraph_utils/dummy_connector"]
 
 [dependencies]
 api_models = { version = "0.1.0", path = "../api_models", package = "api_models" }
+currency_conversion = { version = "0.1.0", path = "../currency_conversion" }
 euclid = { path = "../euclid", features = [] }
 kgraph_utils = { version = "0.1.0", path = "../kgraph_utils" }
+common_enums = { version = "0.1.0", path = "../common_enums" }
 
 # Third party crates
 getrandom = { version = "0.2.10", features = ["js"] }
diff --git a/crates/euclid_wasm/src/lib.rs b/crates/euclid_wasm/src/lib.rs
index e85a002544ff..cab82f8ce411 100644
--- a/crates/euclid_wasm/src/lib.rs
+++ b/crates/euclid_wasm/src/lib.rs
@@ -7,6 +7,10 @@ use std::{
 };
 
 use api_models::{admin as admin_api, routing::ConnectorSelection};
+use common_enums::RoutableConnectors;
+use currency_conversion::{
+    conversion::convert as convert_currency, types as currency_conversion_types,
+};
 use euclid::{
     backend::{inputs, interpreter::InterpreterBackend, EuclidBackend},
     dssa::{
@@ -14,7 +18,6 @@ use euclid::{
         graph::{self, Memoization},
         state_machine, truth,
     },
-    enums,
     frontend::{
         ast,
         dir::{self, enums as dir_enums},
@@ -33,6 +36,39 @@ struct SeedData<'a> {
 }
 
 static SEED_DATA: OnceCell<SeedData<'_>> = OnceCell::new();
+static SEED_FOREX: OnceCell<currency_conversion_types::ExchangeRates> = OnceCell::new();
+
+/// This function can be used by the frontend to educate wasm about the forex rates data.
+/// The input argument is a struct fields base_currency and conversion where later is all the conversions associated with the base_currency
+/// to all different currencies present.
+#[wasm_bindgen(js_name = setForexData)]
+pub fn seed_forex(forex: JsValue) -> JsResult {
+    let forex: currency_conversion_types::ExchangeRates = serde_wasm_bindgen::from_value(forex)?;
+    SEED_FOREX
+        .set(forex)
+        .map_err(|_| "Forex has already been seeded".to_string())
+        .err_to_js()?;
+
+    Ok(JsValue::NULL)
+}
+
+/// This function can be used to perform currency_conversion on the input amount, from_currency,
+/// to_currency which are all expected to be one of currencies we already have in our Currency
+/// enum.
+#[wasm_bindgen(js_name = convertCurrency)]
+pub fn convert_forex_value(amount: i64, from_currency: JsValue, to_currency: JsValue) -> JsResult {
+    let forex_data = SEED_FOREX
+        .get()
+        .ok_or("Forex Data not seeded")
+        .err_to_js()?;
+    let from_currency: common_enums::Currency = serde_wasm_bindgen::from_value(from_currency)?;
+    let to_currency: common_enums::Currency = serde_wasm_bindgen::from_value(to_currency)?;
+    let converted_amount = convert_currency(forex_data, from_currency, to_currency, amount)
+        .map_err(|_| "conversion not possible for provided values")
+        .err_to_js()?;
+
+    Ok(serde_wasm_bindgen::to_value(&converted_amount)?)
+}
 
 /// This function can be used by the frontend to provide the WASM with information about
 /// all the merchant's connector accounts. The input argument is a vector of all the merchant's
@@ -44,7 +80,7 @@ pub fn seed_knowledge_graph(mcas: JsValue) -> JsResult {
         .iter()
         .map(|mca| {
             Ok::<_, strum::ParseError>(ast::ConnectorChoice {
-                connector: dir_enums::Connector::from_str(&mca.connector_name)?,
+                connector: RoutableConnectors::from_str(&mca.connector_name)?,
                 #[cfg(not(feature = "connector_choice_mca_id"))]
                 sub_label: mca.business_sub_label.clone(),
             })
@@ -147,7 +183,9 @@ pub fn run_program(program: JsValue, input: JsValue) -> JsResult {
 
 #[wasm_bindgen(js_name = getAllConnectors)]
 pub fn get_all_connectors() -> JsResult {
-    Ok(serde_wasm_bindgen::to_value(enums::Connector::VARIANTS)?)
+    Ok(serde_wasm_bindgen::to_value(
+        common_enums::RoutableConnectors::VARIANTS,
+    )?)
 }
 
 #[wasm_bindgen(js_name = getAllKeys)]
diff --git a/crates/external_services/Cargo.toml b/crates/external_services/Cargo.toml
index 4700c2a81d75..54a636a382b2 100644
--- a/crates/external_services/Cargo.toml
+++ b/crates/external_services/Cargo.toml
@@ -16,6 +16,7 @@ async-trait = "0.1.68"
 aws-config = { version = "0.55.3", optional = true }
 aws-sdk-kms = { version = "0.28.0", optional = true }
 aws-sdk-sesv2 = "0.28.0"
+aws-sdk-sts = "0.28.0"
 aws-smithy-client = "0.55.3"
 base64 = "0.21.2"
 dyn-clone = "1.0.11"
@@ -24,6 +25,8 @@ once_cell = "1.18.0"
 serde = { version = "1.0.163", features = ["derive"] }
 thiserror = "1.0.40"
 tokio = "1.28.2"
+hyper-proxy = "0.9.1"
+hyper = "0.14.26"
 
 # First party crates
 common_utils = { version = "0.1.0", path = "../common_utils" }
diff --git a/crates/external_services/src/email.rs b/crates/external_services/src/email.rs
index b2bf99d8e01d..1d389f58298a 100644
--- a/crates/external_services/src/email.rs
+++ b/crates/external_services/src/email.rs
@@ -1,127 +1,163 @@
 //! Interactions with the AWS SES SDK
 
-use aws_config::meta::region::RegionProviderChain;
-use aws_sdk_sesv2::{
-    config::Region,
-    operation::send_email::SendEmailError,
-    types::{Body, Content, Destination, EmailContent, Message},
-    Client,
-};
+use aws_sdk_sesv2::types::Body;
 use common_utils::{errors::CustomResult, pii};
-use error_stack::{IntoReport, ResultExt};
-use masking::PeekInterface;
 use serde::Deserialize;
 
+/// Implementation of aws ses client
+pub mod ses;
+
 /// Custom Result type alias for Email operations.
 pub type EmailResult<T> = CustomResult<T, EmailError>;
 
 /// A trait that defines the methods that must be implemented to send email.
 #[async_trait::async_trait]
 pub trait EmailClient: Sync + Send + dyn_clone::DynClone {
+    /// The rich text type of the email client
+    type RichText;
+
     /// Sends an email to the specified recipient with the given subject and body.
     async fn send_email(
         &self,
         recipient: pii::Email,
         subject: String,
-        body: String,
+        body: Self::RichText,
+        proxy_url: Option<&String>,
+    ) -> EmailResult<()>;
+
+    /// Convert Stringified HTML to client native rich text format
+    /// This has to be done because not all clients may format html as the same
+    fn convert_to_rich_text(
+        &self,
+        intermediate_string: IntermediateString,
+    ) -> CustomResult<Self::RichText, EmailError>
+    where
+        Self::RichText: Send;
+}
+
+/// A super trait which is automatically implemented for all EmailClients
+#[async_trait::async_trait]
+pub trait EmailService: Sync + Send + dyn_clone::DynClone {
+    /// Compose and send email using the email data
+    async fn compose_and_send_email(
+        &self,
+        email_data: Box<dyn EmailData + Send>,
+        proxy_url: Option<&String>,
     ) -> EmailResult<()>;
 }
 
-dyn_clone::clone_trait_object!(EmailClient);
+#[async_trait::async_trait]
+impl<T> EmailService for T
+where
+    T: EmailClient,
+    <Self as EmailClient>::RichText: Send,
+{
+    async fn compose_and_send_email(
+        &self,
+        email_data: Box<dyn EmailData + Send>,
+        proxy_url: Option<&String>,
+    ) -> EmailResult<()> {
+        let email_data = email_data.get_email_data();
+        let email_data = email_data.await?;
+
+        let EmailContents {
+            subject,
+            body,
+            recipient,
+        } = email_data;
+
+        let rich_text_string = self.convert_to_rich_text(body)?;
+
+        self.send_email(recipient, subject, rich_text_string, proxy_url)
+            .await
+    }
+}
+
+/// This is a struct used to create Intermediate String for rich text ( html )
+#[derive(Debug)]
+pub struct IntermediateString(String);
+
+impl IntermediateString {
+    /// Create a new Instance of IntermediateString using a string
+    pub fn new(inner: String) -> Self {
+        Self(inner)
+    }
+
+    /// Get the inner String
+    pub fn into_inner(self) -> String {
+        self.0
+    }
+}
+
+/// Temporary output for the email subject
+#[derive(Debug)]
+pub struct EmailContents {
+    /// The subject of email
+    pub subject: String,
+
+    /// This will be the intermediate representation of the the email body in a generic format.
+    /// The email clients can convert this intermediate representation to their client specific rich text format
+    pub body: IntermediateString,
+
+    /// The email of the recipient to whom the email has to be sent
+    pub recipient: pii::Email,
+}
+
+/// A trait which will contain the logic of generating the email subject and body
+#[async_trait::async_trait]
+pub trait EmailData {
+    /// Get the email contents
+    async fn get_email_data(&self) -> CustomResult<EmailContents, EmailError>;
+}
+
+dyn_clone::clone_trait_object!(EmailClient<RichText = Body>);
+
+/// List of available email clients to choose from
+#[derive(Debug, Clone, Default, Deserialize)]
+pub enum AvailableEmailClients {
+    #[default]
+    /// AWS ses email client
+    SES,
+}
 
 /// Struct that contains the settings required to construct an EmailClient.
 #[derive(Debug, Clone, Default, Deserialize)]
 pub struct EmailSettings {
-    /// Sender email.
-    pub from_email: String,
-
     /// The AWS region to send SES requests to.
     pub aws_region: String,
 
     /// Base-url used when adding links that should redirect to self
     pub base_url: String,
-}
 
-/// Client for AWS SES operation
-#[derive(Debug, Clone)]
-pub struct AwsSes {
-    ses_client: Client,
-    from_email: String,
-}
+    /// Number of days for verification of the email
+    pub allowed_unverified_days: i64,
 
-impl AwsSes {
-    /// Constructs a new AwsSes client
-    pub async fn new(conf: &EmailSettings) -> Self {
-        let region_provider = RegionProviderChain::first_try(Region::new(conf.aws_region.clone()));
-        let sdk_config = aws_config::from_env().region(region_provider).load().await;
+    /// Sender email
+    pub sender_email: String,
 
-        Self {
-            ses_client: Client::new(&sdk_config),
-            from_email: conf.from_email.clone(),
-        }
-    }
-}
+    /// Configs related to AWS Simple Email Service
+    pub aws_ses: Option<ses::SESConfig>,
 
-#[async_trait::async_trait]
-impl EmailClient for AwsSes {
-    async fn send_email(
-        &self,
-        recipient: pii::Email,
-        subject: String,
-        body: String,
-    ) -> EmailResult<()> {
-        self.ses_client
-            .send_email()
-            .from_email_address(self.from_email.to_owned())
-            .destination(
-                Destination::builder()
-                    .to_addresses(recipient.peek())
-                    .build(),
-            )
-            .content(
-                EmailContent::builder()
-                    .simple(
-                        Message::builder()
-                            .subject(Content::builder().data(subject).build())
-                            .body(
-                                Body::builder()
-                                    .text(Content::builder().data(body).charset("UTF-8").build())
-                                    .build(),
-                            )
-                            .build(),
-                    )
-                    .build(),
-            )
-            .send()
-            .await
-            .map_err(AwsSesError::SendingFailure)
-            .into_report()
-            .change_context(EmailError::EmailSendingFailure)?;
-
-        Ok(())
-    }
+    /// The active email client to use
+    pub active_email_client: AvailableEmailClients,
 }
 
-#[allow(missing_docs)]
 /// Errors that could occur from EmailClient.
 #[derive(Debug, thiserror::Error)]
 pub enum EmailError {
     /// An error occurred when building email client.
     #[error("Error building email client")]
     ClientBuildingFailure,
+
     /// An error occurred when sending email
     #[error("Error sending email to recipient")]
     EmailSendingFailure,
+
+    /// Failed to generate the email token
     #[error("Failed to generate email token")]
     TokenGenerationFailure,
+
+    /// The expected feature is not implemented
     #[error("Feature not implemented")]
     NotImplemented,
 }
-
-/// Errors that could occur during SES operations.
-#[derive(Debug, thiserror::Error)]
-pub enum AwsSesError {
-    /// An error occurred in the SDK while sending email.
-    #[error("Failed to Send Email {0:?}")]
-    SendingFailure(aws_smithy_client::SdkError<SendEmailError>),
-}
diff --git a/crates/external_services/src/email/ses.rs b/crates/external_services/src/email/ses.rs
new file mode 100644
index 000000000000..7e521a5bc1c4
--- /dev/null
+++ b/crates/external_services/src/email/ses.rs
@@ -0,0 +1,257 @@
+use std::time::{Duration, SystemTime};
+
+use aws_sdk_sesv2::{
+    config::Region,
+    operation::send_email::SendEmailError,
+    types::{Body, Content, Destination, EmailContent, Message},
+    Client,
+};
+use aws_sdk_sts::config::Credentials;
+use common_utils::{errors::CustomResult, ext_traits::OptionExt, pii};
+use error_stack::{report, IntoReport, ResultExt};
+use hyper::Uri;
+use masking::PeekInterface;
+use router_env::logger;
+use tokio::sync::OnceCell;
+
+use crate::email::{EmailClient, EmailError, EmailResult, EmailSettings, IntermediateString};
+
+/// Client for AWS SES operation
+#[derive(Debug, Clone)]
+pub struct AwsSes {
+    ses_client: OnceCell<Client>,
+    sender: String,
+    settings: EmailSettings,
+}
+
+/// Struct that contains the AWS ses specific configs required to construct an SES email client
+#[derive(Debug, Clone, Default, serde::Deserialize)]
+pub struct SESConfig {
+    /// The arn of email role
+    pub email_role_arn: String,
+
+    /// The name of sts_session role
+    pub sts_role_session_name: String,
+}
+
+/// Errors that could occur during SES operations.
+#[derive(Debug, thiserror::Error)]
+pub enum AwsSesError {
+    /// An error occurred in the SDK while sending email.
+    #[error("Failed to Send Email {0:?}")]
+    SendingFailure(aws_smithy_client::SdkError<SendEmailError>),
+
+    /// Configuration variable is missing to construct the email client
+    #[error("Missing configuration variable {0}")]
+    MissingConfigurationVariable(&'static str),
+
+    /// Failed to assume the given STS role
+    #[error("Failed to STS assume role: Role ARN: {role_arn}, Session name: {session_name}, Region: {region}")]
+    AssumeRoleFailure {
+        /// Aws region
+        region: String,
+
+        /// arn of email role
+        role_arn: String,
+
+        /// The name of sts_session role
+        session_name: String,
+    },
+
+    /// Temporary credentials are missing
+    #[error("Assumed role does not contain credentials for role user: {0:?}")]
+    TemporaryCredentialsMissing(String),
+
+    /// The proxy Connector cannot be built
+    #[error("The proxy build cannot be built")]
+    BuildingProxyConnectorFailed,
+}
+
+impl AwsSes {
+    /// Constructs a new AwsSes client
+    pub async fn create(conf: &EmailSettings, proxy_url: Option<impl AsRef<str>>) -> Self {
+        Self {
+            ses_client: OnceCell::new_with(
+                Self::create_client(conf, proxy_url)
+                    .await
+                    .map_err(|error| logger::error!(?error, "Failed to initialize SES Client"))
+                    .ok(),
+            ),
+            sender: conf.sender_email.clone(),
+            settings: conf.clone(),
+        }
+    }
+
+    /// A helper function to create ses client
+    pub async fn create_client(
+        conf: &EmailSettings,
+        proxy_url: Option<impl AsRef<str>>,
+    ) -> CustomResult<Client, AwsSesError> {
+        let sts_config = Self::get_shared_config(conf.aws_region.to_owned(), proxy_url.as_ref())?
+            .load()
+            .await;
+
+        let ses_config = conf
+            .aws_ses
+            .as_ref()
+            .get_required_value("aws ses configuration")
+            .attach_printable("The selected email client is aws ses, but configuration is missing")
+            .change_context(AwsSesError::MissingConfigurationVariable("aws_ses"))?;
+
+        let role = aws_sdk_sts::Client::new(&sts_config)
+            .assume_role()
+            .role_arn(&ses_config.email_role_arn)
+            .role_session_name(&ses_config.sts_role_session_name)
+            .send()
+            .await
+            .into_report()
+            .change_context(AwsSesError::AssumeRoleFailure {
+                region: conf.aws_region.to_owned(),
+                role_arn: ses_config.email_role_arn.to_owned(),
+                session_name: ses_config.sts_role_session_name.to_owned(),
+            })?;
+
+        let creds = role.credentials().ok_or(
+            report!(AwsSesError::TemporaryCredentialsMissing(format!(
+                "{role:?}"
+            )))
+            .attach_printable("Credentials object not available"),
+        )?;
+
+        let credentials = Credentials::new(
+            creds
+                .access_key_id()
+                .ok_or(
+                    report!(AwsSesError::TemporaryCredentialsMissing(format!(
+                        "{role:?}"
+                    )))
+                    .attach_printable("Access Key ID not found"),
+                )?
+                .to_owned(),
+            creds
+                .secret_access_key()
+                .ok_or(
+                    report!(AwsSesError::TemporaryCredentialsMissing(format!(
+                        "{role:?}"
+                    )))
+                    .attach_printable("Secret Access Key not found"),
+                )?
+                .to_owned(),
+            creds.session_token().map(|s| s.to_owned()),
+            creds.expiration().and_then(|dt| {
+                SystemTime::UNIX_EPOCH
+                    .checked_add(Duration::from_nanos(u64::try_from(dt.as_nanos()).ok()?))
+            }),
+            "custom_provider",
+        );
+
+        logger::debug!(
+            "Obtained SES temporary credentials with expiry {:?}",
+            credentials.expiry()
+        );
+
+        let ses_config = Self::get_shared_config(conf.aws_region.to_owned(), proxy_url)?
+            .credentials_provider(credentials)
+            .load()
+            .await;
+
+        Ok(Client::new(&ses_config))
+    }
+
+    fn get_shared_config(
+        region: String,
+        proxy_url: Option<impl AsRef<str>>,
+    ) -> CustomResult<aws_config::ConfigLoader, AwsSesError> {
+        let region_provider = Region::new(region);
+        let mut config = aws_config::from_env().region(region_provider);
+        if let Some(proxy_url) = proxy_url {
+            let proxy_connector = Self::get_proxy_connector(proxy_url)?;
+            let provider_config = aws_config::provider_config::ProviderConfig::default()
+                .with_tcp_connector(proxy_connector.clone());
+            let http_connector =
+                aws_smithy_client::hyper_ext::Adapter::builder().build(proxy_connector);
+            config = config
+                .configure(provider_config)
+                .http_connector(http_connector);
+        };
+        Ok(config)
+    }
+
+    fn get_proxy_connector(
+        proxy_url: impl AsRef<str>,
+    ) -> CustomResult<hyper_proxy::ProxyConnector<hyper::client::HttpConnector>, AwsSesError> {
+        let proxy_uri = proxy_url
+            .as_ref()
+            .parse::<Uri>()
+            .into_report()
+            .attach_printable("Unable to parse the proxy url {proxy_url}")
+            .change_context(AwsSesError::BuildingProxyConnectorFailed)?;
+
+        let proxy = hyper_proxy::Proxy::new(hyper_proxy::Intercept::All, proxy_uri);
+
+        hyper_proxy::ProxyConnector::from_proxy(hyper::client::HttpConnector::new(), proxy)
+            .into_report()
+            .change_context(AwsSesError::BuildingProxyConnectorFailed)
+    }
+}
+
+#[async_trait::async_trait]
+impl EmailClient for AwsSes {
+    type RichText = Body;
+
+    fn convert_to_rich_text(
+        &self,
+        intermediate_string: IntermediateString,
+    ) -> CustomResult<Self::RichText, EmailError> {
+        let email_body = Body::builder()
+            .html(
+                Content::builder()
+                    .data(intermediate_string.into_inner())
+                    .charset("UTF-8")
+                    .build(),
+            )
+            .build();
+
+        Ok(email_body)
+    }
+
+    async fn send_email(
+        &self,
+        recipient: pii::Email,
+        subject: String,
+        body: Self::RichText,
+        proxy_url: Option<&String>,
+    ) -> EmailResult<()> {
+        self.ses_client
+            .get_or_try_init(|| async {
+                Self::create_client(&self.settings, proxy_url)
+                    .await
+                    .change_context(EmailError::ClientBuildingFailure)
+            })
+            .await?
+            .send_email()
+            .from_email_address(self.sender.to_owned())
+            .destination(
+                Destination::builder()
+                    .to_addresses(recipient.peek())
+                    .build(),
+            )
+            .content(
+                EmailContent::builder()
+                    .simple(
+                        Message::builder()
+                            .subject(Content::builder().data(subject).build())
+                            .body(body)
+                            .build(),
+                    )
+                    .build(),
+            )
+            .send()
+            .await
+            .map_err(AwsSesError::SendingFailure)
+            .into_report()
+            .change_context(EmailError::EmailSendingFailure)?;
+
+        Ok(())
+    }
+}
diff --git a/crates/kgraph_utils/Cargo.toml b/crates/kgraph_utils/Cargo.toml
index cd0adf0bc8af..44a73dae4d77 100644
--- a/crates/kgraph_utils/Cargo.toml
+++ b/crates/kgraph_utils/Cargo.toml
@@ -11,6 +11,7 @@ connector_choice_mca_id = ["api_models/connector_choice_mca_id", "euclid/connect
 
 [dependencies]
 api_models = { version = "0.1.0", path = "../api_models", package = "api_models" }
+common_enums = { version = "0.1.0", path = "../common_enums" }
 euclid = { version = "0.1.0", path = "../euclid" }
 masking = { version = "0.1.0", path = "../masking/" }
 
diff --git a/crates/kgraph_utils/src/mca.rs b/crates/kgraph_utils/src/mca.rs
index deea51bd8808..0e224a8f3d9d 100644
--- a/crates/kgraph_utils/src/mca.rs
+++ b/crates/kgraph_utils/src/mca.rs
@@ -5,10 +5,7 @@ use api_models::{
 };
 use euclid::{
     dssa::graph::{self, DomainIdentifier},
-    frontend::{
-        ast,
-        dir::{self, enums as dir_enums},
-    },
+    frontend::{ast, dir},
     types::{NumValue, NumValueRefinement},
 };
 
@@ -277,7 +274,7 @@ fn compile_merchant_connector_graph(
     builder: &mut graph::KnowledgeGraphBuilder<'_>,
     mca: admin_api::MerchantConnectorResponse,
 ) -> Result<(), KgraphError> {
-    let connector = dir_enums::Connector::from_str(&mca.connector_name)
+    let connector = common_enums::RoutableConnectors::from_str(&mca.connector_name)
         .map_err(|_| KgraphError::InvalidConnectorName(mca.connector_name.clone()))?;
 
     let mut agg_nodes: Vec<(graph::NodeId, graph::Relation)> = Vec::new();
diff --git a/crates/masking/src/secret.rs b/crates/masking/src/secret.rs
index 96411d4632bd..b2e9124688cb 100644
--- a/crates/masking/src/secret.rs
+++ b/crates/masking/src/secret.rs
@@ -12,8 +12,8 @@ use crate::{strategy::Strategy, PeekInterface};
 /// To get access to value use method `expose()` of trait [`crate::ExposeInterface`].
 ///
 /// ## Masking
-/// Use the [`crate::strategy::Strategy`] trait to implement a masking strategy on a unit struct
-/// and pass the unit struct as a second generic parameter to [`Secret`] while defining it.
+/// Use the [`crate::strategy::Strategy`] trait to implement a masking strategy on a zero-variant
+/// enum and pass this enum as a second generic parameter to [`Secret`] while defining it.
 /// [`Secret`] will take care of applying the masking strategy on the inner secret when being
 /// displayed.
 ///
@@ -24,7 +24,7 @@ use crate::{strategy::Strategy, PeekInterface};
 /// use masking::Secret;
 /// use std::fmt;
 ///
-/// struct MyStrategy;
+/// enum MyStrategy {}
 ///
 /// impl<T> Strategy<T> for MyStrategy
 /// where
diff --git a/crates/masking/src/strategy.rs b/crates/masking/src/strategy.rs
index f744ee1f4b52..8b4d9b0ec34d 100644
--- a/crates/masking/src/strategy.rs
+++ b/crates/masking/src/strategy.rs
@@ -7,7 +7,7 @@ pub trait Strategy<T> {
 }
 
 /// Debug with type
-pub struct WithType;
+pub enum WithType {}
 
 impl<T> Strategy<T> for WithType {
     fn fmt(_: &T, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -18,7 +18,7 @@ impl<T> Strategy<T> for WithType {
 }
 
 /// Debug without type
-pub struct WithoutType;
+pub enum WithoutType {}
 
 impl<T> Strategy<T> for WithoutType {
     fn fmt(_: &T, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml
index 25feb373b734..f508460574dd 100644
--- a/crates/router/Cargo.toml
+++ b/crates/router/Cargo.toml
@@ -12,11 +12,11 @@ license.workspace = true
 default = ["kv_store", "stripe", "oltp", "olap", "backwards_compatibility", "accounts_cache", "dummy_connector", "payouts", "profile_specific_fallback_routing", "retry"]
 s3 = ["dep:aws-sdk-s3", "dep:aws-config"]
 kms = ["external_services/kms", "dep:aws-config"]
-email = ["external_services/email", "dep:aws-config"]
+email = ["external_services/email", "dep:aws-config", "olap"]
 basilisk = ["kms"]
 stripe = ["dep:serde_qs"]
 release = ["kms", "stripe", "basilisk", "s3", "email", "business_profile_routing", "accounts_cache", "kv_store", "profile_specific_fallback_routing"]
-olap = ["data_models/olap", "storage_impl/olap", "scheduler/olap"]
+olap = ["data_models/olap", "storage_impl/olap", "scheduler/olap", "dep:analytics"]
 oltp = ["storage_impl/oltp"]
 kv_store = ["scheduler/kv_store"]
 accounts_cache = []
@@ -68,7 +68,7 @@ mime = "0.3.17"
 nanoid = "0.4.0"
 num_cpus = "1.15.0"
 once_cell = "1.18.0"
-openssl = "0.10.55"
+openssl = "0.10.60"
 qrcode = "0.12.0"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
@@ -76,6 +76,7 @@ regex = "1.8.4"
 reqwest = { version = "0.11.18", features = ["json", "native-tls", "gzip", "multipart"] }
 ring = "0.16.20"
 roxmltree = "0.18.0"
+rust_decimal = { version = "1.30.0", features = ["serde-with-float", "serde-with-str"] }
 rustc-hash = "1.1.0"
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
@@ -85,7 +86,7 @@ serde_urlencoded = "0.7.1"
 serde_with = "3.0.0"
 sha-1 = { version = "0.9" }
 sqlx = { version = "0.6.3", features = ["postgres", "runtime-actix", "runtime-actix-native-tls", "time", "bigdecimal"] }
-strum = { version = "0.24.1", features = ["derive"] }
+strum = { version = "0.25", features = ["derive"] }
 tera = "1.19.1"
 thiserror = "1.0.40"
 time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] }
@@ -101,9 +102,11 @@ tracing-futures = { version = "0.2.5", features = ["tokio"] }
 
 # First party crates
 api_models = { version = "0.1.0", path = "../api_models", features = ["errors"] }
+analytics = { version = "0.1.0", path = "../analytics", optional = true }
 cards = { version = "0.1.0", path = "../cards" }
 common_enums = { version = "0.1.0", path = "../common_enums" }
 common_utils = { version = "0.1.0", path = "../common_utils", features = ["signals", "async_ext", "logs"] }
+currency_conversion = { version = "0.1.0", path = "../currency_conversion" }
 data_models = { version = "0.1.0", path = "../data_models", default-features = false }
 diesel_models = { version = "0.1.0", path = "../diesel_models", features = ["kv_store"] }
 euclid = { version = "0.1.0", path = "../euclid", features = ["valued_jit"] }
@@ -116,6 +119,7 @@ router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra
 scheduler = { version = "0.1.0", path = "../scheduler", default-features = false }
 storage_impl = { version = "0.1.0", path = "../storage_impl", default-features = false }
 erased-serde = "0.3.31"
+rdkafka = "0.36.0"
 
 [build-dependencies]
 router_env = { version = "0.1.0", path = "../router_env", default-features = false }
diff --git a/crates/router/src/analytics.rs b/crates/router/src/analytics.rs
index d57403d92989..f31e908e0dc3 100644
--- a/crates/router/src/analytics.rs
+++ b/crates/router/src/analytics.rs
@@ -1,129 +1,560 @@
-mod core;
-mod errors;
-pub mod metrics;
-mod payments;
-mod query;
-mod refunds;
-pub mod routes;
-
-mod sqlx;
-mod types;
-mod utils;
-
-use api_models::analytics::{
-    payments::{PaymentDimensions, PaymentFilters, PaymentMetrics, PaymentMetricsBucketIdentifier},
-    refunds::{RefundDimensions, RefundFilters, RefundMetrics, RefundMetricsBucketIdentifier},
-    Granularity, TimeRange,
-};
-use router_env::{instrument, tracing};
-
-use self::{
-    payments::metrics::{PaymentMetric, PaymentMetricRow},
-    refunds::metrics::{RefundMetric, RefundMetricRow},
-    sqlx::SqlxClient,
-};
-use crate::configs::settings::Database;
-
-#[derive(Clone, Debug)]
-pub enum AnalyticsProvider {
-    Sqlx(SqlxClient),
-}
+pub use analytics::*;
+
+pub mod routes {
+    use actix_web::{web, Responder, Scope};
+    use analytics::{
+        api_event::api_events_core, errors::AnalyticsError, lambda_utils::invoke_lambda,
+        sdk_events::sdk_events_core,
+    };
+    use api_models::analytics::{
+        GenerateReportRequest, GetApiEventFiltersRequest, GetApiEventMetricRequest,
+        GetPaymentFiltersRequest, GetPaymentMetricRequest, GetRefundFilterRequest,
+        GetRefundMetricRequest, GetSdkEventFiltersRequest, GetSdkEventMetricRequest, ReportRequest,
+    };
+    use error_stack::ResultExt;
+    use router_env::AnalyticsFlow;
+
+    use crate::{
+        core::api_locking,
+        db::user::UserInterface,
+        routes::AppState,
+        services::{
+            api,
+            authentication::{self as auth, AuthToken, AuthenticationData},
+            authorization::permissions::Permission,
+            ApplicationResponse,
+        },
+        types::domain::UserEmail,
+    };
+
+    pub struct Analytics;
+
+    impl Analytics {
+        pub fn server(state: AppState) -> Scope {
+            let mut route = web::scope("/analytics/v1").app_data(web::Data::new(state));
+            {
+                route = route
+                    .service(
+                        web::resource("metrics/payments")
+                            .route(web::post().to(get_payment_metrics)),
+                    )
+                    .service(
+                        web::resource("metrics/refunds").route(web::post().to(get_refunds_metrics)),
+                    )
+                    .service(
+                        web::resource("filters/payments")
+                            .route(web::post().to(get_payment_filters)),
+                    )
+                    .service(
+                        web::resource("filters/refunds").route(web::post().to(get_refund_filters)),
+                    )
+                    .service(web::resource("{domain}/info").route(web::get().to(get_info)))
+                    .service(
+                        web::resource("report/dispute")
+                            .route(web::post().to(generate_dispute_report)),
+                    )
+                    .service(
+                        web::resource("report/refunds")
+                            .route(web::post().to(generate_refund_report)),
+                    )
+                    .service(
+                        web::resource("report/payments")
+                            .route(web::post().to(generate_payment_report)),
+                    )
+                    .service(
+                        web::resource("metrics/sdk_events")
+                            .route(web::post().to(get_sdk_event_metrics)),
+                    )
+                    .service(
+                        web::resource("filters/sdk_events")
+                            .route(web::post().to(get_sdk_event_filters)),
+                    )
+                    .service(web::resource("api_event_logs").route(web::get().to(get_api_events)))
+                    .service(web::resource("sdk_event_logs").route(web::post().to(get_sdk_events)))
+                    .service(
+                        web::resource("filters/api_events")
+                            .route(web::post().to(get_api_event_filters)),
+                    )
+                    .service(
+                        web::resource("metrics/api_events")
+                            .route(web::post().to(get_api_events_metrics)),
+                    )
+            }
+            route
+        }
+    }
 
-impl Default for AnalyticsProvider {
-    fn default() -> Self {
-        Self::Sqlx(SqlxClient::default())
+    pub async fn get_info(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        domain: actix_web::web::Path<analytics::AnalyticsDomain>,
+    ) -> impl Responder {
+        let flow = AnalyticsFlow::GetInfo;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            domain.into_inner(),
+            |_, _, domain| async {
+                analytics::core::get_domain_info(domain)
+                    .await
+                    .map(ApplicationResponse::Json)
+            },
+            &auth::NoAuth,
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
     }
-}
 
-impl AnalyticsProvider {
-    #[instrument(skip_all)]
+    /// # Panics
+    ///
+    /// Panics if `json_payload` array does not contain one `GetPaymentMetricRequest` element.
     pub async fn get_payment_metrics(
-        &self,
-        metric: &PaymentMetrics,
-        dimensions: &[PaymentDimensions],
-        merchant_id: &str,
-        filters: &PaymentFilters,
-        granularity: &Option<Granularity>,
-        time_range: &TimeRange,
-    ) -> types::MetricsResult<Vec<(PaymentMetricsBucketIdentifier, PaymentMetricRow)>> {
-        // Metrics to get the fetch time for each payment metric
-        metrics::request::record_operation_time(
-            async {
-                match self {
-                    Self::Sqlx(pool) => {
-                        metric
-                            .load_metrics(
-                                dimensions,
-                                merchant_id,
-                                filters,
-                                granularity,
-                                time_range,
-                                pool,
-                            )
-                            .await
-                    }
-                }
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<[GetPaymentMetricRequest; 1]>,
+    ) -> impl Responder {
+        // safety: This shouldn't panic owing to the data type
+        #[allow(clippy::expect_used)]
+        let payload = json_payload
+            .into_inner()
+            .to_vec()
+            .pop()
+            .expect("Couldn't get GetPaymentMetricRequest");
+        let flow = AnalyticsFlow::GetPaymentMetrics;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            payload,
+            |state, auth: AuthenticationData, req| async move {
+                analytics::payments::get_metrics(
+                    &state.pool,
+                    &auth.merchant_account.merchant_id,
+                    req,
+                )
+                .await
+                .map(ApplicationResponse::Json)
             },
-            &metrics::METRIC_FETCH_TIME,
-            metric,
-            self,
-        )
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
         .await
     }
 
-    pub async fn get_refund_metrics(
-        &self,
-        metric: &RefundMetrics,
-        dimensions: &[RefundDimensions],
-        merchant_id: &str,
-        filters: &RefundFilters,
-        granularity: &Option<Granularity>,
-        time_range: &TimeRange,
-    ) -> types::MetricsResult<Vec<(RefundMetricsBucketIdentifier, RefundMetricRow)>> {
-        match self {
-            Self::Sqlx(pool) => {
-                metric
-                    .load_metrics(
-                        dimensions,
-                        merchant_id,
-                        filters,
-                        granularity,
-                        time_range,
-                        pool,
-                    )
+    /// # Panics
+    ///
+    /// Panics if `json_payload` array does not contain one `GetRefundMetricRequest` element.
+    pub async fn get_refunds_metrics(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<[GetRefundMetricRequest; 1]>,
+    ) -> impl Responder {
+        #[allow(clippy::expect_used)]
+        // safety: This shouldn't panic owing to the data type
+        let payload = json_payload
+            .into_inner()
+            .to_vec()
+            .pop()
+            .expect("Couldn't get GetRefundMetricRequest");
+        let flow = AnalyticsFlow::GetRefundsMetrics;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            payload,
+            |state, auth: AuthenticationData, req| async move {
+                analytics::refunds::get_metrics(
+                    &state.pool,
+                    &auth.merchant_account.merchant_id,
+                    req,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    /// # Panics
+    ///
+    /// Panics if `json_payload` array does not contain one `GetSdkEventMetricRequest` element.
+    pub async fn get_sdk_event_metrics(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<[GetSdkEventMetricRequest; 1]>,
+    ) -> impl Responder {
+        // safety: This shouldn't panic owing to the data type
+        #[allow(clippy::expect_used)]
+        let payload = json_payload
+            .into_inner()
+            .to_vec()
+            .pop()
+            .expect("Couldn't get GetSdkEventMetricRequest");
+        let flow = AnalyticsFlow::GetSdkMetrics;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            payload,
+            |state, auth: AuthenticationData, req| async move {
+                analytics::sdk_events::get_metrics(
+                    &state.pool,
+                    auth.merchant_account.publishable_key.as_ref(),
+                    req,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    pub async fn get_payment_filters(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<GetPaymentFiltersRequest>,
+    ) -> impl Responder {
+        let flow = AnalyticsFlow::GetPaymentFilters;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, req| async move {
+                analytics::payments::get_filters(
+                    &state.pool,
+                    req,
+                    &auth.merchant_account.merchant_id,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    pub async fn get_refund_filters(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<GetRefundFilterRequest>,
+    ) -> impl Responder {
+        let flow = AnalyticsFlow::GetRefundFilters;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, req: GetRefundFilterRequest| async move {
+                analytics::refunds::get_filters(
+                    &state.pool,
+                    req,
+                    &auth.merchant_account.merchant_id,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    pub async fn get_sdk_event_filters(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<GetSdkEventFiltersRequest>,
+    ) -> impl Responder {
+        let flow = AnalyticsFlow::GetSdkEventFilters;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, req| async move {
+                analytics::sdk_events::get_filters(
+                    &state.pool,
+                    req,
+                    auth.merchant_account.publishable_key.as_ref(),
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    pub async fn get_api_events(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Query<api_models::analytics::api_event::ApiLogsRequest>,
+    ) -> impl Responder {
+        let flow = AnalyticsFlow::GetApiEvents;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, req| async move {
+                api_events_core(&state.pool, req, auth.merchant_account.merchant_id)
                     .await
-            }
-        }
+                    .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
     }
 
-    pub async fn from_conf(
-        config: &AnalyticsConfig,
-        #[cfg(feature = "kms")] kms_client: &external_services::kms::KmsClient,
-    ) -> Self {
-        match config {
-            AnalyticsConfig::Sqlx { sqlx } => Self::Sqlx(
-                SqlxClient::from_conf(
-                    sqlx,
-                    #[cfg(feature = "kms")]
-                    kms_client,
+    pub async fn get_sdk_events(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<api_models::analytics::sdk_events::SdkEventsRequest>,
+    ) -> impl Responder {
+        let flow = AnalyticsFlow::GetSdkEvents;
+        Box::pin(api::server_wrap(
+            flow,
+            state,
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, req| async move {
+                sdk_events_core(
+                    &state.pool,
+                    req,
+                    auth.merchant_account.publishable_key.unwrap_or_default(),
                 )
-                .await,
-            ),
-        }
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
     }
-}
 
-#[derive(Clone, Debug, serde::Deserialize)]
-#[serde(tag = "source")]
-#[serde(rename_all = "lowercase")]
-pub enum AnalyticsConfig {
-    Sqlx { sqlx: Database },
-}
+    pub async fn generate_refund_report(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<ReportRequest>,
+    ) -> impl Responder {
+        let state_ref = &state;
+        let req_headers = &req.headers();
 
-impl Default for AnalyticsConfig {
-    fn default() -> Self {
-        Self::Sqlx {
-            sqlx: Database::default(),
-        }
+        let flow = AnalyticsFlow::GenerateRefundReport;
+        Box::pin(api::server_wrap(
+            flow,
+            state.clone(),
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, payload| async move {
+                let jwt_payload =
+                    auth::parse_jwt_payload::<AppState, AuthToken>(req_headers, state_ref).await;
+
+                let user_id = jwt_payload
+                    .change_context(AnalyticsError::UnknownError)?
+                    .user_id;
+
+                let user = UserInterface::find_user_by_id(&*state.store, &user_id)
+                    .await
+                    .change_context(AnalyticsError::UnknownError)?;
+
+                let user_email = UserEmail::from_pii_email(user.email)
+                    .change_context(AnalyticsError::UnknownError)?
+                    .get_secret();
+
+                let lambda_req = GenerateReportRequest {
+                    request: payload,
+                    merchant_id: auth.merchant_account.merchant_id.to_string(),
+                    email: user_email,
+                };
+
+                let json_bytes =
+                    serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;
+                invoke_lambda(
+                    &state.conf.report_download_config.refund_function,
+                    &state.conf.report_download_config.region,
+                    &json_bytes,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    pub async fn generate_dispute_report(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<ReportRequest>,
+    ) -> impl Responder {
+        let state_ref = &state;
+        let req_headers = &req.headers();
+
+        let flow = AnalyticsFlow::GenerateDisputeReport;
+        Box::pin(api::server_wrap(
+            flow,
+            state.clone(),
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, payload| async move {
+                let jwt_payload =
+                    auth::parse_jwt_payload::<AppState, AuthToken>(req_headers, state_ref).await;
+
+                let user_id = jwt_payload
+                    .change_context(AnalyticsError::UnknownError)?
+                    .user_id;
+
+                let user = UserInterface::find_user_by_id(&*state.store, &user_id)
+                    .await
+                    .change_context(AnalyticsError::UnknownError)?;
+
+                let user_email = UserEmail::from_pii_email(user.email)
+                    .change_context(AnalyticsError::UnknownError)?
+                    .get_secret();
+
+                let lambda_req = GenerateReportRequest {
+                    request: payload,
+                    merchant_id: auth.merchant_account.merchant_id.to_string(),
+                    email: user_email,
+                };
+
+                let json_bytes =
+                    serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;
+                invoke_lambda(
+                    &state.conf.report_download_config.dispute_function,
+                    &state.conf.report_download_config.region,
+                    &json_bytes,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    pub async fn generate_payment_report(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<ReportRequest>,
+    ) -> impl Responder {
+        let state_ref = &state;
+        let req_headers = &req.headers();
+
+        let flow = AnalyticsFlow::GeneratePaymentReport;
+        Box::pin(api::server_wrap(
+            flow,
+            state.clone(),
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, payload| async move {
+                let jwt_payload =
+                    auth::parse_jwt_payload::<AppState, AuthToken>(req_headers, state_ref).await;
+
+                let user_id = jwt_payload
+                    .change_context(AnalyticsError::UnknownError)?
+                    .user_id;
+
+                let user = UserInterface::find_user_by_id(&*state.store, &user_id)
+                    .await
+                    .change_context(AnalyticsError::UnknownError)?;
+
+                let user_email = UserEmail::from_pii_email(user.email)
+                    .change_context(AnalyticsError::UnknownError)?
+                    .get_secret();
+
+                let lambda_req = GenerateReportRequest {
+                    request: payload,
+                    merchant_id: auth.merchant_account.merchant_id.to_string(),
+                    email: user_email,
+                };
+
+                let json_bytes =
+                    serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;
+                invoke_lambda(
+                    &state.conf.report_download_config.payment_function,
+                    &state.conf.report_download_config.region,
+                    &json_bytes,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    /// # Panics
+    ///
+    /// Panics if `json_payload` array does not contain one `GetApiEventMetricRequest` element.
+    pub async fn get_api_events_metrics(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<[GetApiEventMetricRequest; 1]>,
+    ) -> impl Responder {
+        // safety: This shouldn't panic owing to the data type
+        #[allow(clippy::expect_used)]
+        let payload = json_payload
+            .into_inner()
+            .to_vec()
+            .pop()
+            .expect("Couldn't get GetApiEventMetricRequest");
+        let flow = AnalyticsFlow::GetApiEventMetrics;
+        Box::pin(api::server_wrap(
+            flow,
+            state.clone(),
+            &req,
+            payload,
+            |state, auth: AuthenticationData, req| async move {
+                analytics::api_event::get_api_event_metrics(
+                    &state.pool,
+                    &auth.merchant_account.merchant_id,
+                    req,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
+    }
+
+    pub async fn get_api_event_filters(
+        state: web::Data<AppState>,
+        req: actix_web::HttpRequest,
+        json_payload: web::Json<GetApiEventFiltersRequest>,
+    ) -> impl Responder {
+        let flow = AnalyticsFlow::GetApiEventFilters;
+        Box::pin(api::server_wrap(
+            flow,
+            state.clone(),
+            &req,
+            json_payload.into_inner(),
+            |state, auth: AuthenticationData, req| async move {
+                analytics::api_event::get_filters(
+                    &state.pool,
+                    req,
+                    auth.merchant_account.merchant_id,
+                )
+                .await
+                .map(ApplicationResponse::Json)
+            },
+            &auth::JWTAuth(Permission::Analytics),
+            api_locking::LockAction::NotApplicable,
+        ))
+        .await
     }
 }
diff --git a/crates/router/src/analytics/core.rs b/crates/router/src/analytics/core.rs
deleted file mode 100644
index bf124a6c0e85..000000000000
--- a/crates/router/src/analytics/core.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use api_models::analytics::{
-    payments::PaymentDimensions, refunds::RefundDimensions, FilterValue, GetInfoResponse,
-    GetPaymentFiltersRequest, GetRefundFilterRequest, PaymentFiltersResponse, RefundFilterValue,
-    RefundFiltersResponse,
-};
-use error_stack::ResultExt;
-
-use super::{
-    errors::{self, AnalyticsError},
-    payments::filters::{get_payment_filter_for_dimension, FilterRow},
-    refunds::filters::{get_refund_filter_for_dimension, RefundFilterRow},
-    types::AnalyticsDomain,
-    utils, AnalyticsProvider,
-};
-use crate::{services::ApplicationResponse, types::domain};
-
-pub type AnalyticsApiResponse<T> = errors::AnalyticsResult<ApplicationResponse<T>>;
-
-pub async fn get_domain_info(domain: AnalyticsDomain) -> AnalyticsApiResponse<GetInfoResponse> {
-    let info = match domain {
-        AnalyticsDomain::Payments => GetInfoResponse {
-            metrics: utils::get_payment_metrics_info(),
-            download_dimensions: None,
-            dimensions: utils::get_payment_dimensions(),
-        },
-        AnalyticsDomain::Refunds => GetInfoResponse {
-            metrics: utils::get_refund_metrics_info(),
-            download_dimensions: None,
-            dimensions: utils::get_refund_dimensions(),
-        },
-    };
-    Ok(ApplicationResponse::Json(info))
-}
-
-pub async fn payment_filters_core(
-    pool: AnalyticsProvider,
-    req: GetPaymentFiltersRequest,
-    merchant: domain::MerchantAccount,
-) -> AnalyticsApiResponse<PaymentFiltersResponse> {
-    let mut res = PaymentFiltersResponse::default();
-
-    for dim in req.group_by_names {
-        let values = match pool.clone() {
-            AnalyticsProvider::Sqlx(pool) => {
-                get_payment_filter_for_dimension(dim, &merchant.merchant_id, &req.time_range, &pool)
-                    .await
-            }
-        }
-        .change_context(AnalyticsError::UnknownError)?
-        .into_iter()
-        .filter_map(|fil: FilterRow| match dim {
-            PaymentDimensions::Currency => fil.currency.map(|i| i.as_ref().to_string()),
-            PaymentDimensions::PaymentStatus => fil.status.map(|i| i.as_ref().to_string()),
-            PaymentDimensions::Connector => fil.connector,
-            PaymentDimensions::AuthType => fil.authentication_type.map(|i| i.as_ref().to_string()),
-            PaymentDimensions::PaymentMethod => fil.payment_method,
-        })
-        .collect::<Vec<String>>();
-        res.query_data.push(FilterValue {
-            dimension: dim,
-            values,
-        })
-    }
-
-    Ok(ApplicationResponse::Json(res))
-}
-
-pub async fn refund_filter_core(
-    pool: AnalyticsProvider,
-    req: GetRefundFilterRequest,
-    merchant: domain::MerchantAccount,
-) -> AnalyticsApiResponse<RefundFiltersResponse> {
-    let mut res = RefundFiltersResponse::default();
-    for dim in req.group_by_names {
-        let values = match pool.clone() {
-            AnalyticsProvider::Sqlx(pool) => {
-                get_refund_filter_for_dimension(dim, &merchant.merchant_id, &req.time_range, &pool)
-                    .await
-            }
-        }
-        .change_context(AnalyticsError::UnknownError)?
-        .into_iter()
-        .filter_map(|fil: RefundFilterRow| match dim {
-            RefundDimensions::Currency => fil.currency.map(|i| i.as_ref().to_string()),
-            RefundDimensions::RefundStatus => fil.refund_status.map(|i| i.as_ref().to_string()),
-            RefundDimensions::Connector => fil.connector,
-            RefundDimensions::RefundType => fil.refund_type.map(|i| i.as_ref().to_string()),
-        })
-        .collect::<Vec<String>>();
-        res.query_data.push(RefundFilterValue {
-            dimension: dim,
-            values,
-        })
-    }
-    Ok(ApplicationResponse::Json(res))
-}
diff --git a/crates/router/src/analytics/payments.rs b/crates/router/src/analytics/payments.rs
deleted file mode 100644
index 527bf75a3c72..000000000000
--- a/crates/router/src/analytics/payments.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub mod accumulator;
-mod core;
-pub mod filters;
-pub mod metrics;
-pub mod types;
-pub use accumulator::{PaymentMetricAccumulator, PaymentMetricsAccumulator};
-
-pub trait PaymentAnalytics:
-    metrics::PaymentMetricAnalytics + filters::PaymentFilterAnalytics
-{
-}
-
-pub use self::core::get_metrics;
diff --git a/crates/router/src/analytics/payments/core.rs b/crates/router/src/analytics/payments/core.rs
deleted file mode 100644
index 23eca8879a70..000000000000
--- a/crates/router/src/analytics/payments/core.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use std::collections::HashMap;
-
-use api_models::analytics::{
-    payments::{MetricsBucketResponse, PaymentMetrics, PaymentMetricsBucketIdentifier},
-    AnalyticsMetadata, GetPaymentMetricRequest, MetricsResponse,
-};
-use error_stack::{IntoReport, ResultExt};
-use router_env::{
-    instrument, logger,
-    tracing::{self, Instrument},
-};
-
-use super::PaymentMetricsAccumulator;
-use crate::{
-    analytics::{
-        core::AnalyticsApiResponse, errors::AnalyticsError, metrics,
-        payments::PaymentMetricAccumulator, AnalyticsProvider,
-    },
-    services::ApplicationResponse,
-    types::domain,
-};
-
-#[instrument(skip_all)]
-pub async fn get_metrics(
-    pool: AnalyticsProvider,
-    merchant_account: domain::MerchantAccount,
-    req: GetPaymentMetricRequest,
-) -> AnalyticsApiResponse<MetricsResponse<MetricsBucketResponse>> {
-    let mut metrics_accumulator: HashMap<
-        PaymentMetricsBucketIdentifier,
-        PaymentMetricsAccumulator,
-    > = HashMap::new();
-
-    let mut set = tokio::task::JoinSet::new();
-    for metric_type in req.metrics.iter().cloned() {
-        let req = req.clone();
-        let merchant_id = merchant_account.merchant_id.clone();
-        let pool = pool.clone();
-        let task_span = tracing::debug_span!(
-            "analytics_payments_query",
-            payment_metric = metric_type.as_ref()
-        );
-        set.spawn(
-            async move {
-                let data = pool
-                    .get_payment_metrics(
-                        &metric_type,
-                        &req.group_by_names.clone(),
-                        &merchant_id,
-                        &req.filters,
-                        &req.time_series.map(|t| t.granularity),
-                        &req.time_range,
-                    )
-                    .await
-                    .change_context(AnalyticsError::UnknownError);
-                (metric_type, data)
-            }
-            .instrument(task_span),
-        );
-    }
-
-    while let Some((metric, data)) = set
-        .join_next()
-        .await
-        .transpose()
-        .into_report()
-        .change_context(AnalyticsError::UnknownError)?
-    {
-        let data = data?;
-        let attributes = &[
-            metrics::request::add_attributes("metric_type", metric.to_string()),
-            metrics::request::add_attributes(
-                "source",
-                match pool {
-                    crate::analytics::AnalyticsProvider::Sqlx(_) => "Sqlx",
-                },
-            ),
-        ];
-
-        let value = u64::try_from(data.len());
-        if let Ok(val) = value {
-            metrics::BUCKETS_FETCHED.record(&metrics::CONTEXT, val, attributes);
-            logger::debug!("Attributes: {:?}, Buckets fetched: {}", attributes, val);
-        }
-
-        for (id, value) in data {
-            logger::debug!(bucket_id=?id, bucket_value=?value, "Bucket row for metric {metric}");
-            let metrics_builder = metrics_accumulator.entry(id).or_default();
-            match metric {
-                PaymentMetrics::PaymentSuccessRate => metrics_builder
-                    .payment_success_rate
-                    .add_metrics_bucket(&value),
-                PaymentMetrics::PaymentCount => {
-                    metrics_builder.payment_count.add_metrics_bucket(&value)
-                }
-                PaymentMetrics::PaymentSuccessCount => {
-                    metrics_builder.payment_success.add_metrics_bucket(&value)
-                }
-                PaymentMetrics::PaymentProcessedAmount => {
-                    metrics_builder.processed_amount.add_metrics_bucket(&value)
-                }
-                PaymentMetrics::AvgTicketSize => {
-                    metrics_builder.avg_ticket_size.add_metrics_bucket(&value)
-                }
-            }
-        }
-
-        logger::debug!(
-            "Analytics Accumulated Results: metric: {}, results: {:#?}",
-            metric,
-            metrics_accumulator
-        );
-    }
-
-    let query_data: Vec<MetricsBucketResponse> = metrics_accumulator
-        .into_iter()
-        .map(|(id, val)| MetricsBucketResponse {
-            values: val.collect(),
-            dimensions: id,
-        })
-        .collect();
-
-    Ok(ApplicationResponse::Json(MetricsResponse {
-        query_data,
-        meta_data: [AnalyticsMetadata {
-            current_time_range: req.time_range,
-        }],
-    }))
-}
diff --git a/crates/router/src/analytics/refunds/core.rs b/crates/router/src/analytics/refunds/core.rs
deleted file mode 100644
index 4c2d2c394181..000000000000
--- a/crates/router/src/analytics/refunds/core.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use std::collections::HashMap;
-
-use api_models::analytics::{
-    refunds::{RefundMetrics, RefundMetricsBucketIdentifier, RefundMetricsBucketResponse},
-    AnalyticsMetadata, GetRefundMetricRequest, MetricsResponse,
-};
-use error_stack::{IntoReport, ResultExt};
-use router_env::{
-    logger,
-    tracing::{self, Instrument},
-};
-
-use super::RefundMetricsAccumulator;
-use crate::{
-    analytics::{
-        core::AnalyticsApiResponse, errors::AnalyticsError, refunds::RefundMetricAccumulator,
-        AnalyticsProvider,
-    },
-    services::ApplicationResponse,
-    types::domain,
-};
-
-pub async fn get_metrics(
-    pool: AnalyticsProvider,
-    merchant_account: domain::MerchantAccount,
-    req: GetRefundMetricRequest,
-) -> AnalyticsApiResponse<MetricsResponse<RefundMetricsBucketResponse>> {
-    let mut metrics_accumulator: HashMap<RefundMetricsBucketIdentifier, RefundMetricsAccumulator> =
-        HashMap::new();
-    let mut set = tokio::task::JoinSet::new();
-    for metric_type in req.metrics.iter().cloned() {
-        let req = req.clone();
-        let merchant_id = merchant_account.merchant_id.clone();
-        let pool = pool.clone();
-        let task_span = tracing::debug_span!(
-            "analytics_refund_query",
-            refund_metric = metric_type.as_ref()
-        );
-        set.spawn(
-            async move {
-                let data = pool
-                    .get_refund_metrics(
-                        &metric_type,
-                        &req.group_by_names.clone(),
-                        &merchant_id,
-                        &req.filters,
-                        &req.time_series.map(|t| t.granularity),
-                        &req.time_range,
-                    )
-                    .await
-                    .change_context(AnalyticsError::UnknownError);
-                (metric_type, data)
-            }
-            .instrument(task_span),
-        );
-    }
-
-    while let Some((metric, data)) = set
-        .join_next()
-        .await
-        .transpose()
-        .into_report()
-        .change_context(AnalyticsError::UnknownError)?
-    {
-        for (id, value) in data? {
-            logger::debug!(bucket_id=?id, bucket_value=?value, "Bucket row for metric {metric}");
-            let metrics_builder = metrics_accumulator.entry(id).or_default();
-            match metric {
-                RefundMetrics::RefundSuccessRate => metrics_builder
-                    .refund_success_rate
-                    .add_metrics_bucket(&value),
-                RefundMetrics::RefundCount => {
-                    metrics_builder.refund_count.add_metrics_bucket(&value)
-                }
-                RefundMetrics::RefundSuccessCount => {
-                    metrics_builder.refund_success.add_metrics_bucket(&value)
-                }
-                RefundMetrics::RefundProcessedAmount => {
-                    metrics_builder.processed_amount.add_metrics_bucket(&value)
-                }
-            }
-        }
-
-        logger::debug!(
-            "Analytics Accumulated Results: metric: {}, results: {:#?}",
-            metric,
-            metrics_accumulator
-        );
-    }
-    let query_data: Vec<RefundMetricsBucketResponse> = metrics_accumulator
-        .into_iter()
-        .map(|(id, val)| RefundMetricsBucketResponse {
-            values: val.collect(),
-            dimensions: id,
-        })
-        .collect();
-
-    Ok(ApplicationResponse::Json(MetricsResponse {
-        query_data,
-        meta_data: [AnalyticsMetadata {
-            current_time_range: req.time_range,
-        }],
-    }))
-}
diff --git a/crates/router/src/analytics/routes.rs b/crates/router/src/analytics/routes.rs
deleted file mode 100644
index 113312cdf10f..000000000000
--- a/crates/router/src/analytics/routes.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use actix_web::{web, Responder, Scope};
-use api_models::analytics::{
-    GetPaymentFiltersRequest, GetPaymentMetricRequest, GetRefundFilterRequest,
-    GetRefundMetricRequest,
-};
-use router_env::AnalyticsFlow;
-
-use super::{core::*, payments, refunds, types::AnalyticsDomain};
-use crate::{
-    core::api_locking,
-    services::{
-        api, authentication as auth, authentication::AuthenticationData,
-        authorization::permissions::Permission,
-    },
-    AppState,
-};
-
-pub struct Analytics;
-
-impl Analytics {
-    pub fn server(state: AppState) -> Scope {
-        let route = web::scope("/analytics/v1").app_data(web::Data::new(state));
-        route
-            .service(web::resource("metrics/payments").route(web::post().to(get_payment_metrics)))
-            .service(web::resource("metrics/refunds").route(web::post().to(get_refunds_metrics)))
-            .service(web::resource("filters/payments").route(web::post().to(get_payment_filters)))
-            .service(web::resource("filters/refunds").route(web::post().to(get_refund_filters)))
-            .service(web::resource("{domain}/info").route(web::get().to(get_info)))
-    }
-}
-
-pub async fn get_info(
-    state: web::Data<AppState>,
-    req: actix_web::HttpRequest,
-    domain: actix_web::web::Path<AnalyticsDomain>,
-) -> impl Responder {
-    let flow = AnalyticsFlow::GetInfo;
-    api::server_wrap(
-        flow,
-        state,
-        &req,
-        domain.into_inner(),
-        |_, _, domain| get_domain_info(domain),
-        &auth::NoAuth,
-        api_locking::LockAction::NotApplicable,
-    )
-    .await
-}
-
-/// # Panics
-///
-/// Panics if `json_payload` array does not contain one `GetPaymentMetricRequest` element.
-pub async fn get_payment_metrics(
-    state: web::Data<AppState>,
-    req: actix_web::HttpRequest,
-    json_payload: web::Json<[GetPaymentMetricRequest; 1]>,
-) -> impl Responder {
-    // safety: This shouldn't panic owing to the data type
-    #[allow(clippy::expect_used)]
-    let payload = json_payload
-        .into_inner()
-        .to_vec()
-        .pop()
-        .expect("Couldn't get GetPaymentMetricRequest");
-    let flow = AnalyticsFlow::GetPaymentMetrics;
-    api::server_wrap(
-        flow,
-        state,
-        &req,
-        payload,
-        |state, auth: AuthenticationData, req| {
-            payments::get_metrics(state.pool.clone(), auth.merchant_account, req)
-        },
-        auth::auth_type(
-            &auth::ApiKeyAuth,
-            &auth::JWTAuth(Permission::Analytics),
-            req.headers(),
-        ),
-        api_locking::LockAction::NotApplicable,
-    )
-    .await
-}
-
-/// # Panics
-///
-/// Panics if `json_payload` array does not contain one `GetRefundMetricRequest` element.
-pub async fn get_refunds_metrics(
-    state: web::Data<AppState>,
-    req: actix_web::HttpRequest,
-    json_payload: web::Json<[GetRefundMetricRequest; 1]>,
-) -> impl Responder {
-    #[allow(clippy::expect_used)]
-    // safety: This shouldn't panic owing to the data type
-    let payload = json_payload
-        .into_inner()
-        .to_vec()
-        .pop()
-        .expect("Couldn't get GetRefundMetricRequest");
-    let flow = AnalyticsFlow::GetRefundsMetrics;
-    api::server_wrap(
-        flow,
-        state,
-        &req,
-        payload,
-        |state, auth: AuthenticationData, req| {
-            refunds::get_metrics(state.pool.clone(), auth.merchant_account, req)
-        },
-        auth::auth_type(
-            &auth::ApiKeyAuth,
-            &auth::JWTAuth(Permission::Analytics),
-            req.headers(),
-        ),
-        api_locking::LockAction::NotApplicable,
-    )
-    .await
-}
-
-pub async fn get_payment_filters(
-    state: web::Data<AppState>,
-    req: actix_web::HttpRequest,
-    json_payload: web::Json<GetPaymentFiltersRequest>,
-) -> impl Responder {
-    let flow = AnalyticsFlow::GetPaymentFilters;
-    api::server_wrap(
-        flow,
-        state,
-        &req,
-        json_payload.into_inner(),
-        |state, auth: AuthenticationData, req| {
-            payment_filters_core(state.pool.clone(), req, auth.merchant_account)
-        },
-        auth::auth_type(
-            &auth::ApiKeyAuth,
-            &auth::JWTAuth(Permission::Analytics),
-            req.headers(),
-        ),
-        api_locking::LockAction::NotApplicable,
-    )
-    .await
-}
-
-pub async fn get_refund_filters(
-    state: web::Data<AppState>,
-    req: actix_web::HttpRequest,
-    json_payload: web::Json<GetRefundFilterRequest>,
-) -> impl Responder {
-    let flow = AnalyticsFlow::GetRefundFilters;
-    api::server_wrap(
-        flow,
-        state,
-        &req,
-        json_payload.into_inner(),
-        |state, auth: AuthenticationData, req: GetRefundFilterRequest| {
-            refund_filter_core(state.pool.clone(), req, auth.merchant_account)
-        },
-        auth::auth_type(
-            &auth::ApiKeyAuth,
-            &auth::JWTAuth(Permission::Analytics),
-            req.headers(),
-        ),
-        api_locking::LockAction::NotApplicable,
-    )
-    .await
-}
diff --git a/crates/router/src/bin/scheduler.rs b/crates/router/src/bin/scheduler.rs
index 4c19408582bc..32e9cfc6ca29 100644
--- a/crates/router/src/bin/scheduler.rs
+++ b/crates/router/src/bin/scheduler.rs
@@ -20,7 +20,6 @@ use strum::EnumString;
 use tokio::sync::{mpsc, oneshot};
 
 const SCHEDULER_FLOW: &str = "SCHEDULER_FLOW";
-
 #[tokio::main]
 async fn main() -> CustomResult<(), ProcessTrackerError> {
     // console_subscriber::init();
@@ -30,7 +29,6 @@ async fn main() -> CustomResult<(), ProcessTrackerError> {
     #[allow(clippy::expect_used)]
     let conf = Settings::with_config_path(cmd_line.config_path)
         .expect("Unable to construct application configuration");
-
     let api_client = Box::new(
         services::ProxyClient::new(
             conf.proxy.clone(),
diff --git a/crates/router/src/configs/defaults.rs b/crates/router/src/configs/defaults.rs
index 2eddaf3084d7..f9bfcae1ca10 100644
--- a/crates/router/src/configs/defaults.rs
+++ b/crates/router/src/configs/defaults.rs
@@ -30,6 +30,8 @@ impl Default for super::settings::Database {
             pool_size: 5,
             connection_timeout: 10,
             queue_strategy: Default::default(),
+            min_idle: None,
+            max_lifetime: None,
         }
     }
 }
@@ -501,15 +503,6 @@ impl Default for super::settings::RequiredFields {
                                                     value: None,
                                                 }
                                             ),
-                                            (
-                                                "payment_method_data.card.card_holder_name".to_string(),
-                                                RequiredFieldInfo {
-                                                    required_field: "payment_method_data.card.card_holder_name".to_string(),
-                                                    display_name: "card_holder_name".to_string(),
-                                                    field_type: enums::FieldType::UserFullName,
-                                                    value: None,
-                                                }
-                                            ),
                                             (
                                                 "email".to_string(),
                                                 RequiredFieldInfo {
@@ -1908,14 +1901,63 @@ impl Default for super::settings::RequiredFields {
                                                 }
                                             ),
                                             (
-                                                "payment_method_data.card.card_holder_name".to_string(),
+                                                "billing.address.first_name".to_string(),
                                                 RequiredFieldInfo {
-                                                    required_field: "payment_method_data.card.card_holder_name".to_string(),
+                                                    required_field: "billing.address.first_name".to_string(),
                                                     display_name: "card_holder_name".to_string(),
-                                                    field_type: enums::FieldType::UserFullName,
+                                                    field_type: enums::FieldType::UserBillingName,
                                                     value: None,
                                                 }
-                                            )
+                                            ),
+                                            (
+                                                "billing.address.last_name".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.last_name".to_string(),
+                                                    display_name: "card_holder_name".to_string(),
+                                                    field_type: enums::FieldType::UserBillingName,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.line1".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.line1".to_string(),
+                                                    display_name: "line1".to_string(),
+                                                    field_type: enums::FieldType::UserAddressLine1,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.city".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.city".to_string(),
+                                                    display_name: "city".to_string(),
+                                                    field_type: enums::FieldType::UserAddressCity,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.zip".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.zip".to_string(),
+                                                    display_name: "zip".to_string(),
+                                                    field_type: enums::FieldType::UserAddressPincode,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.country".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.country".to_string(),
+                                                    display_name: "country".to_string(),
+                                                    field_type: enums::FieldType::UserAddressCountry{
+                                                        options: vec![
+                                                            "ALL".to_string(),
+                                                        ]
+                                                    },
+                                                    value: None,
+                                                }
+                                            ),
                                         ]
                                     ),
                                     common: HashMap::new()
@@ -2367,6 +2409,129 @@ impl Default for super::settings::RequiredFields {
                                     common: HashMap::new(),
                                 }
                             ),
+                            (
+                                enums::Connector::Bankofamerica,
+                                RequiredFieldFinal {
+                                    mandate: HashMap::new(),
+                                    non_mandate: HashMap::from(
+                                        [
+                                            (
+                                                "payment_method_data.card.card_number".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "payment_method_data.card.card_number".to_string(),
+                                                    display_name: "card_number".to_string(),
+                                                    field_type: enums::FieldType::UserCardNumber,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "payment_method_data.card.card_exp_month".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "payment_method_data.card.card_exp_month".to_string(),
+                                                    display_name: "card_exp_month".to_string(),
+                                                    field_type: enums::FieldType::UserCardExpiryMonth,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "payment_method_data.card.card_exp_year".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "payment_method_data.card.card_exp_year".to_string(),
+                                                    display_name: "card_exp_year".to_string(),
+                                                    field_type: enums::FieldType::UserCardExpiryYear,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "payment_method_data.card.card_cvc".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "payment_method_data.card.card_cvc".to_string(),
+                                                    display_name: "card_cvc".to_string(),
+                                                    field_type: enums::FieldType::UserCardCvc,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "email".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "email".to_string(),
+                                                    display_name: "email".to_string(),
+                                                    field_type: enums::FieldType::UserEmailAddress,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.first_name".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.first_name".to_string(),
+                                                    display_name: "billing_first_name".to_string(),
+                                                    field_type: enums::FieldType::UserBillingName,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.last_name".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.last_name".to_string(),
+                                                    display_name: "billing_last_name".to_string(),
+                                                    field_type: enums::FieldType::UserBillingName,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.city".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.city".to_string(),
+                                                    display_name: "city".to_string(),
+                                                    field_type: enums::FieldType::UserAddressCity,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.state".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.state".to_string(),
+                                                    display_name: "state".to_string(),
+                                                    field_type: enums::FieldType::UserAddressState,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.zip".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.zip".to_string(),
+                                                    display_name: "zip".to_string(),
+                                                    field_type: enums::FieldType::UserAddressPincode,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.country".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.country".to_string(),
+                                                    display_name: "country".to_string(),
+                                                    field_type: enums::FieldType::UserAddressCountry{
+                                                        options: vec![
+                                                            "ALL".to_string(),
+                                                        ]
+                                                    },
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.line1".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.line1".to_string(),
+                                                    display_name: "line1".to_string(),
+                                                    field_type: enums::FieldType::UserAddressLine1,
+                                                    value: None,
+                                                }
+                                            ),
+                                        ]
+                                    ),
+                                    common: HashMap::new(),
+                                }
+                            ),
                             (
                                 enums::Connector::Bluesnap,
                                 RequiredFieldFinal {
@@ -3684,14 +3849,63 @@ impl Default for super::settings::RequiredFields {
                                                 }
                                             ),
                                             (
-                                                "payment_method_data.card.card_holder_name".to_string(),
+                                                "billing.address.first_name".to_string(),
                                                 RequiredFieldInfo {
-                                                    required_field: "payment_method_data.card.card_holder_name".to_string(),
+                                                    required_field: "billing.address.first_name".to_string(),
                                                     display_name: "card_holder_name".to_string(),
-                                                    field_type: enums::FieldType::UserFullName,
+                                                    field_type: enums::FieldType::UserBillingName,
                                                     value: None,
                                                 }
-                                            )
+                                            ),
+                                            (
+                                                "billing.address.last_name".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.last_name".to_string(),
+                                                    display_name: "card_holder_name".to_string(),
+                                                    field_type: enums::FieldType::UserBillingName,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.line1".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.line1".to_string(),
+                                                    display_name: "line1".to_string(),
+                                                    field_type: enums::FieldType::UserAddressLine1,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.city".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.city".to_string(),
+                                                    display_name: "city".to_string(),
+                                                    field_type: enums::FieldType::UserAddressCity,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.zip".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.zip".to_string(),
+                                                    display_name: "zip".to_string(),
+                                                    field_type: enums::FieldType::UserAddressPincode,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.country".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.country".to_string(),
+                                                    display_name: "country".to_string(),
+                                                    field_type: enums::FieldType::UserAddressCountry{
+                                                        options: vec![
+                                                            "ALL".to_string(),
+                                                        ]
+                                                    },
+                                                    value: None,
+                                                }
+                                            ),
                                         ]
                                     ),
                                     common: HashMap::new()
@@ -4054,6 +4268,64 @@ impl Default for super::settings::RequiredFields {
                                                     value: None,
                                                 }
                                             ),
+                                            (
+                                                "billing.address.first_name".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.first_name".to_string(),
+                                                    display_name: "card_holder_name".to_string(),
+                                                    field_type: enums::FieldType::UserBillingName,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.last_name".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.last_name".to_string(),
+                                                    display_name: "card_holder_name".to_string(),
+                                                    field_type: enums::FieldType::UserBillingName,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.line1".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.line1".to_string(),
+                                                    display_name: "line1".to_string(),
+                                                    field_type: enums::FieldType::UserAddressLine1,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.city".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.city".to_string(),
+                                                    display_name: "city".to_string(),
+                                                    field_type: enums::FieldType::UserAddressCity,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.zip".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.zip".to_string(),
+                                                    display_name: "zip".to_string(),
+                                                    field_type: enums::FieldType::UserAddressPincode,
+                                                    value: None,
+                                                }
+                                            ),
+                                            (
+                                                "billing.address.country".to_string(),
+                                                RequiredFieldInfo {
+                                                    required_field: "billing.address.country".to_string(),
+                                                    display_name: "country".to_string(),
+                                                    field_type: enums::FieldType::UserAddressCountry{
+                                                        options: vec![
+                                                            "ALL".to_string(),
+                                                        ]
+                                                    },
+                                                    value: None,
+                                                }
+                                            ),
                                         ]),
                                     }
                                 )
@@ -4092,6 +4364,93 @@ impl Default for super::settings::RequiredFields {
                                         common: HashMap::new(),
                                     }
                                 ),
+                                (
+                                    enums::Connector::Bankofamerica,
+                                    RequiredFieldFinal {
+                                        mandate: HashMap::new(),
+                                        non_mandate: HashMap::from(
+                                            [
+                                                (
+                                                    "email".to_string(),
+                                                    RequiredFieldInfo {
+                                                        required_field: "email".to_string(),
+                                                        display_name: "email".to_string(),
+                                                        field_type: enums::FieldType::UserEmailAddress,
+                                                        value: None,
+                                                    }
+                                                ),
+                                                (
+                                                    "billing.address.first_name".to_string(),
+                                                    RequiredFieldInfo {
+                                                        required_field: "billing.address.first_name".to_string(),
+                                                        display_name: "billing_first_name".to_string(),
+                                                        field_type: enums::FieldType::UserBillingName,
+                                                        value: None,
+                                                    }
+                                                ),
+                                                (
+                                                    "billing.address.last_name".to_string(),
+                                                    RequiredFieldInfo {
+                                                        required_field: "billing.address.last_name".to_string(),
+                                                        display_name: "billing_last_name".to_string(),
+                                                        field_type: enums::FieldType::UserBillingName,
+                                                        value: None,
+                                                    }
+                                                ),
+                                                (
+                                                    "billing.address.city".to_string(),
+                                                    RequiredFieldInfo {
+                                                        required_field: "billing.address.city".to_string(),
+                                                        display_name: "city".to_string(),
+                                                        field_type: enums::FieldType::UserAddressCity,
+                                                        value: None,
+                                                    }
+                                                ),
+                                                (
+                                                    "billing.address.state".to_string(),
+                                                    RequiredFieldInfo {
+                                                        required_field: "billing.address.state".to_string(),
+                                                        display_name: "state".to_string(),
+                                                        field_type: enums::FieldType::UserAddressState,
+                                                        value: None,
+                                                    }
+                                                ),
+                                                (
+                                                    "billing.address.zip".to_string(),
+                                                    RequiredFieldInfo {
+                                                        required_field: "billing.address.zip".to_string(),
+                                                        display_name: "zip".to_string(),
+                                                        field_type: enums::FieldType::UserAddressPincode,
+                                                        value: None,
+                                                    }
+                                                ),
+                                                (
+                                                    "billing.address.country".to_string(),
+                                                    RequiredFieldInfo {
+                                                        required_field: "billing.address.country".to_string(),
+                                                        display_name: "country".to_string(),
+                                                        field_type: enums::FieldType::UserAddressCountry{
+                                                            options: vec![
+                                                                "ALL".to_string(),
+                                                            ]
+                                                        },
+                                                        value: None,
+                                                    }
+                                                ),
+                                                (
+                                                    "billing.address.line1".to_string(),
+                                                    RequiredFieldInfo {
+                                                        required_field: "billing.address.line1".to_string(),
+                                                        display_name: "line1".to_string(),
+                                                        field_type: enums::FieldType::UserAddressLine1,
+                                                        value: None,
+                                                    }
+                                                ),
+                                            ]
+                                        ),
+                                        common: HashMap::new(),
+                                    }
+                                ),
                                ]),
                         },
                     ),
diff --git a/crates/router/src/configs/kms.rs b/crates/router/src/configs/kms.rs
index 205169fa291b..37f2d15774a5 100644
--- a/crates/router/src/configs/kms.rs
+++ b/crates/router/src/configs/kms.rs
@@ -63,7 +63,9 @@ impl KmsDecrypt for settings::Database {
             password: self.password.decrypt_inner(kms_client).await?.into(),
             pool_size: self.pool_size,
             connection_timeout: self.connection_timeout,
-            queue_strategy: self.queue_strategy.into(),
+            queue_strategy: self.queue_strategy,
+            min_idle: self.min_idle,
+            max_lifetime: self.max_lifetime,
         })
     }
 }
diff --git a/crates/router/src/configs/settings.rs b/crates/router/src/configs/settings.rs
index 0007e636926c..f2d962b0abee 100644
--- a/crates/router/src/configs/settings.rs
+++ b/crates/router/src/configs/settings.rs
@@ -4,6 +4,8 @@ use std::{
     str::FromStr,
 };
 
+#[cfg(feature = "olap")]
+use analytics::ReportConfig;
 use api_models::{enums, payment_methods::RequiredFieldInfo};
 use common_utils::ext_traits::ConfigExt;
 use config::{Environment, File};
@@ -13,14 +15,17 @@ use external_services::email::EmailSettings;
 use external_services::kms;
 use redis_interface::RedisSettings;
 pub use router_env::config::{Log, LogConsole, LogFile, LogTelemetry};
+use rust_decimal::Decimal;
 use scheduler::SchedulerSettings;
 use serde::{de::Error, Deserialize, Deserializer};
+use storage_impl::config::QueueStrategy;
 
 #[cfg(feature = "olap")]
 use crate::analytics::AnalyticsConfig;
 use crate::{
     core::errors::{ApplicationError, ApplicationResult},
     env::{self, logger, Env},
+    events::EventsConfig,
 };
 #[cfg(feature = "kms")]
 pub type Password = kms::KmsValue;
@@ -70,6 +75,7 @@ pub struct Settings {
     pub secrets: Secrets,
     pub locker: Locker,
     pub connectors: Connectors,
+    pub forex_api: ForexApi,
     pub refund: Refund,
     pub eph_key: EphemeralConfig,
     pub scheduler: Option<SchedulerSettings>,
@@ -107,6 +113,9 @@ pub struct Settings {
     pub analytics: AnalyticsConfig,
     #[cfg(feature = "kv_store")]
     pub kv_config: KvConfig,
+    #[cfg(feature = "olap")]
+    pub report_download_config: ReportConfig,
+    pub events: EventsConfig,
 }
 
 #[derive(Debug, Deserialize, Clone)]
@@ -119,6 +128,37 @@ pub struct PaymentLink {
     pub sdk_url: String,
 }
 
+#[derive(Debug, Deserialize, Clone, Default)]
+#[serde(default)]
+pub struct ForexApi {
+    pub local_fetch_retry_count: u64,
+    pub api_key: masking::Secret<String>,
+    pub fallback_api_key: masking::Secret<String>,
+    /// in ms
+    pub call_delay: i64,
+    /// in ms
+    pub local_fetch_retry_delay: u64,
+    /// in ms
+    pub api_timeout: u64,
+    /// in ms
+    pub redis_lock_timeout: u64,
+}
+
+#[derive(Debug, Deserialize, Clone, Default)]
+pub struct DefaultExchangeRates {
+    pub base_currency: String,
+    pub conversion: HashMap<String, Conversion>,
+    pub timestamp: i64,
+}
+
+#[derive(Debug, Deserialize, Clone, Default)]
+pub struct Conversion {
+    #[serde(with = "rust_decimal::serde::str")]
+    pub to_factor: Decimal,
+    #[serde(with = "rust_decimal::serde::str")]
+    pub from_factor: Decimal,
+}
+
 #[derive(Debug, Deserialize, Clone, Default)]
 #[serde(default)]
 pub struct ApplepayMerchantConfigs {
@@ -484,23 +524,8 @@ pub struct Database {
     pub pool_size: u32,
     pub connection_timeout: u64,
     pub queue_strategy: QueueStrategy,
-}
-
-#[derive(Debug, Deserialize, Clone, Default)]
-#[serde(rename_all = "PascalCase")]
-pub enum QueueStrategy {
-    #[default]
-    Fifo,
-    Lifo,
-}
-
-impl From<QueueStrategy> for bb8::QueueStrategy {
-    fn from(value: QueueStrategy) -> Self {
-        match value {
-            QueueStrategy::Fifo => Self::Fifo,
-            QueueStrategy::Lifo => Self::Lifo,
-        }
-    }
+    pub min_idle: Option<u32>,
+    pub max_lifetime: Option<u64>,
 }
 
 #[cfg(not(feature = "kms"))]
@@ -515,6 +540,8 @@ impl From<Database> for storage_impl::config::Database {
             pool_size: val.pool_size,
             connection_timeout: val.connection_timeout,
             queue_strategy: val.queue_strategy.into(),
+            min_idle: val.min_idle,
+            max_lifetime: val.max_lifetime,
         }
     }
 }
@@ -800,6 +827,7 @@ impl Settings {
         #[cfg(feature = "s3")]
         self.file_upload_config.validate()?;
         self.lock_settings.validate()?;
+        self.events.validate()?;
         Ok(())
     }
 }
diff --git a/crates/router/src/connector/aci/transformers.rs b/crates/router/src/connector/aci/transformers.rs
index f56369ed31ab..9cfb657bdca8 100644
--- a/crates/router/src/connector/aci/transformers.rs
+++ b/crates/router/src/connector/aci/transformers.rs
@@ -409,7 +409,8 @@ impl TryFrom<&AciRouterData<&types::PaymentsAuthorizeRouterData>> for AciPayment
             | api::PaymentMethodData::GiftCard(_)
             | api::PaymentMethodData::CardRedirect(_)
             | api::PaymentMethodData::Upi(_)
-            | api::PaymentMethodData::Voucher(_) => Err(errors::ConnectorError::NotSupported {
+            | api::PaymentMethodData::Voucher(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotSupported {
                 message: format!("{:?}", item.router_data.payment_method),
                 connector: "Aci",
             })?,
@@ -732,6 +733,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/adyen.rs b/crates/router/src/connector/adyen.rs
index e101b796b8d4..ddd93bc289a9 100644
--- a/crates/router/src/connector/adyen.rs
+++ b/crates/router/src/connector/adyen.rs
@@ -14,11 +14,8 @@ use crate::{
     configs::settings,
     connector::utils as connector_utils,
     consts,
-    core::{
-        self,
-        errors::{self, CustomResult},
-    },
-    headers, logger, routes,
+    core::errors::{self, CustomResult},
+    headers, logger,
     services::{
         self,
         request::{self, Mask},
@@ -560,7 +557,6 @@ impl
     }
 }
 
-#[async_trait::async_trait]
 impl
     services::ConnectorIntegration<
         api::Authorize,
@@ -568,49 +564,6 @@ impl
         types::PaymentsResponseData,
     > for Adyen
 {
-    async fn execute_pretasks(
-        &self,
-        router_data: &mut types::PaymentsAuthorizeRouterData,
-        app_state: &routes::AppState,
-    ) -> CustomResult<(), errors::ConnectorError> {
-        match &router_data.request.payment_method_data {
-            api_models::payments::PaymentMethodData::GiftCard(gift_card_data) => {
-                match gift_card_data.as_ref() {
-                    api_models::payments::GiftCardData::Givex(_) => {
-                        let integ: Box<
-                            &(dyn services::ConnectorIntegration<
-                                api::Balance,
-                                types::PaymentsAuthorizeData,
-                                types::PaymentsResponseData,
-                            > + Send
-                                  + Sync
-                                  + 'static),
-                        > = Box::new(&Self);
-
-                        let authorize_data = &types::PaymentsBalanceRouterData::from((
-                            &router_data.to_owned(),
-                            router_data.request.clone(),
-                        ));
-
-                        let resp = services::execute_connector_processing_step(
-                            app_state,
-                            integ,
-                            authorize_data,
-                            core::payments::CallConnectorAction::Trigger,
-                            None,
-                        )
-                        .await?;
-                        router_data.payment_method_balance = resp.payment_method_balance;
-
-                        Ok(())
-                    }
-                    _ => Ok(()),
-                }
-            }
-            _ => Ok(()),
-        }
-    }
-
     fn get_headers(
         &self,
         req: &types::PaymentsAuthorizeRouterData,
@@ -667,7 +620,6 @@ impl
         req: &types::PaymentsAuthorizeRouterData,
         connectors: &settings::Connectors,
     ) -> CustomResult<Option<services::Request>, errors::ConnectorError> {
-        check_for_payment_method_balance(req)?;
         Ok(Some(
             services::RequestBuilder::new()
                 .method(services::Method::Post)
@@ -725,28 +677,23 @@ impl
     }
 }
 
+impl api::PaymentsPreProcessing for Adyen {}
+
 impl
     services::ConnectorIntegration<
-        api::Balance,
-        types::PaymentsAuthorizeData,
+        api::PreProcessing,
+        types::PaymentsPreProcessingData,
         types::PaymentsResponseData,
     > for Adyen
 {
     fn get_headers(
         &self,
-        req: &types::PaymentsBalanceRouterData,
+        req: &types::PaymentsPreProcessingRouterData,
         _connectors: &settings::Connectors,
-    ) -> CustomResult<Vec<(String, request::Maskable<String>)>, errors::ConnectorError>
-    where
-        Self: services::ConnectorIntegration<
-            api::Balance,
-            types::PaymentsAuthorizeData,
-            types::PaymentsResponseData,
-        >,
-    {
+    ) -> CustomResult<Vec<(String, request::Maskable<String>)>, errors::ConnectorError> {
         let mut header = vec![(
             headers::CONTENT_TYPE.to_string(),
-            types::PaymentsBalanceType::get_content_type(self)
+            types::PaymentsPreProcessingType::get_content_type(self)
                 .to_string()
                 .into(),
         )];
@@ -757,7 +704,7 @@ impl
 
     fn get_url(
         &self,
-        _req: &types::PaymentsBalanceRouterData,
+        _req: &types::PaymentsPreProcessingRouterData,
         connectors: &settings::Connectors,
     ) -> CustomResult<String, errors::ConnectorError> {
         Ok(format!(
@@ -768,7 +715,7 @@ impl
 
     fn get_request_body(
         &self,
-        req: &types::PaymentsBalanceRouterData,
+        req: &types::PaymentsPreProcessingRouterData,
         _connectors: &settings::Connectors,
     ) -> CustomResult<Option<types::RequestBody>, errors::ConnectorError> {
         let connector_req = adyen::AdyenBalanceRequest::try_from(req)?;
@@ -783,18 +730,20 @@ impl
 
     fn build_request(
         &self,
-        req: &types::PaymentsBalanceRouterData,
+        req: &types::PaymentsPreProcessingRouterData,
         connectors: &settings::Connectors,
     ) -> CustomResult<Option<services::Request>, errors::ConnectorError> {
         Ok(Some(
             services::RequestBuilder::new()
                 .method(services::Method::Post)
-                .url(&types::PaymentsBalanceType::get_url(self, req, connectors)?)
+                .url(&types::PaymentsPreProcessingType::get_url(
+                    self, req, connectors,
+                )?)
                 .attach_default_headers()
-                .headers(types::PaymentsBalanceType::get_headers(
+                .headers(types::PaymentsPreProcessingType::get_headers(
                     self, req, connectors,
                 )?)
-                .body(types::PaymentsBalanceType::get_request_body(
+                .body(types::PaymentsPreProcessingType::get_request_body(
                     self, req, connectors,
                 )?)
                 .build(),
@@ -803,19 +752,47 @@ impl
 
     fn handle_response(
         &self,
-        data: &types::PaymentsBalanceRouterData,
+        data: &types::PaymentsPreProcessingRouterData,
         res: types::Response,
-    ) -> CustomResult<types::PaymentsBalanceRouterData, errors::ConnectorError> {
+    ) -> CustomResult<types::PaymentsPreProcessingRouterData, errors::ConnectorError> {
         let response: adyen::AdyenBalanceResponse = res
             .response
             .parse_struct("AdyenBalanceResponse")
             .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
-        types::RouterData::try_from(types::ResponseRouterData {
-            response,
-            data: data.clone(),
-            http_code: res.status_code,
-        })
-        .change_context(errors::ConnectorError::ResponseHandlingFailed)
+
+        let currency = match data.request.currency {
+            Some(currency) => currency,
+            None => Err(errors::ConnectorError::MissingRequiredField {
+                field_name: "currency",
+            })?,
+        };
+        let amount = match data.request.amount {
+            Some(amount) => amount,
+            None => Err(errors::ConnectorError::MissingRequiredField {
+                field_name: "amount",
+            })?,
+        };
+
+        if response.balance.currency != currency || response.balance.value < amount {
+            Ok(types::RouterData {
+                response: Err(types::ErrorResponse {
+                    code: consts::NO_ERROR_CODE.to_string(),
+                    message: consts::NO_ERROR_MESSAGE.to_string(),
+                    reason: Some(consts::LOW_BALANCE_ERROR_MESSAGE.to_string()),
+                    status_code: res.status_code,
+                    attempt_status: Some(enums::AttemptStatus::Failure),
+                    connector_transaction_id: None,
+                }),
+                ..data.clone()
+            })
+        } else {
+            types::RouterData::try_from(types::ResponseRouterData {
+                response,
+                data: data.clone(),
+                http_code: res.status_code,
+            })
+            .change_context(errors::ConnectorError::ResponseHandlingFailed)
+        }
     }
 
     fn get_error_response(
@@ -1634,7 +1611,7 @@ impl api::IncomingWebhook for Adyen {
             .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;
         Ok(api::disputes::DisputePayload {
             amount: notif.amount.value.to_string(),
-            currency: notif.amount.currency,
+            currency: notif.amount.currency.to_string(),
             dispute_stage: api_models::enums::DisputeStage::from(notif.event_code.clone()),
             connector_dispute_id: notif.psp_reference,
             connector_reason: notif.reason,
@@ -1646,27 +1623,3 @@ impl api::IncomingWebhook for Adyen {
         })
     }
 }
-
-pub fn check_for_payment_method_balance(
-    req: &types::PaymentsAuthorizeRouterData,
-) -> CustomResult<(), errors::ConnectorError> {
-    match &req.request.payment_method_data {
-        api_models::payments::PaymentMethodData::GiftCard(gift_card) => match gift_card.as_ref() {
-            api_models::payments::GiftCardData::Givex(_) => {
-                let payment_method_balance = req
-                    .payment_method_balance
-                    .as_ref()
-                    .ok_or(errors::ConnectorError::RequestEncodingFailed)?;
-                if payment_method_balance.currency != req.request.currency.to_string()
-                    || payment_method_balance.amount < req.request.amount
-                {
-                    Err(errors::ConnectorError::InSufficientBalanceInPaymentMethod.into())
-                } else {
-                    Ok(())
-                }
-            }
-            _ => Ok(()),
-        },
-        _ => Ok(()),
-    }
-}
diff --git a/crates/router/src/connector/adyen/transformers.rs b/crates/router/src/connector/adyen/transformers.rs
index a75e3b8ff179..1793e3e07a87 100644
--- a/crates/router/src/connector/adyen/transformers.rs
+++ b/crates/router/src/connector/adyen/transformers.rs
@@ -213,8 +213,8 @@ pub struct AdyenBalanceRequest<'a> {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct AdyenBalanceResponse {
-    psp_reference: String,
-    balance: Amount,
+    pub psp_reference: String,
+    pub balance: Amount,
 }
 
 /// This implementation will be used only in Authorize, Automatic capture flow.
@@ -397,8 +397,8 @@ pub enum ActionType {
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize)]
 pub struct Amount {
-    currency: String,
-    value: i64,
+    pub currency: storage_enums::Currency,
+    pub value: i64,
 }
 
 #[derive(Debug, Clone, Serialize)]
@@ -879,7 +879,126 @@ impl TryFrom<&api_enums::BankNames> for OpenBankingUKIssuer {
             api::enums::BankNames::TsbBank => Ok(Self::TsbBank),
             api::enums::BankNames::TescoBank => Ok(Self::TescoBank),
             api::enums::BankNames::UlsterBank => Ok(Self::UlsterBank),
-            _ => Err(errors::ConnectorError::NotSupported {
+            enums::BankNames::AmericanExpress
+            | enums::BankNames::AffinBank
+            | enums::BankNames::AgroBank
+            | enums::BankNames::AllianceBank
+            | enums::BankNames::AmBank
+            | enums::BankNames::BankOfAmerica
+            | enums::BankNames::BankIslam
+            | enums::BankNames::BankMuamalat
+            | enums::BankNames::BankRakyat
+            | enums::BankNames::BankSimpananNasional
+            | enums::BankNames::BlikPSP
+            | enums::BankNames::CapitalOne
+            | enums::BankNames::Chase
+            | enums::BankNames::Citi
+            | enums::BankNames::CimbBank
+            | enums::BankNames::Discover
+            | enums::BankNames::NavyFederalCreditUnion
+            | enums::BankNames::PentagonFederalCreditUnion
+            | enums::BankNames::SynchronyBank
+            | enums::BankNames::WellsFargo
+            | enums::BankNames::AbnAmro
+            | enums::BankNames::AsnBank
+            | enums::BankNames::Bunq
+            | enums::BankNames::Handelsbanken
+            | enums::BankNames::HongLeongBank
+            | enums::BankNames::Ing
+            | enums::BankNames::Knab
+            | enums::BankNames::KuwaitFinanceHouse
+            | enums::BankNames::Moneyou
+            | enums::BankNames::Rabobank
+            | enums::BankNames::Regiobank
+            | enums::BankNames::SnsBank
+            | enums::BankNames::TriodosBank
+            | enums::BankNames::VanLanschot
+            | enums::BankNames::ArzteUndApothekerBank
+            | enums::BankNames::AustrianAnadiBankAg
+            | enums::BankNames::BankAustria
+            | enums::BankNames::Bank99Ag
+            | enums::BankNames::BankhausCarlSpangler
+            | enums::BankNames::BankhausSchelhammerUndSchatteraAg
+            | enums::BankNames::BankMillennium
+            | enums::BankNames::BankPEKAOSA
+            | enums::BankNames::BawagPskAg
+            | enums::BankNames::BksBankAg
+            | enums::BankNames::BrullKallmusBankAg
+            | enums::BankNames::BtvVierLanderBank
+            | enums::BankNames::CapitalBankGraweGruppeAg
+            | enums::BankNames::CeskaSporitelna
+            | enums::BankNames::Dolomitenbank
+            | enums::BankNames::EasybankAg
+            | enums::BankNames::EPlatbyVUB
+            | enums::BankNames::ErsteBankUndSparkassen
+            | enums::BankNames::FrieslandBank
+            | enums::BankNames::HypoAlpeadriabankInternationalAg
+            | enums::BankNames::HypoNoeLbFurNiederosterreichUWien
+            | enums::BankNames::HypoOberosterreichSalzburgSteiermark
+            | enums::BankNames::HypoTirolBankAg
+            | enums::BankNames::HypoVorarlbergBankAg
+            | enums::BankNames::HypoBankBurgenlandAktiengesellschaft
+            | enums::BankNames::KomercniBanka
+            | enums::BankNames::MBank
+            | enums::BankNames::MarchfelderBank
+            | enums::BankNames::Maybank
+            | enums::BankNames::OberbankAg
+            | enums::BankNames::OsterreichischeArzteUndApothekerbank
+            | enums::BankNames::OcbcBank
+            | enums::BankNames::PayWithING
+            | enums::BankNames::PlaceZIPKO
+            | enums::BankNames::PlatnoscOnlineKartaPlatnicza
+            | enums::BankNames::PosojilnicaBankEGen
+            | enums::BankNames::PostovaBanka
+            | enums::BankNames::PublicBank
+            | enums::BankNames::RaiffeisenBankengruppeOsterreich
+            | enums::BankNames::RhbBank
+            | enums::BankNames::SchelhammerCapitalBankAg
+            | enums::BankNames::StandardCharteredBank
+            | enums::BankNames::SchoellerbankAg
+            | enums::BankNames::SpardaBankWien
+            | enums::BankNames::SporoPay
+            | enums::BankNames::TatraPay
+            | enums::BankNames::Viamo
+            | enums::BankNames::VolksbankGruppe
+            | enums::BankNames::VolkskreditbankAg
+            | enums::BankNames::VrBankBraunau
+            | enums::BankNames::UobBank
+            | enums::BankNames::PayWithAliorBank
+            | enums::BankNames::BankiSpoldzielcze
+            | enums::BankNames::PayWithInteligo
+            | enums::BankNames::BNPParibasPoland
+            | enums::BankNames::BankNowySA
+            | enums::BankNames::CreditAgricole
+            | enums::BankNames::PayWithBOS
+            | enums::BankNames::PayWithCitiHandlowy
+            | enums::BankNames::PayWithPlusBank
+            | enums::BankNames::ToyotaBank
+            | enums::BankNames::VeloBank
+            | enums::BankNames::ETransferPocztowy24
+            | enums::BankNames::PlusBank
+            | enums::BankNames::EtransferPocztowy24
+            | enums::BankNames::BankiSpbdzielcze
+            | enums::BankNames::BankNowyBfgSa
+            | enums::BankNames::GetinBank
+            | enums::BankNames::Blik
+            | enums::BankNames::NoblePay
+            | enums::BankNames::IdeaBank
+            | enums::BankNames::EnveloBank
+            | enums::BankNames::NestPrzelew
+            | enums::BankNames::MbankMtransfer
+            | enums::BankNames::Inteligo
+            | enums::BankNames::PbacZIpko
+            | enums::BankNames::BnpParibas
+            | enums::BankNames::BankPekaoSa
+            | enums::BankNames::VolkswagenBank
+            | enums::BankNames::AliorBank
+            | enums::BankNames::Boz
+            | enums::BankNames::BangkokBank
+            | enums::BankNames::KrungsriBank
+            | enums::BankNames::KrungThaiBank
+            | enums::BankNames::TheSiamCommercialBank
+            | enums::BankNames::KasikornBank => Err(errors::ConnectorError::NotSupported {
                 message: String::from("BankRedirect"),
                 connector: "Adyen",
             })?,
@@ -1380,7 +1499,8 @@ impl<'a> TryFrom<&AdyenRouterData<&types::PaymentsAuthorizeRouterData>>
                 payments::PaymentMethodData::Crypto(_)
                 | payments::PaymentMethodData::MandatePayment
                 | payments::PaymentMethodData::Reward
-                | payments::PaymentMethodData::Upi(_) => {
+                | payments::PaymentMethodData::Upi(_)
+                | payments::PaymentMethodData::CardToken(_) => {
                     Err(errors::ConnectorError::NotSupported {
                         message: utils::SELECTED_PAYMENT_METHOD.to_string(),
                         connector: "Adyen",
@@ -1391,11 +1511,11 @@ impl<'a> TryFrom<&AdyenRouterData<&types::PaymentsAuthorizeRouterData>>
     }
 }
 
-impl<'a> TryFrom<&types::PaymentsBalanceRouterData> for AdyenBalanceRequest<'a> {
+impl<'a> TryFrom<&types::PaymentsPreProcessingRouterData> for AdyenBalanceRequest<'a> {
     type Error = Error;
-    fn try_from(item: &types::PaymentsBalanceRouterData) -> Result<Self, Self::Error> {
+    fn try_from(item: &types::PaymentsPreProcessingRouterData) -> Result<Self, Self::Error> {
         let payment_method = match &item.request.payment_method_data {
-            payments::PaymentMethodData::GiftCard(gift_card_data) => {
+            Some(payments::PaymentMethodData::GiftCard(gift_card_data)) => {
                 match gift_card_data.as_ref() {
                     payments::GiftCardData::Givex(gift_card_data) => {
                         let balance_pm = BalancePmData {
@@ -1509,7 +1629,7 @@ fn get_channel_type(pm_type: &Option<storage_enums::PaymentMethodType>) -> Optio
 
 fn get_amount_data(item: &AdyenRouterData<&types::PaymentsAuthorizeRouterData>) -> Amount {
     Amount {
-        currency: item.router_data.request.currency.to_string(),
+        currency: item.router_data.request.currency,
         value: item.amount.to_owned(),
     }
 }
@@ -2101,7 +2221,12 @@ impl<'a> TryFrom<&api_models::payments::BankRedirectData> for AdyenPaymentMethod
             ),
             api_models::payments::BankRedirectData::OpenBankingUk { issuer, .. } => Ok(
                 AdyenPaymentMethod::OpenBankingUK(Box::new(OpenBankingUKData {
-                    issuer: OpenBankingUKIssuer::try_from(issuer)?,
+                    issuer: match issuer {
+                        Some(bank_name) => OpenBankingUKIssuer::try_from(bank_name)?,
+                        None => Err(errors::ConnectorError::MissingRequiredField {
+                            field_name: "issuer",
+                        })?,
+                    },
                 })),
             ),
             api_models::payments::BankRedirectData::Sofort { .. } => Ok(AdyenPaymentMethod::Sofort),
@@ -2276,7 +2401,8 @@ impl<'a>
                     | payments::PaymentMethodData::Reward
                     | payments::PaymentMethodData::Upi(_)
                     | payments::PaymentMethodData::Voucher(_)
-                    | payments::PaymentMethodData::GiftCard(_) => {
+                    | payments::PaymentMethodData::GiftCard(_)
+                    | api::PaymentMethodData::CardToken(_) => {
                         Err(errors::ConnectorError::NotSupported {
                             message: "Network tokenization for payment method".to_string(),
                             connector: "Adyen",
@@ -2578,7 +2704,7 @@ impl<'a>
         let additional_data = get_additional_data(item.router_data);
         let return_url = item.router_data.request.get_return_url()?;
         let payment_method = AdyenPaymentMethod::try_from(bank_redirect_data)?;
-        let (shopper_locale, country) = get_redirect_extra_details(item.router_data);
+        let (shopper_locale, country) = get_redirect_extra_details(item.router_data)?;
         let line_items = Some(get_line_items(item));
 
         Ok(AdyenPaymentRequest {
@@ -2609,7 +2735,7 @@ impl<'a>
 
 fn get_redirect_extra_details(
     item: &types::PaymentsAuthorizeRouterData,
-) -> (Option<String>, Option<api_enums::CountryAlpha2>) {
+) -> Result<(Option<String>, Option<api_enums::CountryAlpha2>), errors::ConnectorError> {
     match item.request.payment_method_data {
         api_models::payments::PaymentMethodData::BankRedirect(ref redirect_data) => {
             match redirect_data {
@@ -2617,17 +2743,20 @@ fn get_redirect_extra_details(
                     country,
                     preferred_language,
                     ..
-                } => (
+                } => Ok((
                     Some(preferred_language.to_string()),
                     Some(country.to_owned()),
-                ),
+                )),
                 api_models::payments::BankRedirectData::OpenBankingUk { country, .. } => {
-                    (None, Some(country.to_owned()))
+                    let country = country.ok_or(errors::ConnectorError::MissingRequiredField {
+                        field_name: "country",
+                    })?;
+                    Ok((None, Some(country)))
                 }
-                _ => (None, None),
+                _ => Ok((None, None)),
             }
         }
-        _ => (None, None),
+        _ => Ok((None, None)),
     }
 }
 
@@ -2849,18 +2978,31 @@ impl TryFrom<types::PaymentsCancelResponseRouterData<AdyenCancelResponse>>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
     }
 }
 
-impl TryFrom<types::PaymentsBalanceResponseRouterData<AdyenBalanceResponse>>
-    for types::PaymentsBalanceRouterData
+impl<F>
+    TryFrom<
+        types::ResponseRouterData<
+            F,
+            AdyenBalanceResponse,
+            types::PaymentsPreProcessingData,
+            types::PaymentsResponseData,
+        >,
+    > for types::RouterData<F, types::PaymentsPreProcessingData, types::PaymentsResponseData>
 {
     type Error = Error;
     fn try_from(
-        item: types::PaymentsBalanceResponseRouterData<AdyenBalanceResponse>,
+        item: types::ResponseRouterData<
+            F,
+            AdyenBalanceResponse,
+            types::PaymentsPreProcessingData,
+            types::PaymentsResponseData,
+        >,
     ) -> Result<Self, Self::Error> {
         Ok(Self {
             response: Ok(types::PaymentsResponseData::TransactionResponse {
@@ -2870,6 +3012,7 @@ impl TryFrom<types::PaymentsBalanceResponseRouterData<AdyenBalanceResponse>>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             payment_method_balance: Some(types::PaymentMethodBalance {
                 amount: item.response.balance.value,
@@ -2931,6 +3074,7 @@ pub fn get_adyen_response(
         connector_metadata: None,
         network_txn_id,
         connector_response_reference_id: Some(response.merchant_reference),
+        incremental_authorization_allowed: None,
     };
     Ok((status, error, payments_response_data))
 }
@@ -3030,6 +3174,7 @@ pub fn get_redirection_response(
         connector_metadata,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
     Ok((status, error, payments_response_data))
 }
@@ -3081,6 +3226,7 @@ pub fn get_present_to_shopper_response(
         connector_metadata,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
     Ok((status, error, payments_response_data))
 }
@@ -3129,6 +3275,7 @@ pub fn get_qr_code_response(
         connector_metadata,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
     Ok((status, error, payments_response_data))
 }
@@ -3163,6 +3310,7 @@ pub fn get_redirection_error_response(
         connector_metadata: None,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
 
     Ok((status, error, payments_response_data))
@@ -3455,7 +3603,7 @@ impl TryFrom<&AdyenRouterData<&types::PaymentsCaptureRouterData>> for AdyenCaptu
             merchant_account: auth_type.merchant_account,
             reference,
             amount: Amount {
-                currency: item.router_data.request.currency.to_string(),
+                currency: item.router_data.request.currency,
                 value: item.amount.to_owned(),
             },
         })
@@ -3497,6 +3645,7 @@ impl TryFrom<types::PaymentsCaptureResponseRouterData<AdyenCaptureResponse>>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             amount_captured: Some(item.response.amount.value),
             ..item.data
@@ -3545,7 +3694,7 @@ impl<F> TryFrom<&AdyenRouterData<&types::RefundsRouterData<F>>> for AdyenRefundR
         Ok(Self {
             merchant_account: auth_type.merchant_account,
             amount: Amount {
-                currency: item.router_data.request.currency.to_string(),
+                currency: item.router_data.request.currency,
                 value: item.router_data.request.refund_amount,
             },
             merchant_refund_reason: item.router_data.request.reason.clone(),
@@ -3627,7 +3776,7 @@ pub struct AdyenAdditionalDataWH {
 #[derive(Debug, Deserialize)]
 pub struct AdyenAmountWH {
     pub value: i64,
-    pub currency: String,
+    pub currency: storage_enums::Currency,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, strum::Display, PartialEq)]
@@ -3953,7 +4102,7 @@ impl<F> TryFrom<&AdyenRouterData<&types::PayoutsRouterData<F>>> for AdyenPayoutE
             )?;
         Ok(Self {
             amount: Amount {
-                currency: item.router_data.request.destination_currency.to_string(),
+                currency: item.router_data.request.destination_currency,
                 value: item.amount.to_owned(),
             },
             merchant_account: auth_type.merchant_account,
@@ -4028,7 +4177,7 @@ impl<F> TryFrom<&AdyenRouterData<&types::PayoutsRouterData<F>>> for AdyenPayoutC
                 Ok(Self {
                     amount: Amount {
                         value: item.amount.to_owned(),
-                        currency: item.router_data.request.destination_currency.to_string(),
+                        currency: item.router_data.request.destination_currency,
                     },
                     recurring: RecurringContract {
                         contract: Contract::Payout,
@@ -4075,7 +4224,7 @@ impl<F> TryFrom<&AdyenRouterData<&types::PayoutsRouterData<F>>> for AdyenPayoutF
                 Ok(Self::Card(Box::new(PayoutFulfillCardRequest {
                     amount: Amount {
                         value: item.amount.to_owned(),
-                        currency: item.router_data.request.destination_currency.to_string(),
+                        currency: item.router_data.request.destination_currency,
                     },
                     card: get_payout_card_details(&item.router_data.get_payout_method_data()?)
                         .map_or(
diff --git a/crates/router/src/connector/airwallex/transformers.rs b/crates/router/src/connector/airwallex/transformers.rs
index 457b8d075487..2de7f6fe00ff 100644
--- a/crates/router/src/connector/airwallex/transformers.rs
+++ b/crates/router/src/connector/airwallex/transformers.rs
@@ -196,7 +196,8 @@ impl TryFrom<&AirwallexRouterData<&types::PaymentsAuthorizeRouterData>>
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("airwallex"),
             )),
         }?;
@@ -554,6 +555,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -595,6 +597,7 @@ impl
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/authorizedotnet/transformers.rs b/crates/router/src/connector/authorizedotnet/transformers.rs
index 2c8a63a53e5c..30323ca4ef23 100644
--- a/crates/router/src/connector/authorizedotnet/transformers.rs
+++ b/crates/router/src/connector/authorizedotnet/transformers.rs
@@ -610,6 +610,7 @@ impl<F, T>
                             connector_response_reference_id: Some(
                                 transaction_response.transaction_id.clone(),
                             ),
+                            incremental_authorization_allowed: None,
                         }),
                     },
                     ..item.data
@@ -680,6 +681,7 @@ impl<F, T>
                             connector_response_reference_id: Some(
                                 transaction_response.transaction_id.clone(),
                             ),
+                            incremental_authorization_allowed: None,
                         }),
                     },
                     ..item.data
@@ -977,6 +979,7 @@ impl<F, Req>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: Some(transaction.transaction_id.clone()),
+                        incremental_authorization_allowed: None,
                     }),
                     status: payment_status,
                     ..item.data
diff --git a/crates/router/src/connector/bambora/transformers.rs b/crates/router/src/connector/bambora/transformers.rs
index e686186c901b..2d50569f9a49 100644
--- a/crates/router/src/connector/bambora/transformers.rs
+++ b/crates/router/src/connector/bambora/transformers.rs
@@ -215,6 +215,7 @@ impl<F, T>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: Some(pg_response.order_number.to_string()),
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             }),
@@ -241,6 +242,7 @@ impl<F, T>
                         connector_response_reference_id: Some(
                             item.data.connector_request_reference_id.to_string(),
                         ),
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
diff --git a/crates/router/src/connector/bankofamerica/transformers.rs b/crates/router/src/connector/bankofamerica/transformers.rs
index 70db9a6d8797..18ec8ceb89d9 100644
--- a/crates/router/src/connector/bankofamerica/transformers.rs
+++ b/crates/router/src/connector/bankofamerica/transformers.rs
@@ -410,7 +410,8 @@ impl TryFrom<&BankOfAmericaRouterData<&types::PaymentsAuthorizeRouterData>>
             | payments::PaymentMethodData::Reward
             | payments::PaymentMethodData::Upi(_)
             | payments::PaymentMethodData::Voucher(_)
-            | payments::PaymentMethodData::GiftCard(_) => {
+            | payments::PaymentMethodData::GiftCard(_)
+            | payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     utils::get_unimplemented_payment_method_error_message("Bank of America"),
                 )
@@ -527,6 +528,7 @@ impl<F>
                             .code
                             .unwrap_or(info_response.id),
                     ),
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             }),
@@ -584,6 +586,7 @@ impl<F>
                             .code
                             .unwrap_or(info_response.id),
                     ),
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             }),
@@ -641,6 +644,7 @@ impl<F>
                             .code
                             .unwrap_or(info_response.id),
                     ),
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             }),
@@ -718,6 +722,7 @@ impl<F>
                         .client_reference_information
                         .map(|cref| cref.code)
                         .unwrap_or(Some(app_response.id)),
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             }),
@@ -732,6 +737,7 @@ impl<F>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: Some(error_response.id),
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             }),
diff --git a/crates/router/src/connector/bitpay/transformers.rs b/crates/router/src/connector/bitpay/transformers.rs
index 89dd2368b2b7..0ddf2dbf913b 100644
--- a/crates/router/src/connector/bitpay/transformers.rs
+++ b/crates/router/src/connector/bitpay/transformers.rs
@@ -178,6 +178,7 @@ impl<F, T>
                     .data
                     .order_id
                     .or(Some(item.response.data.id)),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/bluesnap.rs b/crates/router/src/connector/bluesnap.rs
index 0bc56d4e9955..25cdcb731f11 100644
--- a/crates/router/src/connector/bluesnap.rs
+++ b/crates/router/src/connector/bluesnap.rs
@@ -713,6 +713,7 @@ impl ConnectorIntegration<api::Authorize, types::PaymentsAuthorizeData, types::P
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..data.clone()
                 })
diff --git a/crates/router/src/connector/bluesnap/transformers.rs b/crates/router/src/connector/bluesnap/transformers.rs
index fe92c337a012..3a980aee8199 100644
--- a/crates/router/src/connector/bluesnap/transformers.rs
+++ b/crates/router/src/connector/bluesnap/transformers.rs
@@ -221,7 +221,8 @@ impl TryFrom<&BluesnapRouterData<&types::PaymentsAuthorizeRouterData>>
             | payments::PaymentMethodData::Upi(_)
             | payments::PaymentMethodData::CardRedirect(_)
             | payments::PaymentMethodData::Voucher(_)
-            | payments::PaymentMethodData::GiftCard(_) => {
+            | payments::PaymentMethodData::GiftCard(_)
+            | payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     "Selected payment method via Token flow through bluesnap".to_string(),
                 ))
@@ -240,160 +241,160 @@ impl TryFrom<&BluesnapRouterData<&types::PaymentsAuthorizeRouterData>> for Blues
             Some(enums::CaptureMethod::Manual) => BluesnapTxnType::AuthOnly,
             _ => BluesnapTxnType::AuthCapture,
         };
-        let (payment_method, card_holder_info) =
-            match item.router_data.request.payment_method_data.clone() {
-                api::PaymentMethodData::Card(ref ccard) => Ok((
-                    PaymentMethodDetails::CreditCard(Card {
-                        card_number: ccard.card_number.clone(),
-                        expiration_month: ccard.card_exp_month.clone(),
-                        expiration_year: ccard.get_expiry_year_4_digit(),
-                        security_code: ccard.card_cvc.clone(),
-                    }),
-                    get_card_holder_info(
-                        item.router_data.get_billing_address()?,
-                        item.router_data.request.get_email()?,
-                    )?,
-                )),
-                api::PaymentMethodData::Wallet(wallet_data) => match wallet_data {
-                    api_models::payments::WalletData::GooglePay(payment_method_data) => {
-                        let gpay_object =
-                            Encode::<BluesnapGooglePayObject>::encode_to_string_of_json(
-                                &BluesnapGooglePayObject {
-                                    payment_method_data: utils::GooglePayWalletData::from(
-                                        payment_method_data,
-                                    ),
-                                },
-                            )
-                            .change_context(errors::ConnectorError::RequestEncodingFailed)?;
-                        Ok((
-                            PaymentMethodDetails::Wallet(BluesnapWallet {
-                                wallet_type: BluesnapWalletTypes::GooglePay,
-                                encoded_payment_token: Secret::new(
-                                    consts::BASE64_ENGINE.encode(gpay_object),
-                                ),
-                            }),
-                            None,
-                        ))
+        let (payment_method, card_holder_info) = match item
+            .router_data
+            .request
+            .payment_method_data
+            .clone()
+        {
+            api::PaymentMethodData::Card(ref ccard) => Ok((
+                PaymentMethodDetails::CreditCard(Card {
+                    card_number: ccard.card_number.clone(),
+                    expiration_month: ccard.card_exp_month.clone(),
+                    expiration_year: ccard.get_expiry_year_4_digit(),
+                    security_code: ccard.card_cvc.clone(),
+                }),
+                get_card_holder_info(
+                    item.router_data.get_billing_address()?,
+                    item.router_data.request.get_email()?,
+                )?,
+            )),
+            api::PaymentMethodData::Wallet(wallet_data) => match wallet_data {
+                api_models::payments::WalletData::GooglePay(payment_method_data) => {
+                    let gpay_object = Encode::<BluesnapGooglePayObject>::encode_to_string_of_json(
+                        &BluesnapGooglePayObject {
+                            payment_method_data: utils::GooglePayWalletData::from(
+                                payment_method_data,
+                            ),
+                        },
+                    )
+                    .change_context(errors::ConnectorError::RequestEncodingFailed)?;
+                    Ok((
+                        PaymentMethodDetails::Wallet(BluesnapWallet {
+                            wallet_type: BluesnapWalletTypes::GooglePay,
+                            encoded_payment_token: Secret::new(
+                                consts::BASE64_ENGINE.encode(gpay_object),
+                            ),
+                        }),
+                        None,
+                    ))
+                }
+                api_models::payments::WalletData::ApplePay(payment_method_data) => {
+                    let apple_pay_payment_data = payment_method_data
+                        .get_applepay_decoded_payment_data()
+                        .change_context(errors::ConnectorError::RequestEncodingFailed)?;
+                    let apple_pay_payment_data: ApplePayEncodedPaymentData = apple_pay_payment_data
+                        .expose()[..]
+                        .as_bytes()
+                        .parse_struct("ApplePayEncodedPaymentData")
+                        .change_context(errors::ConnectorError::RequestEncodingFailed)?;
+
+                    let billing = item
+                        .router_data
+                        .address
+                        .billing
+                        .to_owned()
+                        .get_required_value("billing")
+                        .change_context(errors::ConnectorError::MissingRequiredField {
+                            field_name: "billing",
+                        })?;
+
+                    let billing_address = billing
+                        .address
+                        .get_required_value("billing_address")
+                        .change_context(errors::ConnectorError::MissingRequiredField {
+                            field_name: "billing",
+                        })?;
+
+                    let mut address = Vec::new();
+                    if let Some(add) = billing_address.line1.to_owned() {
+                        address.push(add)
                     }
-                    api_models::payments::WalletData::ApplePay(payment_method_data) => {
-                        let apple_pay_payment_data = payment_method_data
-                            .get_applepay_decoded_payment_data()
-                            .change_context(errors::ConnectorError::RequestEncodingFailed)?;
-                        let apple_pay_payment_data: ApplePayEncodedPaymentData =
-                            apple_pay_payment_data.expose()[..]
-                                .as_bytes()
-                                .parse_struct("ApplePayEncodedPaymentData")
-                                .change_context(errors::ConnectorError::RequestEncodingFailed)?;
-
-                        let billing = item
-                            .router_data
-                            .address
-                            .billing
-                            .to_owned()
-                            .get_required_value("billing")
-                            .change_context(errors::ConnectorError::MissingRequiredField {
-                                field_name: "billing",
-                            })?;
-
-                        let billing_address = billing
-                            .address
-                            .get_required_value("billing_address")
-                            .change_context(errors::ConnectorError::MissingRequiredField {
-                                field_name: "billing",
-                            })?;
-
-                        let mut address = Vec::new();
-                        if let Some(add) = billing_address.line1.to_owned() {
-                            address.push(add)
-                        }
-                        if let Some(add) = billing_address.line2.to_owned() {
-                            address.push(add)
-                        }
-                        if let Some(add) = billing_address.line3.to_owned() {
-                            address.push(add)
-                        }
-
-                        let apple_pay_object =
-                            Encode::<EncodedPaymentToken>::encode_to_string_of_json(
-                                &EncodedPaymentToken {
-                                    token: ApplepayPaymentData {
-                                        payment_data: apple_pay_payment_data,
-                                        payment_method: payment_method_data
-                                            .payment_method
-                                            .to_owned()
-                                            .into(),
-                                        transaction_identifier: payment_method_data
-                                            .transaction_identifier,
-                                    },
-                                    billing_contact: BillingDetails {
-                                        country_code: billing_address.country,
-                                        address_lines: Some(address),
-                                        family_name: billing_address.last_name.to_owned(),
-                                        given_name: billing_address.first_name.to_owned(),
-                                        postal_code: billing_address.zip,
-                                    },
-                                },
-                            )
-                            .change_context(errors::ConnectorError::RequestEncodingFailed)?;
-
-                        Ok((
-                            PaymentMethodDetails::Wallet(BluesnapWallet {
-                                wallet_type: BluesnapWalletTypes::ApplePay,
-                                encoded_payment_token: Secret::new(
-                                    consts::BASE64_ENGINE.encode(apple_pay_object),
-                                ),
-                            }),
-                            get_card_holder_info(
-                                item.router_data.get_billing_address()?,
-                                item.router_data.request.get_email()?,
-                            )?,
-                        ))
+                    if let Some(add) = billing_address.line2.to_owned() {
+                        address.push(add)
                     }
-                    payments::WalletData::AliPayQr(_)
-                    | payments::WalletData::AliPayRedirect(_)
-                    | payments::WalletData::AliPayHkRedirect(_)
-                    | payments::WalletData::MomoRedirect(_)
-                    | payments::WalletData::KakaoPayRedirect(_)
-                    | payments::WalletData::GoPayRedirect(_)
-                    | payments::WalletData::GcashRedirect(_)
-                    | payments::WalletData::ApplePayRedirect(_)
-                    | payments::WalletData::ApplePayThirdPartySdk(_)
-                    | payments::WalletData::DanaRedirect {}
-                    | payments::WalletData::GooglePayRedirect(_)
-                    | payments::WalletData::GooglePayThirdPartySdk(_)
-                    | payments::WalletData::MbWayRedirect(_)
-                    | payments::WalletData::MobilePayRedirect(_)
-                    | payments::WalletData::PaypalRedirect(_)
-                    | payments::WalletData::PaypalSdk(_)
-                    | payments::WalletData::SamsungPay(_)
-                    | payments::WalletData::TwintRedirect {}
-                    | payments::WalletData::VippsRedirect {}
-                    | payments::WalletData::TouchNGoRedirect(_)
-                    | payments::WalletData::WeChatPayRedirect(_)
-                    | payments::WalletData::CashappQr(_)
-                    | payments::WalletData::SwishQr(_)
-                    | payments::WalletData::WeChatPayQr(_) => {
-                        Err(errors::ConnectorError::NotImplemented(
-                            utils::get_unimplemented_payment_method_error_message("bluesnap"),
-                        ))
+                    if let Some(add) = billing_address.line3.to_owned() {
+                        address.push(add)
                     }
-                },
-                payments::PaymentMethodData::PayLater(_)
-                | payments::PaymentMethodData::BankRedirect(_)
-                | payments::PaymentMethodData::BankDebit(_)
-                | payments::PaymentMethodData::BankTransfer(_)
-                | payments::PaymentMethodData::Crypto(_)
-                | payments::PaymentMethodData::MandatePayment
-                | payments::PaymentMethodData::Reward
-                | payments::PaymentMethodData::Upi(_)
-                | payments::PaymentMethodData::CardRedirect(_)
-                | payments::PaymentMethodData::Voucher(_)
-                | payments::PaymentMethodData::GiftCard(_) => {
+
+                    let apple_pay_object = Encode::<EncodedPaymentToken>::encode_to_string_of_json(
+                        &EncodedPaymentToken {
+                            token: ApplepayPaymentData {
+                                payment_data: apple_pay_payment_data,
+                                payment_method: payment_method_data
+                                    .payment_method
+                                    .to_owned()
+                                    .into(),
+                                transaction_identifier: payment_method_data.transaction_identifier,
+                            },
+                            billing_contact: BillingDetails {
+                                country_code: billing_address.country,
+                                address_lines: Some(address),
+                                family_name: billing_address.last_name.to_owned(),
+                                given_name: billing_address.first_name.to_owned(),
+                                postal_code: billing_address.zip,
+                            },
+                        },
+                    )
+                    .change_context(errors::ConnectorError::RequestEncodingFailed)?;
+
+                    Ok((
+                        PaymentMethodDetails::Wallet(BluesnapWallet {
+                            wallet_type: BluesnapWalletTypes::ApplePay,
+                            encoded_payment_token: Secret::new(
+                                consts::BASE64_ENGINE.encode(apple_pay_object),
+                            ),
+                        }),
+                        get_card_holder_info(
+                            item.router_data.get_billing_address()?,
+                            item.router_data.request.get_email()?,
+                        )?,
+                    ))
+                }
+                payments::WalletData::AliPayQr(_)
+                | payments::WalletData::AliPayRedirect(_)
+                | payments::WalletData::AliPayHkRedirect(_)
+                | payments::WalletData::MomoRedirect(_)
+                | payments::WalletData::KakaoPayRedirect(_)
+                | payments::WalletData::GoPayRedirect(_)
+                | payments::WalletData::GcashRedirect(_)
+                | payments::WalletData::ApplePayRedirect(_)
+                | payments::WalletData::ApplePayThirdPartySdk(_)
+                | payments::WalletData::DanaRedirect {}
+                | payments::WalletData::GooglePayRedirect(_)
+                | payments::WalletData::GooglePayThirdPartySdk(_)
+                | payments::WalletData::MbWayRedirect(_)
+                | payments::WalletData::MobilePayRedirect(_)
+                | payments::WalletData::PaypalRedirect(_)
+                | payments::WalletData::PaypalSdk(_)
+                | payments::WalletData::SamsungPay(_)
+                | payments::WalletData::TwintRedirect {}
+                | payments::WalletData::VippsRedirect {}
+                | payments::WalletData::TouchNGoRedirect(_)
+                | payments::WalletData::WeChatPayRedirect(_)
+                | payments::WalletData::CashappQr(_)
+                | payments::WalletData::SwishQr(_)
+                | payments::WalletData::WeChatPayQr(_) => {
                     Err(errors::ConnectorError::NotImplemented(
                         utils::get_unimplemented_payment_method_error_message("bluesnap"),
                     ))
                 }
-            }?;
+            },
+            payments::PaymentMethodData::PayLater(_)
+            | payments::PaymentMethodData::BankRedirect(_)
+            | payments::PaymentMethodData::BankDebit(_)
+            | payments::PaymentMethodData::BankTransfer(_)
+            | payments::PaymentMethodData::Crypto(_)
+            | payments::PaymentMethodData::MandatePayment
+            | payments::PaymentMethodData::Reward
+            | payments::PaymentMethodData::Upi(_)
+            | payments::PaymentMethodData::CardRedirect(_)
+            | payments::PaymentMethodData::Voucher(_)
+            | payments::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
+                utils::get_unimplemented_payment_method_error_message("bluesnap"),
+            )),
+        }?;
         Ok(Self {
             amount: item.amount.to_owned(),
             payment_method,
@@ -855,6 +856,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.transaction_id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/boku/transformers.rs b/crates/router/src/connector/boku/transformers.rs
index 3df9126fc4c0..c671560765d0 100644
--- a/crates/router/src/connector/boku/transformers.rs
+++ b/crates/router/src/connector/boku/transformers.rs
@@ -252,6 +252,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, BokuResponse, T, types::Payments
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/braintree/braintree_graphql_transformers.rs b/crates/router/src/connector/braintree/braintree_graphql_transformers.rs
index 5069a9fe38d2..f6c1bfc46b01 100644
--- a/crates/router/src/connector/braintree/braintree_graphql_transformers.rs
+++ b/crates/router/src/connector/braintree/braintree_graphql_transformers.rs
@@ -138,7 +138,8 @@ impl TryFrom<&BraintreeRouterData<&types::PaymentsAuthorizeRouterData>>
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     utils::get_unimplemented_payment_method_error_message("braintree"),
                 )
@@ -254,6 +255,7 @@ impl<F>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
@@ -271,6 +273,7 @@ impl<F>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             }),
@@ -434,6 +437,7 @@ impl<F>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
@@ -451,6 +455,7 @@ impl<F>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             }),
@@ -494,6 +499,7 @@ impl<F>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
@@ -538,6 +544,7 @@ impl<F>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
@@ -879,12 +886,11 @@ impl TryFrom<&types::TokenizationRouterData> for BraintreeTokenRequest {
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
-                Err(errors::ConnectorError::NotImplemented(
-                    utils::get_unimplemented_payment_method_error_message("braintree"),
-                )
-                .into())
-            }
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
+                utils::get_unimplemented_payment_method_error_message("braintree"),
+            )
+            .into()),
         }
     }
 }
@@ -1061,6 +1067,7 @@ impl TryFrom<types::PaymentsCaptureResponseRouterData<BraintreeCaptureResponse>>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
@@ -1158,6 +1165,7 @@ impl<F, T>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
@@ -1255,6 +1263,7 @@ impl<F, T>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
@@ -1423,9 +1432,10 @@ fn get_braintree_redirect_form(
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => Err(
-                errors::ConnectorError::NotImplemented("given payment method".to_owned()),
-            )?,
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
+                "given payment method".to_owned(),
+            ))?,
         },
     })
 }
diff --git a/crates/router/src/connector/braintree/transformers.rs b/crates/router/src/connector/braintree/transformers.rs
index dcca9c26434c..44daef94e8a6 100644
--- a/crates/router/src/connector/braintree/transformers.rs
+++ b/crates/router/src/connector/braintree/transformers.rs
@@ -239,6 +239,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/cashtocode/transformers.rs b/crates/router/src/connector/cashtocode/transformers.rs
index cfca998e06c3..b38ca4b67132 100644
--- a/crates/router/src/connector/cashtocode/transformers.rs
+++ b/crates/router/src/connector/cashtocode/transformers.rs
@@ -238,6 +238,7 @@ impl<F, T>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                 )
             }
@@ -281,6 +282,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             amount_captured: Some(item.response.amount),
             ..item.data
diff --git a/crates/router/src/connector/checkout/transformers.rs b/crates/router/src/connector/checkout/transformers.rs
index 90e65c8b0474..ebe02f30d5ff 100644
--- a/crates/router/src/connector/checkout/transformers.rs
+++ b/crates/router/src/connector/checkout/transformers.rs
@@ -138,7 +138,8 @@ impl TryFrom<&types::TokenizationRouterData> for TokenRequest {
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
             | api_models::payments::PaymentMethodData::CardRedirect(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     utils::get_unimplemented_payment_method_error_message("checkout"),
                 )
@@ -375,11 +376,10 @@ impl TryFrom<&CheckoutRouterData<&types::PaymentsAuthorizeRouterData>> for Payme
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
             | api_models::payments::PaymentMethodData::CardRedirect(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
-                Err(errors::ConnectorError::NotImplemented(
-                    utils::get_unimplemented_payment_method_error_message("checkout"),
-                ))
-            }
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
+                utils::get_unimplemented_payment_method_error_message("checkout"),
+            )),
         }?;
 
         let three_ds = match item.router_data.auth_type {
@@ -591,6 +591,7 @@ impl TryFrom<types::PaymentsResponseRouterData<PaymentsResponse>>
             connector_response_reference_id: Some(
                 item.response.reference.unwrap_or(item.response.id),
             ),
+            incremental_authorization_allowed: None,
         };
         Ok(Self {
             status,
@@ -640,6 +641,7 @@ impl TryFrom<types::PaymentsSyncResponseRouterData<PaymentsResponse>>
             connector_response_reference_id: Some(
                 item.response.reference.unwrap_or(item.response.id),
             ),
+            incremental_authorization_allowed: None,
         };
         Ok(Self {
             status,
@@ -714,6 +716,7 @@ impl TryFrom<types::PaymentsCancelResponseRouterData<PaymentVoidResponse>>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             status: response.into(),
             ..item.data
@@ -810,6 +813,7 @@ impl TryFrom<types::PaymentsCaptureResponseRouterData<PaymentCaptureResponse>>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: item.response.reference,
+                incremental_authorization_allowed: None,
             }),
             status,
             amount_captured,
diff --git a/crates/router/src/connector/coinbase/transformers.rs b/crates/router/src/connector/coinbase/transformers.rs
index 6cc097bc9d8d..ce9bb3e871c5 100644
--- a/crates/router/src/connector/coinbase/transformers.rs
+++ b/crates/router/src/connector/coinbase/transformers.rs
@@ -146,6 +146,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.data.id.clone()),
+                incremental_authorization_allowed: None,
             }),
             |context| {
                 Ok(types::PaymentsResponseData::TransactionUnresolvedResponse{
diff --git a/crates/router/src/connector/cryptopay/transformers.rs b/crates/router/src/connector/cryptopay/transformers.rs
index 0bc4ff3b3ae6..3af604c786b8 100644
--- a/crates/router/src/connector/cryptopay/transformers.rs
+++ b/crates/router/src/connector/cryptopay/transformers.rs
@@ -80,7 +80,8 @@ impl TryFrom<&CryptopayRouterData<&types::PaymentsAuthorizeRouterData>>
             | api_models::payments::PaymentMethodData::Reward {}
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotSupported {
                     message: utils::SELECTED_PAYMENT_METHOD.to_string(),
                     connector: "CryptoPay",
@@ -172,6 +173,7 @@ impl<F, T>
                     .data
                     .custom_id
                     .or(Some(item.response.data.id)),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/cybersource.rs b/crates/router/src/connector/cybersource.rs
index 1868611184f9..1de107af086d 100644
--- a/crates/router/src/connector/cybersource.rs
+++ b/crates/router/src/connector/cybersource.rs
@@ -307,18 +307,15 @@ impl
         data: &types::SetupMandateRouterData,
         res: types::Response,
     ) -> CustomResult<types::SetupMandateRouterData, errors::ConnectorError> {
-        let response: cybersource::CybersourcePaymentsResponse = res
+        let response: cybersource::CybersourceSetupMandatesResponse = res
             .response
-            .parse_struct("CybersourceMandateResponse")
+            .parse_struct("CybersourceSetupMandatesResponse")
             .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
-        types::RouterData::try_from((
-            types::ResponseRouterData {
-                response,
-                data: data.clone(),
-                http_code: res.status_code,
-            },
-            false,
-        ))
+        types::RouterData::try_from(types::ResponseRouterData {
+            response,
+            data: data.clone(),
+            http_code: res.status_code,
+        })
     }
 
     fn get_error_response(
diff --git a/crates/router/src/connector/cybersource/transformers.rs b/crates/router/src/connector/cybersource/transformers.rs
index 33b8fa56d00e..495e23e001ad 100644
--- a/crates/router/src/connector/cybersource/transformers.rs
+++ b/crates/router/src/connector/cybersource/transformers.rs
@@ -367,7 +367,8 @@ impl TryFrom<&CybersourceRouterData<&types::PaymentsAuthorizeRouterData>>
             | payments::PaymentMethodData::Reward
             | payments::PaymentMethodData::Upi(_)
             | payments::PaymentMethodData::Voucher(_)
-            | payments::PaymentMethodData::GiftCard(_) => {
+            | payments::PaymentMethodData::GiftCard(_)
+            | payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     utils::get_unimplemented_payment_method_error_message("Cybersource"),
                 ))?
@@ -498,6 +499,16 @@ pub struct CybersourcePaymentsResponse {
     token_information: Option<CybersourceTokenInformation>,
 }
 
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CybersourceSetupMandatesResponse {
+    id: String,
+    status: CybersourcePaymentStatus,
+    error_information: Option<CybersourceErrorInformation>,
+    client_reference_information: Option<ClientReferenceInformation>,
+    token_information: Option<CybersourceTokenInformation>,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ClientReferenceInformation {
@@ -543,8 +554,9 @@ impl<F, T>
                     connector_mandate_id: Some(token_info.instrument_identifier.id),
                     payment_method_id: None,
                 });
+        let status = get_payment_status(is_capture, item.response.status.into());
         Ok(Self {
-            status: get_payment_status(is_capture, item.response.status.into()),
+            status,
             response: match item.response.error_information {
                 Some(error) => Err(types::ErrorResponse {
                     code: consts::NO_ERROR_CODE.to_string(),
@@ -552,7 +564,7 @@ impl<F, T>
                     reason: Some(error.reason),
                     status_code: item.http_code,
                     attempt_status: None,
-                    connector_transaction_id: None,
+                    connector_transaction_id: Some(item.response.id),
                 }),
                 _ => Ok(types::PaymentsResponseData::TransactionResponse {
                     resource_id: types::ResponseId::ConnectorTransactionId(
@@ -567,6 +579,74 @@ impl<F, T>
                         .client_reference_information
                         .map(|cref| cref.code)
                         .unwrap_or(Some(item.response.id)),
+                    incremental_authorization_allowed: Some(
+                        status == enums::AttemptStatus::Authorized,
+                    ),
+                }),
+            },
+            ..item.data
+        })
+    }
+}
+
+impl<F, T>
+    TryFrom<
+        types::ResponseRouterData<
+            F,
+            CybersourceSetupMandatesResponse,
+            T,
+            types::PaymentsResponseData,
+        >,
+    > for types::RouterData<F, T, types::PaymentsResponseData>
+{
+    type Error = error_stack::Report<errors::ConnectorError>;
+    fn try_from(
+        item: types::ResponseRouterData<
+            F,
+            CybersourceSetupMandatesResponse,
+            T,
+            types::PaymentsResponseData,
+        >,
+    ) -> Result<Self, Self::Error> {
+        let mandate_reference =
+            item.response
+                .token_information
+                .map(|token_info| types::MandateReference {
+                    connector_mandate_id: Some(token_info.instrument_identifier.id),
+                    payment_method_id: None,
+                });
+        let mut mandate_status: enums::AttemptStatus = item.response.status.into();
+        if matches!(mandate_status, enums::AttemptStatus::Authorized) {
+            //In case of zero auth mandates we want to make the payment reach the terminal status so we are converting the authorized status to charged as well.
+            mandate_status = enums::AttemptStatus::Charged
+        }
+        Ok(Self {
+            status: mandate_status,
+            response: match item.response.error_information {
+                Some(error) => Err(types::ErrorResponse {
+                    code: consts::NO_ERROR_CODE.to_string(),
+                    message: error.message,
+                    reason: Some(error.reason),
+                    status_code: item.http_code,
+                    attempt_status: None,
+                    connector_transaction_id: Some(item.response.id),
+                }),
+                _ => Ok(types::PaymentsResponseData::TransactionResponse {
+                    resource_id: types::ResponseId::ConnectorTransactionId(
+                        item.response.id.clone(),
+                    ),
+                    redirection_data: None,
+                    mandate_reference,
+                    connector_metadata: None,
+                    network_txn_id: None,
+                    connector_response_reference_id: item
+                        .response
+                        .client_reference_information
+                        .map(|cref| cref.code)
+                        .unwrap_or(Some(item.response.id)),
+                    incremental_authorization_allowed: Some(
+                        mandate_status == enums::AttemptStatus::Authorized,
+                    ),
                 }),
             },
             ..item.data
@@ -621,11 +701,12 @@ impl<F, T>
     ) -> Result<Self, Self::Error> {
         let item = data.0;
         let is_capture = data.1;
+        let status = get_payment_status(
+            is_capture,
+            item.response.application_information.status.into(),
+        );
         Ok(Self {
-            status: get_payment_status(
-                is_capture,
-                item.response.application_information.status.into(),
-            ),
+            status,
             response: Ok(types::PaymentsResponseData::TransactionResponse {
                 resource_id: types::ResponseId::ConnectorTransactionId(item.response.id.clone()),
                 redirection_data: None,
@@ -637,6 +718,7 @@ impl<F, T>
                     .client_reference_information
                     .map(|cref| cref.code)
                     .unwrap_or(Some(item.response.id)),
+                incremental_authorization_allowed: Some(status == enums::AttemptStatus::Authorized),
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/dlocal/transformers.rs b/crates/router/src/connector/dlocal/transformers.rs
index 668a335cce88..92d01cfe56d4 100644
--- a/crates/router/src/connector/dlocal/transformers.rs
+++ b/crates/router/src/connector/dlocal/transformers.rs
@@ -168,7 +168,8 @@ impl TryFrom<&DlocalRouterData<&types::PaymentsAuthorizeRouterData>> for DlocalP
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 crate::connector::utils::get_unimplemented_payment_method_error_message("Dlocal"),
             ))?,
         }
@@ -302,7 +303,7 @@ pub struct DlocalPaymentsResponse {
     status: DlocalPaymentStatus,
     id: String,
     three_dsecure: Option<ThreeDSecureResData>,
-    order_id: String,
+    order_id: Option<String>,
 }
 
 impl<F, T>
@@ -322,12 +323,13 @@ impl<F, T>
             });
 
         let response = types::PaymentsResponseData::TransactionResponse {
-            resource_id: types::ResponseId::ConnectorTransactionId(item.response.order_id.clone()),
+            resource_id: types::ResponseId::ConnectorTransactionId(item.response.id.clone()),
             redirection_data,
             mandate_reference: None,
             connector_metadata: None,
             network_txn_id: None,
-            connector_response_reference_id: Some(item.response.order_id.clone()),
+            connector_response_reference_id: item.response.order_id.clone(),
+            incremental_authorization_allowed: None,
         };
         Ok(Self {
             status: enums::AttemptStatus::from(item.response.status),
@@ -341,7 +343,7 @@ impl<F, T>
 pub struct DlocalPaymentsSyncResponse {
     status: DlocalPaymentStatus,
     id: String,
-    order_id: String,
+    order_id: Option<String>,
 }
 
 impl<F, T>
@@ -361,14 +363,13 @@ impl<F, T>
         Ok(Self {
             status: enums::AttemptStatus::from(item.response.status),
             response: Ok(types::PaymentsResponseData::TransactionResponse {
-                resource_id: types::ResponseId::ConnectorTransactionId(
-                    item.response.order_id.clone(),
-                ),
+                resource_id: types::ResponseId::ConnectorTransactionId(item.response.id.clone()),
                 redirection_data: None,
                 mandate_reference: None,
                 connector_metadata: None,
                 network_txn_id: None,
-                connector_response_reference_id: Some(item.response.order_id.clone()),
+                connector_response_reference_id: item.response.order_id.clone(),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -379,7 +380,7 @@ impl<F, T>
 pub struct DlocalPaymentsCaptureResponse {
     status: DlocalPaymentStatus,
     id: String,
-    order_id: String,
+    order_id: Option<String>,
 }
 
 impl<F, T>
@@ -399,14 +400,13 @@ impl<F, T>
         Ok(Self {
             status: enums::AttemptStatus::from(item.response.status),
             response: Ok(types::PaymentsResponseData::TransactionResponse {
-                resource_id: types::ResponseId::ConnectorTransactionId(
-                    item.response.order_id.clone(),
-                ),
+                resource_id: types::ResponseId::ConnectorTransactionId(item.response.id.clone()),
                 redirection_data: None,
                 mandate_reference: None,
                 connector_metadata: None,
                 network_txn_id: None,
-                connector_response_reference_id: Some(item.response.order_id.clone()),
+                connector_response_reference_id: item.response.order_id.clone(),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -443,6 +443,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.order_id.clone()),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/dummyconnector/transformers.rs b/crates/router/src/connector/dummyconnector/transformers.rs
index dc707bde42cc..3c7bd2e09d9a 100644
--- a/crates/router/src/connector/dummyconnector/transformers.rs
+++ b/crates/router/src/connector/dummyconnector/transformers.rs
@@ -250,6 +250,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, PaymentsResponse, T, types::Paym
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/fiserv/transformers.rs b/crates/router/src/connector/fiserv/transformers.rs
index 5add9b79e3f9..00109f892077 100644
--- a/crates/router/src/connector/fiserv/transformers.rs
+++ b/crates/router/src/connector/fiserv/transformers.rs
@@ -362,6 +362,7 @@ impl<F, T>
                 connector_response_reference_id: Some(
                     gateway_resp.transaction_processing_details.order_id,
                 ),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -403,6 +404,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, FiservSyncResponse, T, types::Pa
                         .order_id
                         .clone(),
                 ),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/forte/transformers.rs b/crates/router/src/connector/forte/transformers.rs
index dd78324c9b8b..4bb354f6cda7 100644
--- a/crates/router/src/connector/forte/transformers.rs
+++ b/crates/router/src/connector/forte/transformers.rs
@@ -112,7 +112,8 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for FortePaymentsRequest {
             | api_models::payments::PaymentMethodData::Reward {}
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotSupported {
                     message: utils::SELECTED_PAYMENT_METHOD.to_string(),
                     connector: "Forte",
@@ -276,6 +277,7 @@ impl<F, T>
                 })),
                 network_txn_id: None,
                 connector_response_reference_id: Some(transaction_id.to_string()),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -323,6 +325,7 @@ impl<F, T>
                 })),
                 network_txn_id: None,
                 connector_response_reference_id: Some(transaction_id.to_string()),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -390,6 +393,7 @@ impl TryFrom<types::PaymentsCaptureResponseRouterData<ForteCaptureResponse>>
                 })),
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.transaction_id.to_string()),
+                incremental_authorization_allowed: None,
             }),
             amount_captured: None,
             ..item.data
@@ -457,6 +461,7 @@ impl<F, T>
                 })),
                 network_txn_id: None,
                 connector_response_reference_id: Some(transaction_id.to_string()),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/globalpay/transformers.rs b/crates/router/src/connector/globalpay/transformers.rs
index 78a83e700267..9cef564b3795 100644
--- a/crates/router/src/connector/globalpay/transformers.rs
+++ b/crates/router/src/connector/globalpay/transformers.rs
@@ -234,6 +234,7 @@ fn get_payment_response(
             connector_metadata: None,
             network_txn_id: None,
             connector_response_reference_id: response.reference,
+            incremental_authorization_allowed: None,
         }),
     }
 }
diff --git a/crates/router/src/connector/globepay/transformers.rs b/crates/router/src/connector/globepay/transformers.rs
index ef23f48f5197..f6adacb814de 100644
--- a/crates/router/src/connector/globepay/transformers.rs
+++ b/crates/router/src/connector/globepay/transformers.rs
@@ -157,6 +157,7 @@ impl<F, T>
                     connector_metadata,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             })
@@ -230,6 +231,7 @@ impl<F, T>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             })
diff --git a/crates/router/src/connector/gocardless/transformers.rs b/crates/router/src/connector/gocardless/transformers.rs
index 72204b511518..249dae370b1a 100644
--- a/crates/router/src/connector/gocardless/transformers.rs
+++ b/crates/router/src/connector/gocardless/transformers.rs
@@ -108,7 +108,8 @@ impl TryFrom<&types::ConnectorCustomerRouterData> for GocardlessCustomerRequest
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     utils::get_unimplemented_payment_method_error_message("Gocardless"),
                 ))
@@ -297,12 +298,11 @@ impl TryFrom<&types::TokenizationRouterData> for CustomerBankAccount {
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
-                Err(errors::ConnectorError::NotImplemented(
-                    utils::get_unimplemented_payment_method_error_message("Gocardless"),
-                )
-                .into())
-            }
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
+                utils::get_unimplemented_payment_method_error_message("Gocardless"),
+            )
+            .into()),
         }
     }
 }
@@ -483,11 +483,10 @@ impl TryFrom<&types::SetupMandateRouterData> for GocardlessMandateRequest {
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
-                Err(errors::ConnectorError::NotImplemented(
-                    "Setup Mandate flow for selected payment method through Gocardless".to_string(),
-                ))
-            }
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
+                "Setup Mandate flow for selected payment method through Gocardless".to_string(),
+            )),
         }?;
         let payment_method_token = item.get_payment_method_token()?;
         let customer_bank_account = match payment_method_token {
@@ -578,6 +577,7 @@ impl<F>
             response: Ok(types::PaymentsResponseData::TransactionResponse {
                 connector_metadata: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
                 resource_id: ResponseId::NoResponseId,
                 redirection_data: None,
                 mandate_reference,
@@ -733,6 +733,7 @@ impl<F>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -767,6 +768,7 @@ impl<F>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/helcim/transformers.rs b/crates/router/src/connector/helcim/transformers.rs
index 9510ff6e67ad..dc38b2eeb253 100644
--- a/crates/router/src/connector/helcim/transformers.rs
+++ b/crates/router/src/connector/helcim/transformers.rs
@@ -141,7 +141,8 @@ impl TryFrom<&types::SetupMandateRouterData> for HelcimVerifyRequest {
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotSupported {
                     message: format!("{:?}", item.request.payment_method_data),
                     connector: "Helcim",
@@ -223,12 +224,11 @@ impl TryFrom<&HelcimRouterData<&types::PaymentsAuthorizeRouterData>> for HelcimP
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
-                Err(errors::ConnectorError::NotSupported {
-                    message: format!("{:?}", item.router_data.request.payment_method_data),
-                    connector: "Helcim",
-                })?
-            }
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotSupported {
+                message: format!("{:?}", item.router_data.request.payment_method_data),
+                connector: "Helcim",
+            })?,
         }
     }
 }
@@ -328,6 +328,7 @@ impl<F>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             status: enums::AttemptStatus::from(item.response),
             ..item.data
@@ -382,6 +383,7 @@ impl<F>
                 connector_metadata,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             status: enums::AttemptStatus::from(item.response),
             ..item.data
@@ -440,6 +442,7 @@ impl<F>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 status: enums::AttemptStatus::from(item.response),
                 ..item.data
@@ -526,6 +529,7 @@ impl<F>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             status: enums::AttemptStatus::from(item.response),
             ..item.data
@@ -588,6 +592,7 @@ impl<F>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             status: enums::AttemptStatus::from(item.response),
             ..item.data
diff --git a/crates/router/src/connector/iatapay/transformers.rs b/crates/router/src/connector/iatapay/transformers.rs
index 7cdfafc858b6..b6d2dee4a01b 100644
--- a/crates/router/src/connector/iatapay/transformers.rs
+++ b/crates/router/src/connector/iatapay/transformers.rs
@@ -286,6 +286,7 @@ impl<F, T>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: connector_response_reference_id.clone(),
+                    incremental_authorization_allowed: None,
                 }),
                 |checkout_methods| {
                     Ok(types::PaymentsResponseData::TransactionResponse {
@@ -299,6 +300,7 @@ impl<F, T>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: connector_response_reference_id.clone(),
+                        incremental_authorization_allowed: None,
                     })
                 },
             ),
diff --git a/crates/router/src/connector/klarna.rs b/crates/router/src/connector/klarna.rs
index 3bd3407c3aef..91eaf94c01ee 100644
--- a/crates/router/src/connector/klarna.rs
+++ b/crates/router/src/connector/klarna.rs
@@ -406,7 +406,8 @@ impl
             | api_payments::PaymentMethodData::Reward
             | api_payments::PaymentMethodData::Upi(_)
             | api_payments::PaymentMethodData::Voucher(_)
-            | api_payments::PaymentMethodData::GiftCard(_) => Err(error_stack::report!(
+            | api_payments::PaymentMethodData::GiftCard(_)
+            | api_payments::PaymentMethodData::CardToken(_) => Err(error_stack::report!(
                 errors::ConnectorError::MismatchedPaymentData
             )),
         }
diff --git a/crates/router/src/connector/klarna/transformers.rs b/crates/router/src/connector/klarna/transformers.rs
index 563410ee99d0..0816dd82ec6b 100644
--- a/crates/router/src/connector/klarna/transformers.rs
+++ b/crates/router/src/connector/klarna/transformers.rs
@@ -167,6 +167,7 @@ impl TryFrom<types::PaymentsResponseRouterData<KlarnaPaymentsResponse>>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.order_id.clone()),
+                incremental_authorization_allowed: None,
             }),
             status: item.response.fraud_status.into(),
             ..item.data
diff --git a/crates/router/src/connector/mollie/transformers.rs b/crates/router/src/connector/mollie/transformers.rs
index b77077ae709f..62fb94e236a8 100644
--- a/crates/router/src/connector/mollie/transformers.rs
+++ b/crates/router/src/connector/mollie/transformers.rs
@@ -531,6 +531,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/multisafepay/transformers.rs b/crates/router/src/connector/multisafepay/transformers.rs
index a067818b743d..7672566f8274 100644
--- a/crates/router/src/connector/multisafepay/transformers.rs
+++ b/crates/router/src/connector/multisafepay/transformers.rs
@@ -365,7 +365,8 @@ impl TryFrom<&MultisafepayRouterData<&types::PaymentsAuthorizeRouterData>>
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("multisafepay"),
             ))?,
         };
@@ -509,7 +510,8 @@ impl TryFrom<&MultisafepayRouterData<&types::PaymentsAuthorizeRouterData>>
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("multisafepay"),
             ))?,
         };
@@ -692,6 +694,7 @@ impl<F, T>
                         connector_response_reference_id: Some(
                             payment_response.data.order_id.clone(),
                         ),
+                        incremental_authorization_allowed: None,
                     }),
                     ..item.data
                 })
diff --git a/crates/router/src/connector/nexinets/transformers.rs b/crates/router/src/connector/nexinets/transformers.rs
index 2af3ee0a1bb8..8875abdb7868 100644
--- a/crates/router/src/connector/nexinets/transformers.rs
+++ b/crates/router/src/connector/nexinets/transformers.rs
@@ -372,6 +372,7 @@ impl<F, T>
                 connector_metadata: Some(connector_metadata),
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.order_id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -455,6 +456,7 @@ impl<F, T>
                 connector_metadata: Some(connector_metadata),
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.order.order_id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -624,7 +626,8 @@ fn get_payment_details_and_product(
         | PaymentMethodData::Reward
         | PaymentMethodData::Upi(_)
         | PaymentMethodData::Voucher(_)
-        | PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+        | PaymentMethodData::GiftCard(_)
+        | PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
             utils::get_unimplemented_payment_method_error_message("nexinets"),
         ))?,
     }
diff --git a/crates/router/src/connector/nmi/transformers.rs b/crates/router/src/connector/nmi/transformers.rs
index c8721d0d8f6b..35c0e102020e 100644
--- a/crates/router/src/connector/nmi/transformers.rs
+++ b/crates/router/src/connector/nmi/transformers.rs
@@ -188,7 +188,8 @@ impl TryFrom<&api_models::payments::PaymentMethodData> for PaymentMethod {
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotSupported {
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotSupported {
                 message: utils::SELECTED_PAYMENT_METHOD.to_string(),
                 connector: "nmi",
             })
@@ -321,6 +322,7 @@ impl
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 enums::AttemptStatus::CaptureInitiated,
             ),
@@ -414,6 +416,7 @@ impl<T>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 enums::AttemptStatus::Charged,
             ),
@@ -469,6 +472,7 @@ impl TryFrom<types::PaymentsResponseRouterData<StandardResponse>>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 if let Some(diesel_models::enums::CaptureMethod::Automatic) =
                     item.data.request.capture_method
@@ -518,6 +522,7 @@ impl<T>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 enums::AttemptStatus::VoidInitiated,
             ),
@@ -569,6 +574,7 @@ impl TryFrom<types::PaymentsSyncResponseRouterData<types::Response>>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/noon/transformers.rs b/crates/router/src/connector/noon/transformers.rs
index 5ff92582051a..b478d63e0f12 100644
--- a/crates/router/src/connector/noon/transformers.rs
+++ b/crates/router/src/connector/noon/transformers.rs
@@ -284,7 +284,8 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for NoonPaymentsRequest {
                     | api::PaymentMethodData::Reward {}
                     | api::PaymentMethodData::Upi(_)
                     | api::PaymentMethodData::Voucher(_)
-                    | api::PaymentMethodData::GiftCard(_) => {
+                    | api::PaymentMethodData::GiftCard(_)
+                    | api::PaymentMethodData::CardToken(_) => {
                         Err(errors::ConnectorError::NotSupported {
                             message: conn_utils::SELECTED_PAYMENT_METHOD.to_string(),
                             connector: "Noon",
@@ -526,6 +527,7 @@ impl<F, T>
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id,
+                        incremental_authorization_allowed: None,
                     })
                 }
             },
diff --git a/crates/router/src/connector/nuvei/transformers.rs b/crates/router/src/connector/nuvei/transformers.rs
index b79b2c892643..73e039c63395 100644
--- a/crates/router/src/connector/nuvei/transformers.rs
+++ b/crates/router/src/connector/nuvei/transformers.rs
@@ -856,8 +856,9 @@ impl<F>
             | payments::PaymentMethodData::Reward
             | payments::PaymentMethodData::Upi(_)
             | payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::CardRedirect(_)
-            | payments::PaymentMethodData::GiftCard(_) => {
+            | payments::PaymentMethodData::CardRedirect(_)
+            | payments::PaymentMethodData::GiftCard(_)
+            | payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     utils::get_unimplemented_payment_method_error_message("nuvei"),
                 )
@@ -1037,6 +1038,7 @@ impl TryFrom<(&types::PaymentsCompleteAuthorizeRouterData, String)> for NuveiPay
             | Some(api::PaymentMethodData::CardRedirect(..))
             | Some(api::PaymentMethodData::Reward)
             | Some(api::PaymentMethodData::Upi(..))
+            | Some(api::PaymentMethodData::CardToken(..))
             | None => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("nuvei"),
             )),
@@ -1450,6 +1452,7 @@ where
                     },
                     network_txn_id: None,
                     connector_response_reference_id: response.order_id,
+                    incremental_authorization_allowed: None,
                 })
             },
             ..item.data
diff --git a/crates/router/src/connector/opayo/transformers.rs b/crates/router/src/connector/opayo/transformers.rs
index 41bcc1500ed1..7b633f6aa641 100644
--- a/crates/router/src/connector/opayo/transformers.rs
+++ b/crates/router/src/connector/opayo/transformers.rs
@@ -52,7 +52,8 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for OpayoPaymentsRequest {
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("Opayo"),
             )
             .into()),
@@ -122,6 +123,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.transaction_id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/opennode/transformers.rs b/crates/router/src/connector/opennode/transformers.rs
index 794fc8573417..7670166fabaf 100644
--- a/crates/router/src/connector/opennode/transformers.rs
+++ b/crates/router/src/connector/opennode/transformers.rs
@@ -150,6 +150,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: item.response.data.order_id,
+                incremental_authorization_allowed: None,
             })
         } else {
             Ok(types::PaymentsResponseData::TransactionUnresolvedResponse {
diff --git a/crates/router/src/connector/payeezy/transformers.rs b/crates/router/src/connector/payeezy/transformers.rs
index 817ab43ac717..0170d18ecb46 100644
--- a/crates/router/src/connector/payeezy/transformers.rs
+++ b/crates/router/src/connector/payeezy/transformers.rs
@@ -260,7 +260,8 @@ fn get_payment_method_data(
         | api::PaymentMethodData::Reward
         | api::PaymentMethodData::Upi(_)
         | api::PaymentMethodData::Voucher(_)
-        | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+        | api::PaymentMethodData::GiftCard(_)
+        | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
             utils::get_unimplemented_payment_method_error_message("Payeezy"),
         ))?,
     }
@@ -439,6 +440,7 @@ impl<F, T>
                         .reference
                         .unwrap_or(item.response.transaction_id),
                 ),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/payme/transformers.rs b/crates/router/src/connector/payme/transformers.rs
index 092a8b49fd86..e3d54881f1f2 100644
--- a/crates/router/src/connector/payme/transformers.rs
+++ b/crates/router/src/connector/payme/transformers.rs
@@ -262,6 +262,7 @@ impl TryFrom<&PaymePaySaleResponse> for types::PaymentsResponseData {
             ),
             network_txn_id: None,
             connector_response_reference_id: None,
+            incremental_authorization_allowed: None,
         })
     }
 }
@@ -326,6 +327,7 @@ impl From<&SaleQuery> for types::PaymentsResponseData {
             connector_metadata: None,
             network_txn_id: None,
             connector_response_reference_id: None,
+            incremental_authorization_allowed: None,
         }
     }
 }
@@ -431,7 +433,8 @@ impl TryFrom<&PaymentMethodData> for SalePaymentMethod {
             | PaymentMethodData::GiftCard(_)
             | PaymentMethodData::CardRedirect(_)
             | PaymentMethodData::Upi(_)
-            | api::PaymentMethodData::Voucher(_) => {
+            | PaymentMethodData::Voucher(_)
+            | PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented("Payment methods".to_string()).into())
             }
         }
@@ -534,6 +537,7 @@ impl<F>
                             connector_metadata: None,
                             network_txn_id: None,
                             connector_response_reference_id: None,
+                            incremental_authorization_allowed: None,
                         }),
                         ..item.data
                     }),
@@ -666,7 +670,8 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for PayRequest {
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("payme"),
             ))?,
         }
@@ -725,6 +730,7 @@ impl TryFrom<&types::PaymentsCompleteAuthorizeRouterData> for Pay3dsRequest {
             | Some(api::PaymentMethodData::Upi(_))
             | Some(api::PaymentMethodData::Voucher(_))
             | Some(api::PaymentMethodData::GiftCard(_))
+            | Some(api::PaymentMethodData::CardToken(_))
             | None => {
                 Err(errors::ConnectorError::NotImplemented("Tokenize Flow".to_string()).into())
             }
@@ -761,7 +767,8 @@ impl TryFrom<&types::TokenizationRouterData> for CaptureBuyerRequest {
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => {
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented("Tokenize Flow".to_string()).into())
             }
         }
diff --git a/crates/router/src/connector/paypal.rs b/crates/router/src/connector/paypal.rs
index 4e50bc924b33..c60b20bb367d 100644
--- a/crates/router/src/connector/paypal.rs
+++ b/crates/router/src/connector/paypal.rs
@@ -30,6 +30,7 @@ use crate::{
     types::{
         self,
         api::{self, CompleteAuthorize, ConnectorCommon, ConnectorCommonExt, VerifyWebhookSource},
+        storage::enums as storage_enums,
         transformers::ForeignFrom,
         ConnectorAuthType, ErrorResponse, Response,
     },
@@ -506,6 +507,162 @@ impl ConnectorIntegration<api::Authorize, types::PaymentsAuthorizeData, types::P
     }
 }
 
+impl api::PaymentsPreProcessing for Paypal {}
+
+impl
+    ConnectorIntegration<
+        api::PreProcessing,
+        types::PaymentsPreProcessingData,
+        types::PaymentsResponseData,
+    > for Paypal
+{
+    fn get_headers(
+        &self,
+        req: &types::PaymentsPreProcessingRouterData,
+        connectors: &settings::Connectors,
+    ) -> CustomResult<Vec<(String, request::Maskable<String>)>, errors::ConnectorError> {
+        self.build_headers(req, connectors)
+    }
+
+    fn get_url(
+        &self,
+        req: &types::PaymentsPreProcessingRouterData,
+        connectors: &settings::Connectors,
+    ) -> CustomResult<String, errors::ConnectorError> {
+        let order_id = req
+            .request
+            .connector_transaction_id
+            .to_owned()
+            .ok_or(errors::ConnectorError::MissingConnectorTransactionID)?;
+        Ok(format!(
+            "{}v2/checkout/orders/{}?fields=payment_source",
+            self.base_url(connectors),
+            order_id,
+        ))
+    }
+
+    fn build_request(
+        &self,
+        req: &types::PaymentsPreProcessingRouterData,
+        connectors: &settings::Connectors,
+    ) -> CustomResult<Option<services::Request>, errors::ConnectorError> {
+        Ok(Some(
+            services::RequestBuilder::new()
+                .method(services::Method::Get)
+                .url(&types::PaymentsPreProcessingType::get_url(
+                    self, req, connectors,
+                )?)
+                .attach_default_headers()
+                .headers(types::PaymentsPreProcessingType::get_headers(
+                    self, req, connectors,
+                )?)
+                .build(),
+        ))
+    }
+
+    fn handle_response(
+        &self,
+        data: &types::PaymentsPreProcessingRouterData,
+        res: Response,
+    ) -> CustomResult<types::PaymentsPreProcessingRouterData, errors::ConnectorError> {
+        let response: paypal::PaypalPreProcessingResponse = res
+            .response
+            .parse_struct("paypal PaypalPreProcessingResponse")
+            .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
+
+        // permutation for status to continue payment
+        match (
+            response
+                .payment_source
+                .card
+                .authentication_result
+                .three_d_secure
+                .enrollment_status
+                .as_ref(),
+            response
+                .payment_source
+                .card
+                .authentication_result
+                .three_d_secure
+                .authentication_status
+                .as_ref(),
+            response
+                .payment_source
+                .card
+                .authentication_result
+                .liability_shift
+                .clone(),
+        ) {
+            (
+                Some(paypal::EnrollementStatus::Ready),
+                Some(paypal::AuthenticationStatus::Success),
+                paypal::LiabilityShift::Possible,
+            )
+            | (
+                Some(paypal::EnrollementStatus::Ready),
+                Some(paypal::AuthenticationStatus::Attempted),
+                paypal::LiabilityShift::Possible,
+            )
+            | (Some(paypal::EnrollementStatus::NotReady), None, paypal::LiabilityShift::No)
+            | (Some(paypal::EnrollementStatus::Unavailable), None, paypal::LiabilityShift::No)
+            | (Some(paypal::EnrollementStatus::Bypassed), None, paypal::LiabilityShift::No) => {
+                Ok(types::PaymentsPreProcessingRouterData {
+                    status: storage_enums::AttemptStatus::AuthenticationSuccessful,
+                    response: Ok(types::PaymentsResponseData::TransactionResponse {
+                        resource_id: types::ResponseId::NoResponseId,
+                        redirection_data: None,
+                        mandate_reference: None,
+                        connector_metadata: None,
+                        network_txn_id: None,
+                        connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
+                    }),
+                    ..data.clone()
+                })
+            }
+            _ => Ok(types::PaymentsPreProcessingRouterData {
+                response: Err(ErrorResponse {
+                    attempt_status: Some(enums::AttemptStatus::Failure),
+                    code: consts::NO_ERROR_CODE.to_string(),
+                    message: consts::NO_ERROR_MESSAGE.to_string(),
+                    connector_transaction_id: None,
+                    reason: Some(format!("{} Connector Responsded with LiabilityShift: {:?}, EnrollmentStatus: {:?}, and AuthenticationStatus: {:?}",
+                    consts::CANNOT_CONTINUE_AUTH,
+                    response
+                        .payment_source
+                        .card
+                        .authentication_result
+                        .liability_shift,
+                    response
+                        .payment_source
+                        .card
+                        .authentication_result
+                        .three_d_secure
+                        .enrollment_status
+                        .unwrap_or(paypal::EnrollementStatus::Null),
+                    response
+                        .payment_source
+                        .card
+                        .authentication_result
+                        .three_d_secure
+                        .authentication_status
+                        .unwrap_or(paypal::AuthenticationStatus::Null),
+                    )),
+                    status_code: res.status_code,
+                }),
+                ..data.clone()
+            }),
+        }
+    }
+
+    fn get_error_response(
+        &self,
+        res: Response,
+    ) -> CustomResult<ErrorResponse, errors::ConnectorError> {
+        self.build_error_response(res)
+    }
+}
+
 impl
     ConnectorIntegration<
         CompleteAuthorize,
diff --git a/crates/router/src/connector/paypal/transformers.rs b/crates/router/src/connector/paypal/transformers.rs
index d023077ff008..fbe6a47d2007 100644
--- a/crates/router/src/connector/paypal/transformers.rs
+++ b/crates/router/src/connector/paypal/transformers.rs
@@ -584,7 +584,8 @@ impl TryFrom<&PaypalRouterData<&types::PaymentsAuthorizeRouterData>> for PaypalP
             }
             api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Crypto(_)
-            | api_models::payments::PaymentMethodData::Upi(_) => {
+            | api_models::payments::PaymentMethodData::Upi(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotSupported {
                     message: utils::SELECTED_PAYMENT_METHOD.to_string(),
                     connector: "Paypal",
@@ -924,6 +925,74 @@ pub struct PaypalThreeDsResponse {
     links: Vec<PaypalLinks>,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PaypalPreProcessingResponse {
+    pub payment_source: CardParams,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CardParams {
+    pub card: AuthResult,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct AuthResult {
+    pub authentication_result: PaypalThreeDsParams,
+}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PaypalThreeDsParams {
+    pub liability_shift: LiabilityShift,
+    pub three_d_secure: ThreeDsCheck,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ThreeDsCheck {
+    pub enrollment_status: Option<EnrollementStatus>,
+    pub authentication_status: Option<AuthenticationStatus>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "UPPERCASE")]
+pub enum LiabilityShift {
+    Possible,
+    No,
+    Unknown,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum EnrollementStatus {
+    Null,
+    #[serde(rename = "Y")]
+    Ready,
+    #[serde(rename = "N")]
+    NotReady,
+    #[serde(rename = "U")]
+    Unavailable,
+    #[serde(rename = "B")]
+    Bypassed,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum AuthenticationStatus {
+    Null,
+    #[serde(rename = "Y")]
+    Success,
+    #[serde(rename = "N")]
+    Failed,
+    #[serde(rename = "R")]
+    Rejected,
+    #[serde(rename = "A")]
+    Attempted,
+    #[serde(rename = "U")]
+    Unable,
+    #[serde(rename = "C")]
+    ChallengeRequired,
+    #[serde(rename = "I")]
+    InfoOnly,
+    #[serde(rename = "D")]
+    Decoupled,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PaypalOrdersResponse {
     id: String,
@@ -1105,6 +1174,7 @@ impl<F, T>
                     .invoice_id
                     .clone()
                     .or(Some(item.response.id)),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -1209,6 +1279,7 @@ impl<F, T>
                 connector_response_reference_id: Some(
                     purchase_units.map_or(item.response.id, |item| item.invoice_id.clone()),
                 ),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -1245,6 +1316,7 @@ impl<F>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -1294,6 +1366,7 @@ impl<F>
                 connector_metadata: Some(connector_meta),
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -1361,6 +1434,7 @@ impl<F, T>
                     .invoice_id
                     .clone()
                     .or(Some(item.response.supplementary_data.related_ids.order_id)),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -1462,6 +1536,7 @@ impl TryFrom<types::PaymentsCaptureResponseRouterData<PaypalCaptureResponse>>
                     .response
                     .invoice_id
                     .or(Some(item.response.id)),
+                incremental_authorization_allowed: None,
             }),
             amount_captured: Some(amount_captured),
             ..item.data
@@ -1512,6 +1587,7 @@ impl<F, T>
                     .response
                     .invoice_id
                     .or(Some(item.response.id)),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/payu/transformers.rs b/crates/router/src/connector/payu/transformers.rs
index 9a2e14215c75..6edc570eb451 100644
--- a/crates/router/src/connector/payu/transformers.rs
+++ b/crates/router/src/connector/payu/transformers.rs
@@ -205,6 +205,7 @@ impl<F, T>
                     .response
                     .ext_order_id
                     .or(Some(item.response.order_id)),
+                incremental_authorization_allowed: None,
             }),
             amount_captured: None,
             ..item.data
@@ -257,6 +258,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             amount_captured: None,
             ..item.data
@@ -342,6 +344,7 @@ impl<F, T>
                     .response
                     .ext_order_id
                     .or(Some(item.response.order_id)),
+                incremental_authorization_allowed: None,
             }),
             amount_captured: None,
             ..item.data
@@ -475,6 +478,7 @@ impl<F, T>
                     .ext_order_id
                     .clone()
                     .or(Some(order.order_id.clone())),
+                incremental_authorization_allowed: None,
             }),
             amount_captured: Some(
                 order
diff --git a/crates/router/src/connector/powertranz/transformers.rs b/crates/router/src/connector/powertranz/transformers.rs
index 7f62c1939c07..e0ecd81c7e58 100644
--- a/crates/router/src/connector/powertranz/transformers.rs
+++ b/crates/router/src/connector/powertranz/transformers.rs
@@ -113,7 +113,8 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for PowertranzPaymentsRequest
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotSupported {
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotSupported {
                 message: utils::SELECTED_PAYMENT_METHOD.to_string(),
                 connector: "powertranz",
             })
@@ -327,6 +328,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.order_identifier),
+                incremental_authorization_allowed: None,
             }),
             Err,
         );
diff --git a/crates/router/src/connector/prophetpay/transformers.rs b/crates/router/src/connector/prophetpay/transformers.rs
index d81b931edfc9..d05f2c3986a7 100644
--- a/crates/router/src/connector/prophetpay/transformers.rs
+++ b/crates/router/src/connector/prophetpay/transformers.rs
@@ -219,6 +219,7 @@ impl<F>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -407,6 +408,7 @@ impl<F>
                     connector_metadata,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             })
@@ -456,6 +458,7 @@ impl<F, T>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             })
@@ -505,6 +508,7 @@ impl<F, T>
                     connector_metadata: None,
                     network_txn_id: None,
                     connector_response_reference_id: None,
+                    incremental_authorization_allowed: None,
                 }),
                 ..item.data
             })
diff --git a/crates/router/src/connector/rapyd/transformers.rs b/crates/router/src/connector/rapyd/transformers.rs
index 898b6ed6d147..193eb8198926 100644
--- a/crates/router/src/connector/rapyd/transformers.rs
+++ b/crates/router/src/connector/rapyd/transformers.rs
@@ -487,6 +487,7 @@ impl<F, T>
                                 connector_metadata: None,
                                 network_txn_id: None,
                                 connector_response_reference_id: None,
+                                incremental_authorization_allowed: None,
                             }),
                         )
                     }
diff --git a/crates/router/src/connector/shift4/transformers.rs b/crates/router/src/connector/shift4/transformers.rs
index 0dd3b8583490..606da2129fb0 100644
--- a/crates/router/src/connector/shift4/transformers.rs
+++ b/crates/router/src/connector/shift4/transformers.rs
@@ -166,11 +166,14 @@ impl<T> TryFrom<&types::RouterData<T, types::PaymentsAuthorizeData, types::Payme
             | payments::PaymentMethodData::Crypto(_)
             | payments::PaymentMethodData::MandatePayment
             | payments::PaymentMethodData::Reward
-            | payments::PaymentMethodData::Upi(_) => Err(errors::ConnectorError::NotSupported {
-                message: utils::SELECTED_PAYMENT_METHOD.to_string(),
-                connector: "Shift4",
+            | payments::PaymentMethodData::Upi(_)
+            | payments::PaymentMethodData::CardToken(_) => {
+                Err(errors::ConnectorError::NotSupported {
+                    message: utils::SELECTED_PAYMENT_METHOD.to_string(),
+                    connector: "Shift4",
+                }
+                .into())
             }
-            .into()),
         }
     }
 }
@@ -397,6 +400,7 @@ impl<T> TryFrom<&types::RouterData<T, types::CompleteAuthorizeData, types::Payme
             | Some(payments::PaymentMethodData::Voucher(_))
             | Some(payments::PaymentMethodData::Reward)
             | Some(payments::PaymentMethodData::Upi(_))
+            | Some(api::PaymentMethodData::CardToken(_))
             | None => Err(errors::ConnectorError::NotSupported {
                 message: "Flow".to_string(),
                 connector: "Shift4",
@@ -698,6 +702,7 @@ impl<F>
                 ),
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -739,6 +744,7 @@ impl<T, F>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/square/transformers.rs b/crates/router/src/connector/square/transformers.rs
index dfb49e8e6775..7343ef58bb08 100644
--- a/crates/router/src/connector/square/transformers.rs
+++ b/crates/router/src/connector/square/transformers.rs
@@ -191,7 +191,8 @@ impl TryFrom<&types::TokenizationRouterData> for SquareTokenRequest {
             | api::PaymentMethodData::MandatePayment
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
-            | api::PaymentMethodData::Voucher(_) => Err(errors::ConnectorError::NotSupported {
+            | api::PaymentMethodData::Voucher(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotSupported {
                 message: format!("{:?}", item.request.payment_method_data),
                 connector: "Square",
             })?,
@@ -307,7 +308,8 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for SquarePaymentsRequest {
             | api::PaymentMethodData::MandatePayment
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
-            | api::PaymentMethodData::Voucher(_) => Err(errors::ConnectorError::NotSupported {
+            | api::PaymentMethodData::Voucher(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotSupported {
                 message: format!("{:?}", item.request.payment_method_data),
                 connector: "Square",
             })?,
@@ -399,6 +401,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: item.response.payment.reference_id,
+                incremental_authorization_allowed: None,
             }),
             amount_captured,
             ..item.data
diff --git a/crates/router/src/connector/stax/transformers.rs b/crates/router/src/connector/stax/transformers.rs
index f2aae442ddd6..2fd3b3474ea4 100644
--- a/crates/router/src/connector/stax/transformers.rs
+++ b/crates/router/src/connector/stax/transformers.rs
@@ -63,10 +63,9 @@ impl TryFrom<&StaxRouterData<&types::PaymentsAuthorizeRouterData>> for StaxPayme
         item: &StaxRouterData<&types::PaymentsAuthorizeRouterData>,
     ) -> Result<Self, Self::Error> {
         if item.router_data.request.currency != enums::Currency::USD {
-            Err(errors::ConnectorError::NotSupported {
-                message: item.router_data.request.currency.to_string(),
-                connector: "Stax",
-            })?
+            Err(errors::ConnectorError::NotImplemented(
+                utils::get_unimplemented_payment_method_error_message("Stax"),
+            ))?
         }
         let total = item.amount;
 
@@ -118,10 +117,10 @@ impl TryFrom<&StaxRouterData<&types::PaymentsAuthorizeRouterData>> for StaxPayme
             | api::PaymentMethodData::Voucher(_)
             | api::PaymentMethodData::GiftCard(_)
             | api::PaymentMethodData::CardRedirect(_)
-            | api::PaymentMethodData::Upi(_) => Err(errors::ConnectorError::NotSupported {
-                message: "SELECTED_PAYMENT_METHOD".to_string(),
-                connector: "Stax",
-            })?,
+            | api::PaymentMethodData::Upi(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
+                utils::get_unimplemented_payment_method_error_message("Stax"),
+            ))?,
         }
     }
 }
@@ -268,10 +267,10 @@ impl TryFrom<&types::TokenizationRouterData> for StaxTokenRequest {
             | api::PaymentMethodData::Voucher(_)
             | api::PaymentMethodData::GiftCard(_)
             | api::PaymentMethodData::CardRedirect(_)
-            | api::PaymentMethodData::Upi(_) => Err(errors::ConnectorError::NotSupported {
-                message: "SELECTED_PAYMENT_METHOD".to_string(),
-                connector: "Stax",
-            })?,
+            | api::PaymentMethodData::Upi(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
+                utils::get_unimplemented_payment_method_error_message("Stax"),
+            ))?,
         }
     }
 }
@@ -368,6 +367,7 @@ impl<F, T>
                 connector_response_reference_id: Some(
                     item.response.idempotency_id.unwrap_or(item.response.id),
                 ),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/stripe/transformers.rs b/crates/router/src/connector/stripe/transformers.rs
index 56eebc2df3bd..182479604539 100644
--- a/crates/router/src/connector/stripe/transformers.rs
+++ b/crates/router/src/connector/stripe/transformers.rs
@@ -1431,13 +1431,13 @@ fn create_stripe_payment_method(
             .into()),
         },
 
-        payments::PaymentMethodData::Upi(_) | payments::PaymentMethodData::MandatePayment => {
-            Err(errors::ConnectorError::NotSupported {
-                message: connector_util::SELECTED_PAYMENT_METHOD.to_string(),
-                connector: "stripe",
-            }
-            .into())
+        payments::PaymentMethodData::Upi(_)
+        | payments::PaymentMethodData::MandatePayment
+        | payments::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotSupported {
+            message: connector_util::SELECTED_PAYMENT_METHOD.to_string(),
+            connector: "stripe",
         }
+        .into()),
     }
 }
 
@@ -2334,6 +2334,7 @@ impl<F, T>
                 connector_metadata,
                 network_txn_id,
                 connector_response_reference_id: Some(item.response.id),
+                incremental_authorization_allowed: None,
             }),
             amount_captured: item.response.amount_received,
             ..item.data
@@ -2494,6 +2495,7 @@ impl<F, T>
                 connector_metadata,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.id.clone()),
+                incremental_authorization_allowed: None,
             }),
             Err,
         );
@@ -2535,6 +2537,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: Option::foreign_from(item.response.latest_attempt),
                 connector_response_reference_id: Some(item.response.id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -2995,6 +2998,7 @@ impl TryFrom<&types::PaymentsPreProcessingRouterData> for StripeCreditTransferSo
             | Some(payments::PaymentMethodData::GiftCard(..))
             | Some(payments::PaymentMethodData::CardRedirect(..))
             | Some(payments::PaymentMethodData::Voucher(..))
+            | Some(payments::PaymentMethodData::CardToken(..))
             | None => Err(errors::ConnectorError::NotImplemented(
                 connector_util::get_unimplemented_payment_method_error_message("stripe"),
             )
@@ -3075,6 +3079,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, ChargesResponse, T, types::Payme
                 connector_metadata: Some(connector_metadata),
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -3416,7 +3421,8 @@ impl
             | api::PaymentMethodData::GiftCard(_)
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::CardRedirect(_)
-            | api::PaymentMethodData::Voucher(_) => Err(errors::ConnectorError::NotSupported {
+            | api::PaymentMethodData::Voucher(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotSupported {
                 message: format!("{pm_type:?}"),
                 connector: "Stripe",
             })?,
diff --git a/crates/router/src/connector/trustpay/transformers.rs b/crates/router/src/connector/trustpay/transformers.rs
index 0210d3ca2d92..e985eff11976 100644
--- a/crates/router/src/connector/trustpay/transformers.rs
+++ b/crates/router/src/connector/trustpay/transformers.rs
@@ -445,7 +445,8 @@ impl TryFrom<&TrustpayRouterData<&types::PaymentsAuthorizeRouterData>> for Trust
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("trustpay"),
             )
             .into()),
@@ -498,6 +499,7 @@ fn is_payment_failed(payment_status: &str) -> (bool, &'static str) {
             true,
             "Transaction declined (maximum transaction frequency exceeded)",
         ),
+        "800.100.165" => (true, "Transaction declined (card lost)"),
         "800.100.168" => (true, "Transaction declined (restricted card)"),
         "800.100.170" => (true, "Transaction declined (transaction not permitted)"),
         "800.100.171" => (true, "transaction declined (pick up card)"),
@@ -511,6 +513,10 @@ fn is_payment_failed(payment_status: &str) -> (bool, &'static str) {
             true,
             "Transaction for the same session is currently being processed, please try again later",
         ),
+        "900.100.100" => (
+            true,
+            "Unexpected communication error with connector/acquirer",
+        ),
         "900.100.300" => (true, "Timeout, uncertain result"),
         _ => (false, ""),
     }
@@ -728,6 +734,7 @@ fn handle_cards_response(
         connector_metadata: None,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
     Ok((status, error, payment_response_data))
 }
@@ -756,6 +763,7 @@ fn handle_bank_redirects_response(
         connector_metadata: None,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
     Ok((status, error, payment_response_data))
 }
@@ -788,6 +796,7 @@ fn handle_bank_redirects_error_response(
         connector_metadata: None,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
     Ok((status, error, payment_response_data))
 }
@@ -830,6 +839,7 @@ fn handle_bank_redirects_sync_response(
         connector_metadata: None,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
     Ok((status, error, payment_response_data))
 }
@@ -852,6 +862,7 @@ pub fn handle_webhook_response(
         connector_metadata: None,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     };
     Ok((status, None, payment_response_data))
 }
diff --git a/crates/router/src/connector/tsys/transformers.rs b/crates/router/src/connector/tsys/transformers.rs
index c60aeb64898b..8c9c6cd43df4 100644
--- a/crates/router/src/connector/tsys/transformers.rs
+++ b/crates/router/src/connector/tsys/transformers.rs
@@ -77,7 +77,8 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for TsysPaymentsRequest {
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("tsys"),
             ))?,
         }
@@ -217,6 +218,7 @@ fn get_payments_response(connector_response: TsysResponse) -> types::PaymentsRes
         connector_metadata: None,
         network_txn_id: None,
         connector_response_reference_id: Some(connector_response.transaction_id),
+        incremental_authorization_allowed: None,
     }
 }
 
@@ -240,6 +242,7 @@ fn get_payments_sync_response(
                 .transaction_id
                 .clone(),
         ),
+        incremental_authorization_allowed: None,
     }
 }
 
diff --git a/crates/router/src/connector/volt/transformers.rs b/crates/router/src/connector/volt/transformers.rs
index e603ef2db06c..cea56feb7145 100644
--- a/crates/router/src/connector/volt/transformers.rs
+++ b/crates/router/src/connector/volt/transformers.rs
@@ -130,10 +130,9 @@ impl TryFrom<&VoltRouterData<&types::PaymentsAuthorizeRouterData>> for VoltPayme
                 | api_models::payments::BankRedirectData::Trustly { .. }
                 | api_models::payments::BankRedirectData::OnlineBankingFpx { .. }
                 | api_models::payments::BankRedirectData::OnlineBankingThailand { .. } => {
-                    Err(errors::ConnectorError::NotSupported {
-                        message: utils::SELECTED_PAYMENT_METHOD.to_string(),
-                        connector: "Volt",
-                    }
+                    Err(errors::ConnectorError::NotImplemented(
+                        utils::get_unimplemented_payment_method_error_message("Volt"),
+                    )
                     .into())
                 }
             },
@@ -148,11 +147,11 @@ impl TryFrom<&VoltRouterData<&types::PaymentsAuthorizeRouterData>> for VoltPayme
             | api_models::payments::PaymentMethodData::Reward
             | api_models::payments::PaymentMethodData::Upi(_)
             | api_models::payments::PaymentMethodData::Voucher(_)
-            | api_models::payments::PaymentMethodData::GiftCard(_) => {
-                Err(errors::ConnectorError::NotSupported {
-                    message: utils::SELECTED_PAYMENT_METHOD.to_string(),
-                    connector: "Volt",
-                }
+            | api_models::payments::PaymentMethodData::GiftCard(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
+                Err(errors::ConnectorError::NotImplemented(
+                    utils::get_unimplemented_payment_method_error_message("Volt"),
+                )
                 .into())
             }
         }
@@ -285,6 +284,7 @@ impl<F, T>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -336,6 +336,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, VoltPsyncResponse, T, types::Pay
                     .response
                     .merchant_internal_reference
                     .or(Some(item.response.id)),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/worldline/transformers.rs b/crates/router/src/connector/worldline/transformers.rs
index 049453e325ae..b5739fe857ab 100644
--- a/crates/router/src/connector/worldline/transformers.rs
+++ b/crates/router/src/connector/worldline/transformers.rs
@@ -257,7 +257,8 @@ impl
             | api::PaymentMethodData::Reward
             | api::PaymentMethodData::Upi(_)
             | api::PaymentMethodData::Voucher(_)
-            | api::PaymentMethodData::GiftCard(_) => Err(errors::ConnectorError::NotImplemented(
+            | api::PaymentMethodData::GiftCard(_)
+            | api::PaymentMethodData::CardToken(_) => Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("worldline"),
             ))?,
         };
@@ -593,6 +594,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, Payment, T, PaymentsResponseData
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
@@ -646,6 +648,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, PaymentResponse, T, PaymentsResp
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: Some(item.response.payment.id),
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/worldpay.rs b/crates/router/src/connector/worldpay.rs
index 4edee3624ef6..bfa58a74f331 100644
--- a/crates/router/src/connector/worldpay.rs
+++ b/crates/router/src/connector/worldpay.rs
@@ -209,6 +209,7 @@ impl ConnectorIntegration<api::Void, types::PaymentsCancelData, types::PaymentsR
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..data.clone()
                 })
@@ -309,6 +310,7 @@ impl ConnectorIntegration<api::PSync, types::PaymentsSyncData, types::PaymentsRe
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..data.clone()
         })
@@ -368,6 +370,7 @@ impl ConnectorIntegration<api::Capture, types::PaymentsCaptureData, types::Payme
                         connector_metadata: None,
                         network_txn_id: None,
                         connector_response_reference_id: None,
+                        incremental_authorization_allowed: None,
                     }),
                     ..data.clone()
                 })
diff --git a/crates/router/src/connector/worldpay/transformers.rs b/crates/router/src/connector/worldpay/transformers.rs
index d31f4d65e78c..6979502842ff 100644
--- a/crates/router/src/connector/worldpay/transformers.rs
+++ b/crates/router/src/connector/worldpay/transformers.rs
@@ -120,7 +120,8 @@ fn fetch_payment_instrument(
         | api_models::payments::PaymentMethodData::Upi(_)
         | api_models::payments::PaymentMethodData::Voucher(_)
         | api_models::payments::PaymentMethodData::CardRedirect(_)
-        | api_models::payments::PaymentMethodData::GiftCard(_) => {
+        | api_models::payments::PaymentMethodData::GiftCard(_)
+        | api_models::payments::PaymentMethodData::CardToken(_) => {
             Err(errors::ConnectorError::NotImplemented(
                 utils::get_unimplemented_payment_method_error_message("worldpay"),
             )
@@ -269,6 +270,7 @@ impl TryFrom<types::PaymentsResponseRouterData<WorldpayPaymentsResponse>>
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..item.data
         })
diff --git a/crates/router/src/connector/zen/transformers.rs b/crates/router/src/connector/zen/transformers.rs
index 689894176b26..c66b098fe751 100644
--- a/crates/router/src/connector/zen/transformers.rs
+++ b/crates/router/src/connector/zen/transformers.rs
@@ -707,7 +707,8 @@ impl TryFrom<&ZenRouterData<&types::PaymentsAuthorizeRouterData>> for ZenPayment
             api_models::payments::PaymentMethodData::Crypto(_)
             | api_models::payments::PaymentMethodData::MandatePayment
             | api_models::payments::PaymentMethodData::Reward
-            | api_models::payments::PaymentMethodData::Upi(_) => {
+            | api_models::payments::PaymentMethodData::Upi(_)
+            | api_models::payments::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     utils::get_unimplemented_payment_method_error_message("Zen"),
                 ))?
@@ -939,6 +940,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, ApiResponse, T, types::PaymentsR
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..value.data
         })
@@ -965,6 +967,7 @@ impl<F, T> TryFrom<types::ResponseRouterData<F, CheckoutResponse, T, types::Paym
                 connector_metadata: None,
                 network_txn_id: None,
                 connector_response_reference_id: None,
+                incremental_authorization_allowed: None,
             }),
             ..value.data
         })
diff --git a/crates/router/src/consts.rs b/crates/router/src/consts.rs
index c5490ee00e63..49c5cfacad1f 100644
--- a/crates/router/src/consts.rs
+++ b/crates/router/src/consts.rs
@@ -27,7 +27,10 @@ pub const DEFAULT_FULFILLMENT_TIME: i64 = 15 * 60;
 pub(crate) const NO_ERROR_MESSAGE: &str = "No error message";
 pub(crate) const NO_ERROR_CODE: &str = "No error code";
 pub(crate) const UNSUPPORTED_ERROR_MESSAGE: &str = "Unsupported response type";
+pub(crate) const LOW_BALANCE_ERROR_MESSAGE: &str = "Insufficient balance in the payment method";
 pub(crate) const CONNECTOR_UNAUTHORIZED_ERROR: &str = "Authentication Error from the connector";
+pub(crate) const CANNOT_CONTINUE_AUTH: &str =
+    "Cannot continue with Authorization due to failed Liability Shift.";
 
 // General purpose base64 engines
 pub(crate) const BASE64_ENGINE: base64::engine::GeneralPurpose =
@@ -59,4 +62,11 @@ pub const LOCKER_REDIS_EXPIRY_SECONDS: u32 = 60 * 15; // 15 minutes
 #[cfg(any(feature = "olap", feature = "oltp"))]
 pub const JWT_TOKEN_TIME_IN_SECS: u64 = 60 * 60 * 24 * 2; // 2 days
 
+#[cfg(feature = "email")]
+pub const EMAIL_TOKEN_TIME_IN_SECS: u64 = 60 * 60 * 24; // 1 day
 pub const ROLE_ID_ORGANIZATION_ADMIN: &str = "org_admin";
+
+#[cfg(feature = "olap")]
+pub const VERIFY_CONNECTOR_ID_PREFIX: &str = "conn_verify";
+#[cfg(feature = "olap")]
+pub const VERIFY_CONNECTOR_MERCHANT_ID: &str = "test_merchant";
diff --git a/crates/router/src/core.rs b/crates/router/src/core.rs
index a429cab482b4..30fe1a1ce8cb 100644
--- a/crates/router/src/core.rs
+++ b/crates/router/src/core.rs
@@ -5,6 +5,8 @@ pub mod cache;
 pub mod cards_info;
 pub mod conditional_config;
 pub mod configs;
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub mod currency;
 pub mod customers;
 pub mod disputes;
 pub mod errors;
@@ -26,4 +28,6 @@ pub mod user;
 pub mod utils;
 #[cfg(all(feature = "olap", feature = "kms"))]
 pub mod verification;
+#[cfg(feature = "olap")]
+pub mod verify_connector;
 pub mod webhooks;
diff --git a/crates/router/src/core/currency.rs b/crates/router/src/core/currency.rs
new file mode 100644
index 000000000000..1ea9454f00a0
--- /dev/null
+++ b/crates/router/src/core/currency.rs
@@ -0,0 +1,51 @@
+use common_utils::errors::CustomResult;
+use error_stack::ResultExt;
+
+use crate::{
+    core::errors::ApiErrorResponse,
+    services::ApplicationResponse,
+    utils::currency::{self, convert_currency, get_forex_rates},
+    AppState,
+};
+
+pub async fn retrieve_forex(
+    state: AppState,
+) -> CustomResult<ApplicationResponse<currency::FxExchangeRatesCacheEntry>, ApiErrorResponse> {
+    Ok(ApplicationResponse::Json(
+        get_forex_rates(
+            &state,
+            state.conf.forex_api.call_delay,
+            state.conf.forex_api.local_fetch_retry_delay,
+            state.conf.forex_api.local_fetch_retry_count,
+            #[cfg(feature = "kms")]
+            &state.conf.kms,
+        )
+        .await
+        .change_context(ApiErrorResponse::GenericNotFoundError {
+            message: "Unable to fetch forex rates".to_string(),
+        })?,
+    ))
+}
+
+pub async fn convert_forex(
+    state: AppState,
+    amount: i64,
+    to_currency: String,
+    from_currency: String,
+) -> CustomResult<
+    ApplicationResponse<api_models::currency::CurrencyConversionResponse>,
+    ApiErrorResponse,
+> {
+    Ok(ApplicationResponse::Json(
+        Box::pin(convert_currency(
+            state.clone(),
+            amount,
+            to_currency,
+            from_currency,
+            #[cfg(feature = "kms")]
+            &state.conf.kms,
+        ))
+        .await
+        .change_context(ApiErrorResponse::InternalServerError)?,
+    ))
+}
diff --git a/crates/router/src/core/errors/user.rs b/crates/router/src/core/errors/user.rs
index b86c395b9814..f5c50e28ccc6 100644
--- a/crates/router/src/core/errors/user.rs
+++ b/crates/router/src/core/errors/user.rs
@@ -27,10 +27,16 @@ pub enum UserErrors {
     MerchantAccountCreationError(String),
     #[error("InvalidEmailError")]
     InvalidEmailError,
-    #[error("DuplicateOrganizationId")]
-    DuplicateOrganizationId,
     #[error("MerchantIdNotFound")]
     MerchantIdNotFound,
+    #[error("MetadataAlreadySet")]
+    MetadataAlreadySet,
+    #[error("DuplicateOrganizationId")]
+    DuplicateOrganizationId,
+    #[error("IpAddressParsingFailed")]
+    IpAddressParsingFailed,
+    #[error("InvalidMetadataRequest")]
+    InvalidMetadataRequest,
 }
 
 impl common_utils::errors::ErrorSwitch<api_models::errors::types::ApiErrorResponse> for UserErrors {
@@ -77,15 +83,27 @@ impl common_utils::errors::ErrorSwitch<api_models::errors::types::ApiErrorRespon
             Self::InvalidEmailError => {
                 AER::BadRequest(ApiError::new(sub_code, 16, "Invalid Email", None))
             }
+            Self::MerchantIdNotFound => {
+                AER::BadRequest(ApiError::new(sub_code, 18, "Invalid Merchant ID", None))
+            }
+            Self::MetadataAlreadySet => {
+                AER::BadRequest(ApiError::new(sub_code, 19, "Metadata already set", None))
+            }
             Self::DuplicateOrganizationId => AER::InternalServerError(ApiError::new(
                 sub_code,
                 21,
                 "An Organization with the id already exists",
                 None,
             )),
-            Self::MerchantIdNotFound => {
-                AER::BadRequest(ApiError::new(sub_code, 18, "Invalid Merchant ID", None))
+            Self::IpAddressParsingFailed => {
+                AER::InternalServerError(ApiError::new(sub_code, 24, "Something Went Wrong", None))
             }
+            Self::InvalidMetadataRequest => AER::BadRequest(ApiError::new(
+                sub_code,
+                26,
+                "Invalid Metadata Request",
+                None,
+            )),
         }
     }
 }
diff --git a/crates/router/src/core/payment_methods.rs b/crates/router/src/core/payment_methods.rs
index 80cec01e9166..1049137a9470 100644
--- a/crates/router/src/core/payment_methods.rs
+++ b/crates/router/src/core/payment_methods.rs
@@ -3,6 +3,7 @@ pub mod surcharge_decision_configs;
 pub mod transformers;
 pub mod vault;
 
+use api_models::payments::CardToken;
 pub use api_models::{
     enums::{Connector, PayoutConnectors},
     payouts as payout_types,
@@ -42,6 +43,7 @@ pub trait PaymentMethodRetrieve {
         token: &storage::PaymentTokenData,
         payment_intent: &PaymentIntent,
         card_cvc: Option<masking::Secret<String>>,
+        card_token_data: Option<&CardToken>,
     ) -> RouterResult<Option<(payments::PaymentMethodData, enums::PaymentMethod)>>;
 }
 
@@ -125,6 +127,7 @@ impl PaymentMethodRetrieve for Oss {
         token_data: &storage::PaymentTokenData,
         payment_intent: &PaymentIntent,
         card_cvc: Option<masking::Secret<String>>,
+        card_token_data: Option<&CardToken>,
     ) -> RouterResult<Option<(payments::PaymentMethodData, enums::PaymentMethod)>> {
         match token_data {
             storage::PaymentTokenData::TemporaryGeneric(generic_token) => {
@@ -134,6 +137,7 @@ impl PaymentMethodRetrieve for Oss {
                     payment_intent,
                     card_cvc,
                     merchant_key_store,
+                    card_token_data,
                 )
                 .await
             }
@@ -145,6 +149,7 @@ impl PaymentMethodRetrieve for Oss {
                     payment_intent,
                     card_cvc,
                     merchant_key_store,
+                    card_token_data,
                 )
                 .await
             }
@@ -155,6 +160,7 @@ impl PaymentMethodRetrieve for Oss {
                     &card_token.token,
                     payment_intent,
                     card_cvc,
+                    card_token_data,
                 )
                 .await
                 .map(|card| Some((card, enums::PaymentMethod::Card)))
@@ -166,6 +172,7 @@ impl PaymentMethodRetrieve for Oss {
                     &card_token.token,
                     payment_intent,
                     card_cvc,
+                    card_token_data,
                 )
                 .await
                 .map(|card| Some((card, enums::PaymentMethod::Card)))
diff --git a/crates/router/src/core/payments.rs b/crates/router/src/core/payments.rs
index 1c40ef81f497..33afa29397e1 100644
--- a/crates/router/src/core/payments.rs
+++ b/crates/router/src/core/payments.rs
@@ -81,7 +81,7 @@ pub async fn payments_operation_core<F, Req, Op, FData, Ctx>(
     req: Req,
     call_connector_action: CallConnectorAction,
     auth_flow: services::AuthFlow,
-    eligible_connectors: Option<Vec<api_models::enums::RoutableConnectors>>,
+    eligible_connectors: Option<Vec<common_enums::RoutableConnectors>>,
     header_payload: HeaderPayload,
 ) -> RouterResult<(
     PaymentData<F>,
@@ -1408,6 +1408,17 @@ where
                 (router_data, should_continue_payment)
             }
         }
+        Some(api_models::payments::PaymentMethodData::GiftCard(_)) => {
+            if connector.connector_name == router_types::Connector::Adyen {
+                router_data = router_data.preprocessing_steps(state, connector).await?;
+
+                let is_error_in_response = router_data.response.is_err();
+                // If is_error_in_response is true, should_continue_payment should be false, we should throw the error
+                (router_data, !is_error_in_response)
+            } else {
+                (router_data, should_continue_payment)
+            }
+        }
         Some(api_models::payments::PaymentMethodData::BankDebit(_)) => {
             if connector.connector_name == router_types::Connector::Gocardless {
                 router_data = router_data.preprocessing_steps(state, connector).await?;
@@ -1418,7 +1429,21 @@ where
                 (router_data, should_continue_payment)
             }
         }
-        _ => (router_data, should_continue_payment),
+        _ => {
+            // 3DS validation for paypal cards after verification (authorize call)
+            if connector.connector_name == router_types::Connector::Paypal
+                && payment_data.payment_attempt.payment_method
+                    == Some(storage_enums::PaymentMethod::Card)
+                && matches!(format!("{operation:?}").as_str(), "CompleteAuthorize")
+            {
+                router_data = router_data.preprocessing_steps(state, connector).await?;
+                let is_error_in_response = router_data.response.is_err();
+                // If is_error_in_response is true, should_continue_payment should be false, we should throw the error
+                (router_data, !is_error_in_response)
+            } else {
+                (router_data, should_continue_payment)
+            }
+        }
     };
 
     Ok(router_data_and_should_continue_payment)
@@ -1529,7 +1554,7 @@ fn check_apple_pay_metadata(
                         })
                 })
                 .map_err(
-                    |error| logger::error!(%error, "Failed to Parse Value to ApplepaySessionTokenData"),
+                    |error| logger::warn!(%error, "Failed to Parse Value to ApplepaySessionTokenData"),
                 );
 
             parsed_metadata.ok().map(|metadata| match metadata {
diff --git a/crates/router/src/core/payments/flows.rs b/crates/router/src/core/payments/flows.rs
index 46eaca26f7cc..9be6f5905b8b 100644
--- a/crates/router/src/core/payments/flows.rs
+++ b/crates/router/src/core/payments/flows.rs
@@ -832,7 +832,6 @@ impl<const T: u8>
 
 default_imp_for_pre_processing_steps!(
     connector::Aci,
-    connector::Adyen,
     connector::Airwallex,
     connector::Authorizedotnet,
     connector::Bambora,
@@ -863,7 +862,6 @@ default_imp_for_pre_processing_steps!(
     connector::Opayo,
     connector::Opennode,
     connector::Payeezy,
-    connector::Paypal,
     connector::Payu,
     connector::Powertranz,
     connector::Prophetpay,
diff --git a/crates/router/src/core/payments/flows/authorize_flow.rs b/crates/router/src/core/payments/flows/authorize_flow.rs
index 04bd7f0b4338..4ef23f481a2c 100644
--- a/crates/router/src/core/payments/flows/authorize_flow.rs
+++ b/crates/router/src/core/payments/flows/authorize_flow.rs
@@ -417,6 +417,30 @@ impl TryFrom<types::PaymentsAuthorizeData> for types::PaymentsPreProcessingData
             complete_authorize_url: data.complete_authorize_url,
             browser_info: data.browser_info,
             surcharge_details: data.surcharge_details,
+            connector_transaction_id: None,
+        })
+    }
+}
+
+impl TryFrom<types::CompleteAuthorizeData> for types::PaymentsPreProcessingData {
+    type Error = error_stack::Report<errors::ApiErrorResponse>;
+
+    fn try_from(data: types::CompleteAuthorizeData) -> Result<Self, Self::Error> {
+        Ok(Self {
+            payment_method_data: data.payment_method_data,
+            amount: Some(data.amount),
+            email: data.email,
+            currency: Some(data.currency),
+            payment_method_type: None,
+            setup_mandate_details: data.setup_mandate_details,
+            capture_method: data.capture_method,
+            order_details: None,
+            router_return_url: None,
+            webhook_url: None,
+            complete_authorize_url: None,
+            browser_info: data.browser_info,
+            surcharge_details: None,
+            connector_transaction_id: data.connector_transaction_id,
         })
     }
 }
diff --git a/crates/router/src/core/payments/flows/complete_authorize_flow.rs b/crates/router/src/core/payments/flows/complete_authorize_flow.rs
index 44d8728fd4d2..2d52a145feae 100644
--- a/crates/router/src/core/payments/flows/complete_authorize_flow.rs
+++ b/crates/router/src/core/payments/flows/complete_authorize_flow.rs
@@ -6,7 +6,7 @@ use crate::{
         errors::{self, ConnectorErrorExt, RouterResult},
         payments::{self, access_token, helpers, transformers, PaymentData},
     },
-    routes::AppState,
+    routes::{metrics, AppState},
     services,
     types::{self, api, domain},
     utils::OptionExt,
@@ -144,6 +144,76 @@ impl Feature<api::CompleteAuthorize, types::CompleteAuthorizeData>
 
         Ok((request, true))
     }
+
+    async fn preprocessing_steps<'a>(
+        self,
+        state: &AppState,
+        connector: &api::ConnectorData,
+    ) -> RouterResult<Self> {
+        complete_authorize_preprocessing_steps(state, &self, true, connector).await
+    }
+}
+
+pub async fn complete_authorize_preprocessing_steps<F: Clone>(
+    state: &AppState,
+    router_data: &types::RouterData<F, types::CompleteAuthorizeData, types::PaymentsResponseData>,
+    confirm: bool,
+    connector: &api::ConnectorData,
+) -> RouterResult<types::RouterData<F, types::CompleteAuthorizeData, types::PaymentsResponseData>> {
+    if confirm {
+        let connector_integration: services::BoxedConnectorIntegration<
+            '_,
+            api::PreProcessing,
+            types::PaymentsPreProcessingData,
+            types::PaymentsResponseData,
+        > = connector.connector.get_connector_integration();
+
+        let preprocessing_request_data =
+            types::PaymentsPreProcessingData::try_from(router_data.request.to_owned())?;
+
+        let preprocessing_response_data: Result<types::PaymentsResponseData, types::ErrorResponse> =
+            Err(types::ErrorResponse::default());
+
+        let preprocessing_router_data =
+            payments::helpers::router_data_type_conversion::<_, api::PreProcessing, _, _, _, _>(
+                router_data.clone(),
+                preprocessing_request_data,
+                preprocessing_response_data,
+            );
+
+        let resp = services::execute_connector_processing_step(
+            state,
+            connector_integration,
+            &preprocessing_router_data,
+            payments::CallConnectorAction::Trigger,
+            None,
+        )
+        .await
+        .to_payment_failed_response()?;
+
+        metrics::PREPROCESSING_STEPS_COUNT.add(
+            &metrics::CONTEXT,
+            1,
+            &[
+                metrics::request::add_attributes("connector", connector.connector_name.to_string()),
+                metrics::request::add_attributes(
+                    "payment_method",
+                    router_data.payment_method.to_string(),
+                ),
+            ],
+        );
+
+        let authorize_router_data =
+            payments::helpers::router_data_type_conversion::<_, F, _, _, _, _>(
+                resp.clone(),
+                router_data.request.to_owned(),
+                resp.response,
+            );
+
+        Ok(authorize_router_data)
+    } else {
+        Ok(router_data.clone())
+    }
 }
 
 impl TryFrom<types::CompleteAuthorizeData> for types::PaymentMethodTokenizationData {
diff --git a/crates/router/src/core/payments/helpers.rs b/crates/router/src/core/payments/helpers.rs
index b25ee820e27b..4639ca89ab3f 100644
--- a/crates/router/src/core/payments/helpers.rs
+++ b/crates/router/src/core/payments/helpers.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use api_models::payments::GetPaymentMethodType;
+use api_models::payments::{CardToken, GetPaymentMethodType};
 use base64::Engine;
 use common_utils::{
     ext_traits::{AsyncExt, ByteSliceExt, ValueExt},
@@ -1356,6 +1356,7 @@ pub async fn retrieve_payment_method_with_temporary_token(
     payment_intent: &PaymentIntent,
     card_cvc: Option<masking::Secret<String>>,
     merchant_key_store: &domain::MerchantKeyStore,
+    card_token_data: Option<&CardToken>,
 ) -> RouterResult<Option<(api::PaymentMethodData, enums::PaymentMethod)>> {
     let (pm, supplementary_data) =
         vault::Vault::get_payment_method_data_from_locker(state, token, merchant_key_store)
@@ -1375,9 +1376,30 @@ pub async fn retrieve_payment_method_with_temporary_token(
 
     Ok::<_, error_stack::Report<errors::ApiErrorResponse>>(match pm {
         Some(api::PaymentMethodData::Card(card)) => {
+            let mut updated_card = card.clone();
+            let mut is_card_updated = false;
+
+            let name_on_card = if card.card_holder_name.clone().expose().is_empty() {
+                card_token_data
+                    .and_then(|token_data| token_data.card_holder_name.clone())
+                    .filter(|name_on_card| !name_on_card.clone().expose().is_empty())
+                    .map(|name_on_card| {
+                        is_card_updated = true;
+                        name_on_card
+                    })
+            } else {
+                Some(card.card_holder_name.clone())
+            };
+
+            if let Some(name_on_card) = name_on_card {
+                updated_card.card_holder_name = name_on_card;
+            }
+
             if let Some(cvc) = card_cvc {
-                let mut updated_card = card;
+                is_card_updated = true;
                 updated_card.card_cvc = cvc;
+            }
+            if is_card_updated {
                 let updated_pm = api::PaymentMethodData::Card(updated_card);
                 vault::Vault::store_payment_method_data_in_locker(
                     state,
@@ -1423,6 +1445,7 @@ pub async fn retrieve_card_with_permanent_token(
     token: &str,
     payment_intent: &PaymentIntent,
     card_cvc: Option<masking::Secret<String>>,
+    card_token_data: Option<&CardToken>,
 ) -> RouterResult<api::PaymentMethodData> {
     let customer_id = payment_intent
         .customer_id
@@ -1437,13 +1460,23 @@ pub async fn retrieve_card_with_permanent_token(
         .change_context(errors::ApiErrorResponse::InternalServerError)
         .attach_printable("failed to fetch card information from the permanent locker")?;
 
+    let name_on_card = if let Some(name_on_card) = card.name_on_card.clone() {
+        if card.name_on_card.unwrap_or_default().expose().is_empty() {
+            card_token_data
+                .and_then(|token_data| token_data.card_holder_name.clone())
+                .filter(|name_on_card| !name_on_card.clone().expose().is_empty())
+        } else {
+            Some(name_on_card)
+        }
+    } else {
+        card_token_data
+            .and_then(|token_data| token_data.card_holder_name.clone())
+            .filter(|name_on_card| !name_on_card.clone().expose().is_empty())
+    };
+
     let api_card = api::Card {
         card_number: card.card_number,
-        card_holder_name: card
-            .name_on_card
-            .get_required_value("name_on_card")
-            .change_context(errors::ApiErrorResponse::InternalServerError)
-            .attach_printable("card holder name was not saved in permanent locker")?,
+        card_holder_name: name_on_card.unwrap_or(masking::Secret::from("".to_string())),
         card_exp_month: card.card_exp_month,
         card_exp_year: card.card_exp_year,
         card_cvc: card_cvc.unwrap_or_default(),
@@ -1529,6 +1562,11 @@ pub async fn make_pm_data<'a, F: Clone, R, Ctx: PaymentMethodRetrieve>(
 
     let card_cvc = payment_data.card_cvc.clone();
 
+    let card_token_data = request.as_ref().and_then(|pmd| match pmd {
+        api_models::payments::PaymentMethodData::CardToken(token_data) => Some(token_data),
+        _ => None,
+    });
+
     // TODO: Handle case where payment method and token both are present in request properly.
     let payment_method = match (request, hyperswitch_token) {
         (_, Some(hyperswitch_token)) => {
@@ -1538,6 +1576,7 @@ pub async fn make_pm_data<'a, F: Clone, R, Ctx: PaymentMethodRetrieve>(
                 &hyperswitch_token,
                 &payment_data.payment_intent,
                 card_cvc,
+                card_token_data,
             )
             .await
             .attach_printable("in 'make_pm_data'")?;
@@ -2529,6 +2568,9 @@ mod tests {
             payment_confirm_source: None,
             surcharge_applicable: None,
             updated_by: storage_enums::MerchantStorageScheme::PostgresOnly.to_string(),
+            request_incremental_authorization:
+                common_enums::RequestIncrementalAuthorization::default(),
+            incremental_authorization_allowed: None,
         };
         let req_cs = Some("1".to_string());
         let merchant_fulfillment_time = Some(900);
@@ -2579,6 +2621,9 @@ mod tests {
             payment_confirm_source: None,
             surcharge_applicable: None,
             updated_by: storage_enums::MerchantStorageScheme::PostgresOnly.to_string(),
+            request_incremental_authorization:
+                common_enums::RequestIncrementalAuthorization::default(),
+            incremental_authorization_allowed: None,
         };
         let req_cs = Some("1".to_string());
         let merchant_fulfillment_time = Some(10);
@@ -2629,6 +2674,9 @@ mod tests {
             payment_confirm_source: None,
             surcharge_applicable: None,
             updated_by: storage_enums::MerchantStorageScheme::PostgresOnly.to_string(),
+            request_incremental_authorization:
+                common_enums::RequestIncrementalAuthorization::default(),
+            incremental_authorization_allowed: None,
         };
         let req_cs = Some("1".to_string());
         let merchant_fulfillment_time = Some(10);
@@ -3314,6 +3362,9 @@ pub async fn get_additional_payment_data(
         api_models::payments::PaymentMethodData::GiftCard(_) => {
             api_models::payments::AdditionalPaymentData::GiftCard {}
         }
+        api_models::payments::PaymentMethodData::CardToken(_) => {
+            api_models::payments::AdditionalPaymentData::CardToken {}
+        }
     }
 }
 
@@ -3613,6 +3664,12 @@ pub fn get_key_params_for_surcharge_details(
             gift_card.get_payment_method_type(),
             None,
         )),
+        api_models::payments::PaymentMethodData::CardToken(_) => {
+            Err(errors::ApiErrorResponse::InvalidDataValue {
+                field_name: "payment_method_data",
+            }
+            .into())
+        }
     }
 }
 
diff --git a/crates/router/src/core/payments/operations/payment_cancel.rs b/crates/router/src/core/payments/operations/payment_cancel.rs
index d4605b47c438..ae7810971896 100644
--- a/crates/router/src/core/payments/operations/payment_cancel.rs
+++ b/crates/router/src/core/payments/operations/payment_cancel.rs
@@ -212,6 +212,7 @@ impl<F: Clone, Ctx: PaymentMethodRetrieve>
                 let payment_intent_update = storage::PaymentIntentUpdate::PGStatusUpdate {
                     status: enums::IntentStatus::Cancelled,
                     updated_by: storage_scheme.to_string(),
+                    incremental_authorization_allowed: None,
                 };
                 (Some(payment_intent_update), enums::AttemptStatus::Voided)
             } else {
diff --git a/crates/router/src/core/payments/operations/payment_confirm.rs b/crates/router/src/core/payments/operations/payment_confirm.rs
index 28b6dbec96ab..d718db79a6d0 100644
--- a/crates/router/src/core/payments/operations/payment_confirm.rs
+++ b/crates/router/src/core/payments/operations/payment_confirm.rs
@@ -419,6 +419,15 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
             .attach_printable("Error converting feature_metadata to Value")?
             .or(payment_intent.feature_metadata);
         payment_intent.metadata = request.metadata.clone().or(payment_intent.metadata);
+        payment_intent.request_incremental_authorization = request
+            .request_incremental_authorization
+            .map(|request_incremental_authorization| {
+                core_utils::get_request_incremental_authorization_value(
+                    Some(request_incremental_authorization),
+                    payment_attempt.capture_method,
+                )
+            })
+            .unwrap_or(Ok(payment_intent.request_incremental_authorization))?;
         payment_attempt.business_sub_label = request
             .business_sub_label
             .clone()
diff --git a/crates/router/src/core/payments/operations/payment_create.rs b/crates/router/src/core/payments/operations/payment_create.rs
index ce3ce6984f5c..63b7ab16844a 100644
--- a/crates/router/src/core/payments/operations/payment_create.rs
+++ b/crates/router/src/core/payments/operations/payment_create.rs
@@ -728,6 +728,12 @@ impl PaymentCreate {
 
         let payment_link_id = payment_link_data.map(|pl_data| pl_data.payment_link_id);
 
+        let request_incremental_authorization =
+            core_utils::get_request_incremental_authorization_value(
+                request.request_incremental_authorization,
+                request.capture_method,
+            )?;
+
         Ok(storage::PaymentIntentNew {
             payment_id: payment_id.to_string(),
             merchant_id: merchant_account.merchant_id.to_string(),
@@ -764,6 +770,8 @@ impl PaymentCreate {
             payment_confirm_source: None,
             surcharge_applicable: None,
             updated_by: merchant_account.storage_scheme.to_string(),
+            request_incremental_authorization,
+            incremental_authorization_allowed: None,
         })
     }
 
diff --git a/crates/router/src/core/payments/operations/payment_response.rs b/crates/router/src/core/payments/operations/payment_response.rs
index 2de5df38dba4..9781ad651ee2 100644
--- a/crates/router/src/core/payments/operations/payment_response.rs
+++ b/crates/router/src/core/payments/operations/payment_response.rs
@@ -418,8 +418,18 @@ async fn payment_response_update_tracker<F: Clone, T: types::Capturable>(
                 redirection_data,
                 connector_metadata,
                 connector_response_reference_id,
+                incremental_authorization_allowed,
                 ..
             } => {
+                payment_data
+                    .payment_intent
+                    .incremental_authorization_allowed =
+                    core_utils::get_incremental_authorization_allowed_value(
+                        incremental_authorization_allowed,
+                        payment_data
+                            .payment_intent
+                            .request_incremental_authorization,
+                    );
                 let connector_transaction_id = match resource_id {
                     types::ResponseId::NoResponseId => None,
                     types::ResponseId::ConnectorTransactionId(id)
@@ -627,6 +637,7 @@ async fn payment_response_update_tracker<F: Clone, T: types::Capturable>(
                 payment_data.payment_attempt.status,
             ),
             updated_by: storage_scheme.to_string(),
+            incremental_authorization_allowed: Some(false),
         },
         Ok(_) => storage::PaymentIntentUpdate::ResponseUpdate {
             status: api_models::enums::IntentStatus::foreign_from(
@@ -635,6 +646,9 @@ async fn payment_response_update_tracker<F: Clone, T: types::Capturable>(
             return_url: router_data.return_url.clone(),
             amount_captured,
             updated_by: storage_scheme.to_string(),
+            incremental_authorization_allowed: payment_data
+                .payment_intent
+                .incremental_authorization_allowed,
         },
     };
 
diff --git a/crates/router/src/core/payments/routing.rs b/crates/router/src/core/payments/routing.rs
index 841b48b9444a..96cd65615199 100644
--- a/crates/router/src/core/payments/routing.rs
+++ b/crates/router/src/core/payments/routing.rs
@@ -523,8 +523,10 @@ pub async fn refresh_kgraph_cache(
         .await
         .change_context(errors::RoutingError::KgraphCacheRefreshFailed)?;
 
-    merchant_connector_accounts
-        .retain(|mca| mca.connector_type != storage_enums::ConnectorType::PaymentVas);
+    merchant_connector_accounts.retain(|mca| {
+        mca.connector_type != storage_enums::ConnectorType::PaymentVas
+            && mca.connector_type != storage_enums::ConnectorType::PaymentMethodAuth
+    });
 
     #[cfg(feature = "business_profile_routing")]
     let merchant_connector_accounts = payments_oss::helpers::filter_mca_based_on_business_profile(
diff --git a/crates/router/src/core/payments/routing/transformers.rs b/crates/router/src/core/payments/routing/transformers.rs
index 5704f82f4983..b273f18f3fd8 100644
--- a/crates/router/src/core/payments/routing/transformers.rs
+++ b/crates/router/src/core/payments/routing/transformers.rs
@@ -1,15 +1,15 @@
-use api_models::{self, enums as api_enums, routing as routing_types};
+use api_models::{self, routing as routing_types};
 use diesel_models::enums as storage_enums;
 use euclid::{enums as dsl_enums, frontend::ast as dsl_ast};
 
-use crate::types::transformers::{ForeignFrom, ForeignInto};
+use crate::types::transformers::ForeignFrom;
 
 impl ForeignFrom<routing_types::RoutableConnectorChoice> for dsl_ast::ConnectorChoice {
     fn foreign_from(from: routing_types::RoutableConnectorChoice) -> Self {
         Self {
             // #[cfg(feature = "backwards_compatibility")]
             // choice_kind: from.choice_kind.foreign_into(),
-            connector: from.connector.foreign_into(),
+            connector: from.connector,
             #[cfg(not(feature = "connector_choice_mca_id"))]
             sub_label: from.sub_label,
         }
@@ -52,72 +52,3 @@ impl ForeignFrom<storage_enums::MandateDataType> for dsl_enums::MandateType {
         }
     }
 }
-
-impl ForeignFrom<api_enums::RoutableConnectors> for dsl_enums::Connector {
-    fn foreign_from(from: api_enums::RoutableConnectors) -> Self {
-        match from {
-            #[cfg(feature = "dummy_connector")]
-            api_enums::RoutableConnectors::DummyConnector1 => Self::DummyConnector1,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::RoutableConnectors::DummyConnector2 => Self::DummyConnector2,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::RoutableConnectors::DummyConnector3 => Self::DummyConnector3,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::RoutableConnectors::DummyConnector4 => Self::DummyConnector4,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::RoutableConnectors::DummyConnector5 => Self::DummyConnector5,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::RoutableConnectors::DummyConnector6 => Self::DummyConnector6,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::RoutableConnectors::DummyConnector7 => Self::DummyConnector7,
-            api_enums::RoutableConnectors::Aci => Self::Aci,
-            api_enums::RoutableConnectors::Adyen => Self::Adyen,
-            api_enums::RoutableConnectors::Airwallex => Self::Airwallex,
-            api_enums::RoutableConnectors::Authorizedotnet => Self::Authorizedotnet,
-            api_enums::RoutableConnectors::Bambora => Self::Bambora,
-            api_enums::RoutableConnectors::Bankofamerica => Self::Bankofamerica,
-            api_enums::RoutableConnectors::Bitpay => Self::Bitpay,
-            api_enums::RoutableConnectors::Bluesnap => Self::Bluesnap,
-            api_enums::RoutableConnectors::Boku => Self::Boku,
-            api_enums::RoutableConnectors::Braintree => Self::Braintree,
-            api_enums::RoutableConnectors::Cashtocode => Self::Cashtocode,
-            api_enums::RoutableConnectors::Checkout => Self::Checkout,
-            api_enums::RoutableConnectors::Coinbase => Self::Coinbase,
-            api_enums::RoutableConnectors::Cryptopay => Self::Cryptopay,
-            api_enums::RoutableConnectors::Cybersource => Self::Cybersource,
-            api_enums::RoutableConnectors::Dlocal => Self::Dlocal,
-            api_enums::RoutableConnectors::Fiserv => Self::Fiserv,
-            api_enums::RoutableConnectors::Forte => Self::Forte,
-            api_enums::RoutableConnectors::Globalpay => Self::Globalpay,
-            api_enums::RoutableConnectors::Globepay => Self::Globepay,
-            api_enums::RoutableConnectors::Gocardless => Self::Gocardless,
-            api_enums::RoutableConnectors::Helcim => Self::Helcim,
-            api_enums::RoutableConnectors::Iatapay => Self::Iatapay,
-            api_enums::RoutableConnectors::Klarna => Self::Klarna,
-            api_enums::RoutableConnectors::Mollie => Self::Mollie,
-            api_enums::RoutableConnectors::Multisafepay => Self::Multisafepay,
-            api_enums::RoutableConnectors::Nexinets => Self::Nexinets,
-            api_enums::RoutableConnectors::Nmi => Self::Nmi,
-            api_enums::RoutableConnectors::Noon => Self::Noon,
-            api_enums::RoutableConnectors::Nuvei => Self::Nuvei,
-            api_enums::RoutableConnectors::Opennode => Self::Opennode,
-            api_enums::RoutableConnectors::Payme => Self::Payme,
-            api_enums::RoutableConnectors::Paypal => Self::Paypal,
-            api_enums::RoutableConnectors::Payu => Self::Payu,
-            api_enums::RoutableConnectors::Powertranz => Self::Powertranz,
-            api_enums::RoutableConnectors::Prophetpay => Self::Prophetpay,
-            api_enums::RoutableConnectors::Rapyd => Self::Rapyd,
-            api_enums::RoutableConnectors::Shift4 => Self::Shift4,
-            api_enums::RoutableConnectors::Square => Self::Square,
-            api_enums::RoutableConnectors::Stax => Self::Stax,
-            api_enums::RoutableConnectors::Stripe => Self::Stripe,
-            api_enums::RoutableConnectors::Trustpay => Self::Trustpay,
-            api_enums::RoutableConnectors::Tsys => Self::Tsys,
-            api_enums::RoutableConnectors::Volt => Self::Volt,
-            api_enums::RoutableConnectors::Wise => Self::Wise,
-            api_enums::RoutableConnectors::Worldline => Self::Worldline,
-            api_enums::RoutableConnectors::Worldpay => Self::Worldpay,
-            api_enums::RoutableConnectors::Zen => Self::Zen,
-        }
-    }
-}
diff --git a/crates/router/src/core/payments/transformers.rs b/crates/router/src/core/payments/transformers.rs
index f395c023128c..51e139c97988 100644
--- a/crates/router/src/core/payments/transformers.rs
+++ b/crates/router/src/core/payments/transformers.rs
@@ -1,6 +1,7 @@
 use std::{fmt::Debug, marker::PhantomData, str::FromStr};
 
 use api_models::payments::{FrmMessage, RequestSurchargeDetails};
+use common_enums::RequestIncrementalAuthorization;
 use common_utils::{consts::X_HS_LATENCY, fp_utils};
 use diesel_models::ephemeral_key;
 use error_stack::{IntoReport, ResultExt};
@@ -80,6 +81,7 @@ where
         connector_metadata: None,
         network_txn_id: None,
         connector_response_reference_id: None,
+        incremental_authorization_allowed: None,
     });
 
     let additional_data = PaymentAdditionalData {
@@ -687,6 +689,9 @@ where
                         .set_merchant_connector_id(payment_attempt.merchant_connector_id)
                         .set_unified_code(payment_attempt.unified_code)
                         .set_unified_message(payment_attempt.unified_message)
+                        .set_incremental_authorization_allowed(
+                            payment_intent.incremental_authorization_allowed,
+                        )
                         .to_owned(),
                     headers,
                 ))
@@ -749,6 +754,7 @@ where
                 surcharge_details,
                 unified_code: payment_attempt.unified_code,
                 unified_message: payment_attempt.unified_message,
+                incremental_authorization_allowed: payment_intent.incremental_authorization_allowed,
                 ..Default::default()
             },
             headers,
@@ -1036,6 +1042,12 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsAuthoriz
             complete_authorize_url,
             customer_id: None,
             surcharge_details: payment_data.surcharge_details,
+            request_incremental_authorization: matches!(
+                payment_data
+                    .payment_intent
+                    .request_incremental_authorization,
+                RequestIncrementalAuthorization::True | RequestIncrementalAuthorization::Default
+            ),
         })
     }
 }
@@ -1274,6 +1286,12 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::SetupMandateRequ
             return_url: payment_data.payment_intent.return_url,
             browser_info,
             payment_method_type: attempt.payment_method_type,
+            request_incremental_authorization: matches!(
+                payment_data
+                    .payment_intent
+                    .request_incremental_authorization,
+                RequestIncrementalAuthorization::True | RequestIncrementalAuthorization::Default
+            ),
         })
     }
 }
@@ -1428,6 +1446,7 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsPreProce
             complete_authorize_url,
             browser_info,
             surcharge_details: payment_data.surcharge_details,
+            connector_transaction_id: payment_data.payment_attempt.connector_transaction_id,
         })
     }
 }
diff --git a/crates/router/src/core/refunds.rs b/crates/router/src/core/refunds.rs
index aba6e9794e04..c43c00b7259c 100644
--- a/crates/router/src/core/refunds.rs
+++ b/crates/router/src/core/refunds.rs
@@ -50,10 +50,16 @@ pub async fn refund_create_core(
         .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;
 
     utils::when(
-        payment_intent.status != enums::IntentStatus::Succeeded,
+        !(payment_intent.status == enums::IntentStatus::Succeeded
+            || payment_intent.status == enums::IntentStatus::PartiallyCaptured),
         || {
-            Err(report!(errors::ApiErrorResponse::PaymentNotSucceeded)
-                .attach_printable("unable to refund for a unsuccessful payment intent"))
+            Err(report!(errors::ApiErrorResponse::PaymentUnexpectedState {
+                current_flow: "refund".into(),
+                field_name: "status".into(),
+                current_value: payment_intent.status.to_string(),
+                states: "succeeded, partially_captured".to_string()
+            })
+            .attach_printable("unable to refund for a unsuccessful payment intent"))
         },
     )?;
 
@@ -75,7 +81,7 @@ pub async fn refund_create_core(
     })?;
 
     payment_attempt = db
-        .find_payment_attempt_last_successful_attempt_by_payment_id_merchant_id(
+        .find_payment_attempt_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
             &req.payment_id,
             merchant_id,
             merchant_account.storage_scheme,
@@ -205,7 +211,10 @@ pub async fn trigger_refund_to_gateway(
                     errors::ConnectorError::NotImplemented(message) => {
                         Some(storage::RefundUpdate::ErrorUpdate {
                             refund_status: Some(enums::RefundStatus::Failure),
-                            refund_error_message: Some(message.to_string()),
+                            refund_error_message: Some(
+                                errors::ConnectorError::NotImplemented(message.to_owned())
+                                    .to_string(),
+                            ),
                             refund_error_code: Some("NOT_IMPLEMENTED".to_string()),
                             updated_by: storage_scheme.to_string(),
                         })
@@ -921,7 +930,9 @@ pub async fn start_refund_workflow(
 ) -> Result<(), errors::ProcessTrackerError> {
     match refund_tracker.name.as_deref() {
         Some("EXECUTE_REFUND") => trigger_refund_execute_workflow(state, refund_tracker).await,
-        Some("SYNC_REFUND") => sync_refund_with_gateway_workflow(state, refund_tracker).await,
+        Some("SYNC_REFUND") => {
+            Box::pin(sync_refund_with_gateway_workflow(state, refund_tracker)).await
+        }
         _ => Err(errors::ProcessTrackerError::JobNotFound),
     }
 }
diff --git a/crates/router/src/core/user.rs b/crates/router/src/core/user.rs
index 94cd482a2291..9a199d09b8fd 100644
--- a/crates/router/src/core/user.rs
+++ b/crates/router/src/core/user.rs
@@ -13,6 +13,8 @@ use crate::{
     types::domain,
 };
 
+pub mod dashboard_metadata;
+
 pub async fn connect_account(
     state: AppState,
     request: api::ConnectAccountRequest,
@@ -70,6 +72,28 @@ pub async fn connect_account(
             .get_jwt_auth_token(state.clone(), user_role.org_id)
             .await?;
 
+        #[cfg(feature = "email")]
+        {
+            use router_env::logger;
+
+            use crate::services::email::types as email_types;
+
+            let email_contents = email_types::WelcomeEmail {
+                recipient_email: domain::UserEmail::from_pii_email(user_from_db.get_email())?,
+                settings: state.conf.clone(),
+            };
+
+            let send_email_result = state
+                .email_client
+                .compose_and_send_email(
+                    Box::new(email_contents),
+                    state.conf.proxy.https_url.as_ref(),
+                )
+                .await;
+
+            logger::info!(?send_email_result);
+        }
+
         return Ok(ApplicationResponse::Json(api::ConnectAccountResponse {
             token: Secret::new(jwt_token),
             merchant_id: user_role.merchant_id,
diff --git a/crates/router/src/core/user/dashboard_metadata.rs b/crates/router/src/core/user/dashboard_metadata.rs
new file mode 100644
index 000000000000..de385fb8ed65
--- /dev/null
+++ b/crates/router/src/core/user/dashboard_metadata.rs
@@ -0,0 +1,537 @@
+use api_models::user::dashboard_metadata::{self as api, GetMultipleMetaDataPayload};
+use diesel_models::{
+    enums::DashboardMetadata as DBEnum, user::dashboard_metadata::DashboardMetadata,
+};
+use error_stack::ResultExt;
+
+use crate::{
+    core::errors::{UserErrors, UserResponse, UserResult},
+    routes::AppState,
+    services::{authentication::UserFromToken, ApplicationResponse},
+    types::domain::{user::dashboard_metadata as types, MerchantKeyStore},
+    utils::user::dashboard_metadata as utils,
+};
+
+pub async fn set_metadata(
+    state: AppState,
+    user: UserFromToken,
+    request: api::SetMetaDataRequest,
+) -> UserResponse<()> {
+    let metadata_value = parse_set_request(request)?;
+    let metadata_key = DBEnum::from(&metadata_value);
+
+    insert_metadata(&state, user, metadata_key, metadata_value).await?;
+
+    Ok(ApplicationResponse::StatusOk)
+}
+
+pub async fn get_multiple_metadata(
+    state: AppState,
+    user: UserFromToken,
+    request: GetMultipleMetaDataPayload,
+) -> UserResponse<Vec<api::GetMetaDataResponse>> {
+    let metadata_keys: Vec<DBEnum> = request.results.into_iter().map(parse_get_request).collect();
+
+    let metadata = fetch_metadata(&state, &user, metadata_keys.clone()).await?;
+
+    let mut response = Vec::with_capacity(metadata_keys.len());
+    for key in metadata_keys {
+        let data = metadata.iter().find(|ele| ele.data_key == key);
+        let resp;
+        if data.is_none() && utils::is_backfill_required(&key) {
+            let backfill_data = backfill_metadata(&state, &user, &key).await?;
+            resp = into_response(backfill_data.as_ref(), &key)?;
+        } else {
+            resp = into_response(data, &key)?;
+        }
+        response.push(resp);
+    }
+
+    Ok(ApplicationResponse::Json(response))
+}
+
+fn parse_set_request(data_enum: api::SetMetaDataRequest) -> UserResult<types::MetaData> {
+    match data_enum {
+        api::SetMetaDataRequest::ProductionAgreement(req) => {
+            let ip_address = req
+                .ip_address
+                .ok_or(UserErrors::InternalServerError.into())
+                .attach_printable("Error Getting Ip Address")?;
+            Ok(types::MetaData::ProductionAgreement(
+                types::ProductionAgreementValue {
+                    version: req.version,
+                    ip_address,
+                    timestamp: common_utils::date_time::now(),
+                },
+            ))
+        }
+        api::SetMetaDataRequest::SetupProcessor(req) => Ok(types::MetaData::SetupProcessor(req)),
+        api::SetMetaDataRequest::ConfigureEndpoint => Ok(types::MetaData::ConfigureEndpoint(true)),
+        api::SetMetaDataRequest::SetupComplete => Ok(types::MetaData::SetupComplete(true)),
+        api::SetMetaDataRequest::FirstProcessorConnected(req) => {
+            Ok(types::MetaData::FirstProcessorConnected(req))
+        }
+        api::SetMetaDataRequest::SecondProcessorConnected(req) => {
+            Ok(types::MetaData::SecondProcessorConnected(req))
+        }
+        api::SetMetaDataRequest::ConfiguredRouting(req) => {
+            Ok(types::MetaData::ConfiguredRouting(req))
+        }
+        api::SetMetaDataRequest::TestPayment(req) => Ok(types::MetaData::TestPayment(req)),
+        api::SetMetaDataRequest::IntegrationMethod(req) => {
+            Ok(types::MetaData::IntegrationMethod(req))
+        }
+        api::SetMetaDataRequest::IntegrationCompleted => {
+            Ok(types::MetaData::IntegrationCompleted(true))
+        }
+        api::SetMetaDataRequest::SPRoutingConfigured(req) => {
+            Ok(types::MetaData::SPRoutingConfigured(req))
+        }
+        api::SetMetaDataRequest::SPTestPayment => Ok(types::MetaData::SPTestPayment(true)),
+        api::SetMetaDataRequest::DownloadWoocom => Ok(types::MetaData::DownloadWoocom(true)),
+        api::SetMetaDataRequest::ConfigureWoocom => Ok(types::MetaData::ConfigureWoocom(true)),
+        api::SetMetaDataRequest::SetupWoocomWebhook => {
+            Ok(types::MetaData::SetupWoocomWebhook(true))
+        }
+        api::SetMetaDataRequest::IsMultipleConfiguration => {
+            Ok(types::MetaData::IsMultipleConfiguration(true))
+        }
+    }
+}
+
+fn parse_get_request(data_enum: api::GetMetaDataRequest) -> DBEnum {
+    match data_enum {
+        api::GetMetaDataRequest::ProductionAgreement => DBEnum::ProductionAgreement,
+        api::GetMetaDataRequest::SetupProcessor => DBEnum::SetupProcessor,
+        api::GetMetaDataRequest::ConfigureEndpoint => DBEnum::ConfigureEndpoint,
+        api::GetMetaDataRequest::SetupComplete => DBEnum::SetupComplete,
+        api::GetMetaDataRequest::FirstProcessorConnected => DBEnum::FirstProcessorConnected,
+        api::GetMetaDataRequest::SecondProcessorConnected => DBEnum::SecondProcessorConnected,
+        api::GetMetaDataRequest::ConfiguredRouting => DBEnum::ConfiguredRouting,
+        api::GetMetaDataRequest::TestPayment => DBEnum::TestPayment,
+        api::GetMetaDataRequest::IntegrationMethod => DBEnum::IntegrationMethod,
+        api::GetMetaDataRequest::IntegrationCompleted => DBEnum::IntegrationCompleted,
+        api::GetMetaDataRequest::StripeConnected => DBEnum::StripeConnected,
+        api::GetMetaDataRequest::PaypalConnected => DBEnum::PaypalConnected,
+        api::GetMetaDataRequest::SPRoutingConfigured => DBEnum::SpRoutingConfigured,
+        api::GetMetaDataRequest::SPTestPayment => DBEnum::SpTestPayment,
+        api::GetMetaDataRequest::DownloadWoocom => DBEnum::DownloadWoocom,
+        api::GetMetaDataRequest::ConfigureWoocom => DBEnum::ConfigureWoocom,
+        api::GetMetaDataRequest::SetupWoocomWebhook => DBEnum::SetupWoocomWebhook,
+        api::GetMetaDataRequest::IsMultipleConfiguration => DBEnum::IsMultipleConfiguration,
+    }
+}
+
+fn into_response(
+    data: Option<&DashboardMetadata>,
+    data_type: &DBEnum,
+) -> UserResult<api::GetMetaDataResponse> {
+    match data_type {
+        DBEnum::ProductionAgreement => Ok(api::GetMetaDataResponse::ProductionAgreement(
+            data.is_some(),
+        )),
+        DBEnum::SetupProcessor => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::SetupProcessor(resp))
+        }
+        DBEnum::ConfigureEndpoint => {
+            Ok(api::GetMetaDataResponse::ConfigureEndpoint(data.is_some()))
+        }
+        DBEnum::SetupComplete => Ok(api::GetMetaDataResponse::SetupComplete(data.is_some())),
+        DBEnum::FirstProcessorConnected => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::FirstProcessorConnected(resp))
+        }
+        DBEnum::SecondProcessorConnected => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::SecondProcessorConnected(resp))
+        }
+        DBEnum::ConfiguredRouting => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::ConfiguredRouting(resp))
+        }
+        DBEnum::TestPayment => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::TestPayment(resp))
+        }
+        DBEnum::IntegrationMethod => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::IntegrationMethod(resp))
+        }
+        DBEnum::IntegrationCompleted => Ok(api::GetMetaDataResponse::IntegrationCompleted(
+            data.is_some(),
+        )),
+        DBEnum::StripeConnected => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::StripeConnected(resp))
+        }
+        DBEnum::PaypalConnected => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::PaypalConnected(resp))
+        }
+        DBEnum::SpRoutingConfigured => {
+            let resp = utils::deserialize_to_response(data)?;
+            Ok(api::GetMetaDataResponse::SPRoutingConfigured(resp))
+        }
+        DBEnum::SpTestPayment => Ok(api::GetMetaDataResponse::SPTestPayment(data.is_some())),
+        DBEnum::DownloadWoocom => Ok(api::GetMetaDataResponse::DownloadWoocom(data.is_some())),
+        DBEnum::ConfigureWoocom => Ok(api::GetMetaDataResponse::ConfigureWoocom(data.is_some())),
+        DBEnum::SetupWoocomWebhook => {
+            Ok(api::GetMetaDataResponse::SetupWoocomWebhook(data.is_some()))
+        }
+
+        DBEnum::IsMultipleConfiguration => Ok(api::GetMetaDataResponse::IsMultipleConfiguration(
+            data.is_some(),
+        )),
+    }
+}
+
+async fn insert_metadata(
+    state: &AppState,
+    user: UserFromToken,
+    metadata_key: DBEnum,
+    metadata_value: types::MetaData,
+) -> UserResult<DashboardMetadata> {
+    match metadata_value {
+        types::MetaData::ProductionAgreement(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::SetupProcessor(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::ConfigureEndpoint(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::SetupComplete(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::FirstProcessorConnected(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::SecondProcessorConnected(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::ConfiguredRouting(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::TestPayment(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::IntegrationMethod(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::IntegrationCompleted(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::StripeConnected(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::PaypalConnected(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::SPRoutingConfigured(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::SPTestPayment(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::DownloadWoocom(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::ConfigureWoocom(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::SetupWoocomWebhook(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+        types::MetaData::IsMultipleConfiguration(data) => {
+            utils::insert_merchant_scoped_metadata_to_db(
+                state,
+                user.user_id,
+                user.merchant_id,
+                user.org_id,
+                metadata_key,
+                data,
+            )
+            .await
+        }
+    }
+}
+
+async fn fetch_metadata(
+    state: &AppState,
+    user: &UserFromToken,
+    metadata_keys: Vec<DBEnum>,
+) -> UserResult<Vec<DashboardMetadata>> {
+    let mut dashboard_metadata = Vec::with_capacity(metadata_keys.len());
+    let (merchant_scoped_enums, _) = utils::separate_metadata_type_based_on_scope(metadata_keys);
+
+    if !merchant_scoped_enums.is_empty() {
+        let mut res = utils::get_merchant_scoped_metadata_from_db(
+            state,
+            user.merchant_id.to_owned(),
+            user.org_id.to_owned(),
+            merchant_scoped_enums,
+        )
+        .await?;
+        dashboard_metadata.append(&mut res);
+    }
+
+    Ok(dashboard_metadata)
+}
+
+pub async fn backfill_metadata(
+    state: &AppState,
+    user: &UserFromToken,
+    key: &DBEnum,
+) -> UserResult<Option<DashboardMetadata>> {
+    let key_store = state
+        .store
+        .get_merchant_key_store_by_merchant_id(
+            &user.merchant_id,
+            &state.store.get_master_key().to_vec().into(),
+        )
+        .await
+        .change_context(UserErrors::InternalServerError)?;
+
+    match key {
+        DBEnum::StripeConnected => {
+            let mca = if let Some(stripe_connected) = get_merchant_connector_account_by_name(
+                state,
+                &user.merchant_id,
+                api_models::enums::RoutableConnectors::Stripe
+                    .to_string()
+                    .as_str(),
+                &key_store,
+            )
+            .await?
+            {
+                stripe_connected
+            } else if let Some(stripe_test_connected) = get_merchant_connector_account_by_name(
+                state,
+                &user.merchant_id,
+                //TODO: Use Enum with proper feature flag
+                "stripe_test",
+                &key_store,
+            )
+            .await?
+            {
+                stripe_test_connected
+            } else {
+                return Ok(None);
+            };
+
+            Some(
+                insert_metadata(
+                    state,
+                    user.to_owned(),
+                    DBEnum::StripeConnected,
+                    types::MetaData::StripeConnected(api::ProcessorConnected {
+                        processor_id: mca.merchant_connector_id,
+                        processor_name: mca.connector_name,
+                    }),
+                )
+                .await,
+            )
+            .transpose()
+        }
+        DBEnum::PaypalConnected => {
+            let mca = if let Some(paypal_connected) = get_merchant_connector_account_by_name(
+                state,
+                &user.merchant_id,
+                api_models::enums::RoutableConnectors::Paypal
+                    .to_string()
+                    .as_str(),
+                &key_store,
+            )
+            .await?
+            {
+                paypal_connected
+            } else if let Some(paypal_test_connected) = get_merchant_connector_account_by_name(
+                state,
+                &user.merchant_id,
+                //TODO: Use Enum with proper feature flag
+                "paypal_test",
+                &key_store,
+            )
+            .await?
+            {
+                paypal_test_connected
+            } else {
+                return Ok(None);
+            };
+
+            Some(
+                insert_metadata(
+                    state,
+                    user.to_owned(),
+                    DBEnum::PaypalConnected,
+                    types::MetaData::PaypalConnected(api::ProcessorConnected {
+                        processor_id: mca.merchant_connector_id,
+                        processor_name: mca.connector_name,
+                    }),
+                )
+                .await,
+            )
+            .transpose()
+        }
+        _ => Ok(None),
+    }
+}
+
+pub async fn get_merchant_connector_account_by_name(
+    state: &AppState,
+    merchant_id: &str,
+    connector_name: &str,
+    key_store: &MerchantKeyStore,
+) -> UserResult<Option<crate::types::domain::MerchantConnectorAccount>> {
+    state
+        .store
+        .find_merchant_connector_account_by_merchant_id_connector_name(
+            merchant_id,
+            connector_name,
+            key_store,
+        )
+        .await
+        .map_err(|e| {
+            e.change_context(UserErrors::InternalServerError)
+                .attach_printable("DB Error Fetching DashboardMetaData")
+        })
+        .map(|data| data.first().cloned())
+}
diff --git a/crates/router/src/core/utils.rs b/crates/router/src/core/utils.rs
index 5207e4ba8079..670c25c814ed 100644
--- a/crates/router/src/core/utils.rs
+++ b/crates/router/src/core/utils.rs
@@ -4,6 +4,7 @@ use api_models::{
     enums::{DisputeStage, DisputeStatus},
     payment_methods::{SurchargeDetailsResponse, SurchargeMetadata},
 };
+use common_enums::RequestIncrementalAuthorization;
 #[cfg(feature = "payouts")]
 use common_utils::{crypto::Encryptable, pii::Email};
 use common_utils::{
@@ -1133,3 +1134,32 @@ pub async fn get_individual_surcharge_detail_from_redis(
         .get_hash_field_and_deserialize(&redis_key, &value_key, "SurchargeDetailsResponse")
         .await
 }
+
+pub fn get_request_incremental_authorization_value(
+    request_incremental_authorization: Option<bool>,
+    capture_method: Option<common_enums::CaptureMethod>,
+) -> RouterResult<RequestIncrementalAuthorization> {
+    request_incremental_authorization
+        .map(|request_incremental_authorization| {
+            if request_incremental_authorization {
+                if capture_method == Some(common_enums::CaptureMethod::Automatic) {
+                    Err(errors::ApiErrorResponse::NotSupported { message: "incremental authorization is not supported when capture_method is automatic".to_owned() }).into_report()?
+                }
+                Ok(RequestIncrementalAuthorization::True)
+            } else {
+                Ok(RequestIncrementalAuthorization::False)
+            }
+        })
+        .unwrap_or(Ok(RequestIncrementalAuthorization::default()))
+}
+
+pub fn get_incremental_authorization_allowed_value(
+    incremental_authorization_allowed: Option<bool>,
+    request_incremental_authorization: RequestIncrementalAuthorization,
+) -> Option<bool> {
+    if request_incremental_authorization == common_enums::RequestIncrementalAuthorization::False {
+        Some(false)
+    } else {
+        incremental_authorization_allowed
+    }
+}
diff --git a/crates/router/src/core/verify_connector.rs b/crates/router/src/core/verify_connector.rs
new file mode 100644
index 000000000000..e837e8b8b259
--- /dev/null
+++ b/crates/router/src/core/verify_connector.rs
@@ -0,0 +1,63 @@
+use api_models::{enums::Connector, verify_connector::VerifyConnectorRequest};
+use error_stack::{IntoReport, ResultExt};
+
+use crate::{
+    connector,
+    core::errors,
+    services,
+    types::{
+        api,
+        api::verify_connector::{self as types, VerifyConnector},
+    },
+    utils::verify_connector as utils,
+    AppState,
+};
+
+pub async fn verify_connector_credentials(
+    state: AppState,
+    req: VerifyConnectorRequest,
+) -> errors::RouterResponse<()> {
+    let boxed_connector = api::ConnectorData::get_connector_by_name(
+        &state.conf.connectors,
+        &req.connector_name.to_string(),
+        api::GetToken::Connector,
+        None,
+    )
+    .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)?;
+
+    let card_details = utils::get_test_card_details(req.connector_name)?
+        .ok_or(errors::ApiErrorResponse::FlowNotSupported {
+            flow: "Verify credentials".to_string(),
+            connector: req.connector_name.to_string(),
+        })
+        .into_report()?;
+
+    match req.connector_name {
+        Connector::Stripe => {
+            connector::Stripe::verify(
+                &state,
+                types::VerifyConnectorData {
+                    connector: *boxed_connector.connector,
+                    connector_auth: req.connector_account_details.into(),
+                    card_details,
+                },
+            )
+            .await
+        }
+        Connector::Paypal => connector::Paypal::get_access_token(
+            &state,
+            types::VerifyConnectorData {
+                connector: *boxed_connector.connector,
+                connector_auth: req.connector_account_details.into(),
+                card_details,
+            },
+        )
+        .await
+        .map(|_| services::ApplicationResponse::StatusOk),
+        _ => Err(errors::ApiErrorResponse::FlowNotSupported {
+            flow: "Verify credentials".to_string(),
+            connector: req.connector_name.to_string(),
+        })
+        .into_report(),
+    }
+}
diff --git a/crates/router/src/core/webhooks.rs b/crates/router/src/core/webhooks.rs
index 67154ae33aef..be8d118a47c2 100644
--- a/crates/router/src/core/webhooks.rs
+++ b/crates/router/src/core/webhooks.rs
@@ -905,6 +905,7 @@ pub async fn webhooks_wrapper<W: types::OutgoingWebhookType, Ctx: PaymentMethodR
         .attach_printable("Could not convert webhook effect to string")?;
 
     let api_event = ApiEvent::new(
+        Some(merchant_account.merchant_id.clone()),
         flow,
         &request_id,
         request_duration,
@@ -916,6 +917,7 @@ pub async fn webhooks_wrapper<W: types::OutgoingWebhookType, Ctx: PaymentMethodR
         None,
         api_event,
         req,
+        Some(req.method().to_string()),
     );
     match api_event.clone().try_into() {
         Ok(event) => {
diff --git a/crates/router/src/db.rs b/crates/router/src/db.rs
index 9687f7f97c92..086a09b805c6 100644
--- a/crates/router/src/db.rs
+++ b/crates/router/src/db.rs
@@ -6,12 +6,14 @@ pub mod capture;
 pub mod cards_info;
 pub mod configs;
 pub mod customers;
+pub mod dashboard_metadata;
 pub mod dispute;
 pub mod ephemeral_key;
 pub mod events;
 pub mod file;
 pub mod fraud_check;
 pub mod gsm;
+mod kafka_store;
 pub mod locker_mock_up;
 pub mod mandate;
 pub mod merchant_account;
@@ -31,11 +33,24 @@ pub mod user_role;
 use data_models::payments::{
     payment_attempt::PaymentAttemptInterface, payment_intent::PaymentIntentInterface,
 };
+use diesel_models::{
+    fraud_check::{FraudCheck, FraudCheckNew, FraudCheckUpdate},
+    organization::{Organization, OrganizationNew, OrganizationUpdate},
+};
+use error_stack::ResultExt;
 use masking::PeekInterface;
 use redis_interface::errors::RedisError;
-use storage_impl::{redis::kv_store::RedisConnInterface, MockDb};
-
-use crate::{errors::CustomResult, services::Store};
+use storage_impl::{errors::StorageError, redis::kv_store::RedisConnInterface, MockDb};
+
+pub use self::kafka_store::KafkaStore;
+use self::{fraud_check::FraudCheckInterface, organization::OrganizationInterface};
+pub use crate::{
+    errors::CustomResult,
+    services::{
+        kafka::{KafkaError, KafkaProducer, MQResult},
+        Store,
+    },
+};
 
 #[derive(PartialEq, Eq)]
 pub enum StorageImpl {
@@ -54,11 +69,12 @@ pub trait StorageInterface:
     + configs::ConfigInterface
     + capture::CaptureInterface
     + customers::CustomerInterface
+    + dashboard_metadata::DashboardMetadataInterface
     + dispute::DisputeInterface
     + ephemeral_key::EphemeralKeyInterface
     + events::EventInterface
     + file::FileMetadataInterface
-    + fraud_check::FraudCheckInterface
+    + FraudCheckInterface
     + locker_mock_up::LockerMockUpInterface
     + mandate::MandateInterface
     + merchant_account::MerchantAccountInterface
@@ -79,7 +95,7 @@ pub trait StorageInterface:
     + RedisConnInterface
     + RequestIdStore
     + business_profile::BusinessProfileInterface
-    + organization::OrganizationInterface
+    + OrganizationInterface
     + routing_algorithm::RoutingAlgorithmInterface
     + gsm::GsmInterface
     + user::UserInterface
@@ -151,7 +167,6 @@ where
     T: serde::de::DeserializeOwned,
 {
     use common_utils::ext_traits::ByteSliceExt;
-    use error_stack::ResultExt;
 
     let bytes = db.get_key(key).await?;
     bytes
@@ -160,3 +175,72 @@ where
 }
 
 dyn_clone::clone_trait_object!(StorageInterface);
+
+impl RequestIdStore for KafkaStore {
+    fn add_request_id(&mut self, request_id: String) {
+        self.diesel_store.add_request_id(request_id)
+    }
+}
+
+#[async_trait::async_trait]
+impl FraudCheckInterface for KafkaStore {
+    async fn insert_fraud_check_response(
+        &self,
+        new: FraudCheckNew,
+    ) -> CustomResult<FraudCheck, StorageError> {
+        self.diesel_store.insert_fraud_check_response(new).await
+    }
+    async fn update_fraud_check_response_with_attempt_id(
+        &self,
+        fraud_check: FraudCheck,
+        fraud_check_update: FraudCheckUpdate,
+    ) -> CustomResult<FraudCheck, StorageError> {
+        self.diesel_store
+            .update_fraud_check_response_with_attempt_id(fraud_check, fraud_check_update)
+            .await
+    }
+    async fn find_fraud_check_by_payment_id(
+        &self,
+        payment_id: String,
+        merchant_id: String,
+    ) -> CustomResult<FraudCheck, StorageError> {
+        self.diesel_store
+            .find_fraud_check_by_payment_id(payment_id, merchant_id)
+            .await
+    }
+    async fn find_fraud_check_by_payment_id_if_present(
+        &self,
+        payment_id: String,
+        merchant_id: String,
+    ) -> CustomResult<Option<FraudCheck>, StorageError> {
+        self.diesel_store
+            .find_fraud_check_by_payment_id_if_present(payment_id, merchant_id)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl OrganizationInterface for KafkaStore {
+    async fn insert_organization(
+        &self,
+        organization: OrganizationNew,
+    ) -> CustomResult<Organization, StorageError> {
+        self.diesel_store.insert_organization(organization).await
+    }
+    async fn find_organization_by_org_id(
+        &self,
+        org_id: &str,
+    ) -> CustomResult<Organization, StorageError> {
+        self.diesel_store.find_organization_by_org_id(org_id).await
+    }
+
+    async fn update_organization_by_org_id(
+        &self,
+        org_id: &str,
+        update: OrganizationUpdate,
+    ) -> CustomResult<Organization, StorageError> {
+        self.diesel_store
+            .update_organization_by_org_id(org_id, update)
+            .await
+    }
+}
diff --git a/crates/router/src/db/dashboard_metadata.rs b/crates/router/src/db/dashboard_metadata.rs
new file mode 100644
index 000000000000..2e8129398ca3
--- /dev/null
+++ b/crates/router/src/db/dashboard_metadata.rs
@@ -0,0 +1,184 @@
+use diesel_models::{enums, user::dashboard_metadata as storage};
+use error_stack::{IntoReport, ResultExt};
+use storage_impl::MockDb;
+
+use crate::{
+    connection,
+    core::errors::{self, CustomResult},
+    services::Store,
+};
+
+#[async_trait::async_trait]
+pub trait DashboardMetadataInterface {
+    async fn insert_metadata(
+        &self,
+        metadata: storage::DashboardMetadataNew,
+    ) -> CustomResult<storage::DashboardMetadata, errors::StorageError>;
+
+    async fn find_user_scoped_dashboard_metadata(
+        &self,
+        user_id: &str,
+        merchant_id: &str,
+        org_id: &str,
+        data_keys: Vec<enums::DashboardMetadata>,
+    ) -> CustomResult<Vec<storage::DashboardMetadata>, errors::StorageError>;
+    async fn find_merchant_scoped_dashboard_metadata(
+        &self,
+        merchant_id: &str,
+        org_id: &str,
+        data_keys: Vec<enums::DashboardMetadata>,
+    ) -> CustomResult<Vec<storage::DashboardMetadata>, errors::StorageError>;
+}
+
+#[async_trait::async_trait]
+impl DashboardMetadataInterface for Store {
+    async fn insert_metadata(
+        &self,
+        metadata: storage::DashboardMetadataNew,
+    ) -> CustomResult<storage::DashboardMetadata, errors::StorageError> {
+        let conn = connection::pg_connection_write(self).await?;
+        metadata
+            .insert(&conn)
+            .await
+            .map_err(Into::into)
+            .into_report()
+    }
+
+    async fn find_user_scoped_dashboard_metadata(
+        &self,
+        user_id: &str,
+        merchant_id: &str,
+        org_id: &str,
+        data_keys: Vec<enums::DashboardMetadata>,
+    ) -> CustomResult<Vec<storage::DashboardMetadata>, errors::StorageError> {
+        let conn = connection::pg_connection_write(self).await?;
+        storage::DashboardMetadata::find_user_scoped_dashboard_metadata(
+            &conn,
+            user_id.to_owned(),
+            merchant_id.to_owned(),
+            org_id.to_owned(),
+            data_keys,
+        )
+        .await
+        .map_err(Into::into)
+        .into_report()
+    }
+
+    async fn find_merchant_scoped_dashboard_metadata(
+        &self,
+        merchant_id: &str,
+        org_id: &str,
+        data_keys: Vec<enums::DashboardMetadata>,
+    ) -> CustomResult<Vec<storage::DashboardMetadata>, errors::StorageError> {
+        let conn = connection::pg_connection_write(self).await?;
+        storage::DashboardMetadata::find_merchant_scoped_dashboard_metadata(
+            &conn,
+            merchant_id.to_owned(),
+            org_id.to_owned(),
+            data_keys,
+        )
+        .await
+        .map_err(Into::into)
+        .into_report()
+    }
+}
+
+#[async_trait::async_trait]
+impl DashboardMetadataInterface for MockDb {
+    async fn insert_metadata(
+        &self,
+        metadata: storage::DashboardMetadataNew,
+    ) -> CustomResult<storage::DashboardMetadata, errors::StorageError> {
+        let mut dashboard_metadata = self.dashboard_metadata.lock().await;
+        if dashboard_metadata.iter().any(|metadata_inner| {
+            metadata_inner.user_id == metadata.user_id
+                && metadata_inner.merchant_id == metadata.merchant_id
+                && metadata_inner.org_id == metadata.org_id
+                && metadata_inner.data_key == metadata.data_key
+        }) {
+            Err(errors::StorageError::DuplicateValue {
+                entity: "user_id, merchant_id, org_id and data_key",
+                key: None,
+            })?
+        }
+        let metadata_new = storage::DashboardMetadata {
+            id: dashboard_metadata
+                .len()
+                .try_into()
+                .into_report()
+                .change_context(errors::StorageError::MockDbError)?,
+            user_id: metadata.user_id,
+            merchant_id: metadata.merchant_id,
+            org_id: metadata.org_id,
+            data_key: metadata.data_key,
+            data_value: metadata.data_value,
+            created_by: metadata.created_by,
+            created_at: metadata.created_at,
+            last_modified_by: metadata.last_modified_by,
+            last_modified_at: metadata.last_modified_at,
+        };
+        dashboard_metadata.push(metadata_new.clone());
+        Ok(metadata_new)
+    }
+
+    async fn find_user_scoped_dashboard_metadata(
+        &self,
+        user_id: &str,
+        merchant_id: &str,
+        org_id: &str,
+        data_keys: Vec<enums::DashboardMetadata>,
+    ) -> CustomResult<Vec<storage::DashboardMetadata>, errors::StorageError> {
+        let dashboard_metadata = self.dashboard_metadata.lock().await;
+        let query_result = dashboard_metadata
+            .iter()
+            .filter(|metadata_inner| {
+                metadata_inner
+                    .user_id
+                    .clone()
+                    .map(|user_id_inner| user_id_inner == user_id)
+                    .unwrap_or(false)
+                    && metadata_inner.merchant_id == merchant_id
+                    && metadata_inner.org_id == org_id
+                    && data_keys.contains(&metadata_inner.data_key)
+            })
+            .cloned()
+            .collect::<Vec<storage::DashboardMetadata>>();
+
+        if query_result.is_empty() {
+            return Err(errors::StorageError::ValueNotFound(format!(
+                "No dashboard_metadata available for user_id = {user_id},\
+                merchant_id = {merchant_id}, org_id = {org_id} and data_keys = {data_keys:?}",
+            ))
+            .into());
+        }
+        Ok(query_result)
+    }
+
+    async fn find_merchant_scoped_dashboard_metadata(
+        &self,
+        merchant_id: &str,
+        org_id: &str,
+        data_keys: Vec<enums::DashboardMetadata>,
+    ) -> CustomResult<Vec<storage::DashboardMetadata>, errors::StorageError> {
+        let dashboard_metadata = self.dashboard_metadata.lock().await;
+        let query_result = dashboard_metadata
+            .iter()
+            .filter(|metadata_inner| {
+                metadata_inner.user_id.is_none()
+                    && metadata_inner.merchant_id == merchant_id
+                    && metadata_inner.org_id == org_id
+                    && data_keys.contains(&metadata_inner.data_key)
+            })
+            .cloned()
+            .collect::<Vec<storage::DashboardMetadata>>();
+
+        if query_result.is_empty() {
+            return Err(errors::StorageError::ValueNotFound(format!(
+                "No dashboard_metadata available for merchant_id = {merchant_id},\
+                      org_id = {org_id} and data_keyss = {data_keys:?}",
+            ))
+            .into());
+        }
+        Ok(query_result)
+    }
+}
diff --git a/crates/router/src/db/kafka_store.rs b/crates/router/src/db/kafka_store.rs
new file mode 100644
index 000000000000..fcceba7fadba
--- /dev/null
+++ b/crates/router/src/db/kafka_store.rs
@@ -0,0 +1,1953 @@
+use std::sync::Arc;
+
+use common_enums::enums::MerchantStorageScheme;
+use common_utils::errors::CustomResult;
+use data_models::payments::{
+    payment_attempt::PaymentAttemptInterface, payment_intent::PaymentIntentInterface,
+};
+use diesel_models::{
+    enums,
+    enums::ProcessTrackerStatus,
+    ephemeral_key::{EphemeralKey, EphemeralKeyNew},
+    reverse_lookup::{ReverseLookup, ReverseLookupNew},
+    user_role as user_storage,
+};
+use masking::Secret;
+use redis_interface::{errors::RedisError, RedisConnectionPool, RedisEntryId};
+use router_env::logger;
+use scheduler::{
+    db::{process_tracker::ProcessTrackerInterface, queue::QueueInterface},
+    SchedulerInterface,
+};
+use storage_impl::redis::kv_store::RedisConnInterface;
+use time::PrimitiveDateTime;
+
+use super::{
+    dashboard_metadata::DashboardMetadataInterface, user::UserInterface,
+    user_role::UserRoleInterface,
+};
+use crate::{
+    core::errors::{self, ProcessTrackerError},
+    db::{
+        address::AddressInterface,
+        api_keys::ApiKeyInterface,
+        business_profile::BusinessProfileInterface,
+        capture::CaptureInterface,
+        cards_info::CardsInfoInterface,
+        configs::ConfigInterface,
+        customers::CustomerInterface,
+        dispute::DisputeInterface,
+        ephemeral_key::EphemeralKeyInterface,
+        events::EventInterface,
+        file::FileMetadataInterface,
+        gsm::GsmInterface,
+        locker_mock_up::LockerMockUpInterface,
+        mandate::MandateInterface,
+        merchant_account::MerchantAccountInterface,
+        merchant_connector_account::{ConnectorAccessToken, MerchantConnectorAccountInterface},
+        merchant_key_store::MerchantKeyStoreInterface,
+        payment_link::PaymentLinkInterface,
+        payment_method::PaymentMethodInterface,
+        payout_attempt::PayoutAttemptInterface,
+        payouts::PayoutsInterface,
+        refund::RefundInterface,
+        reverse_lookup::ReverseLookupInterface,
+        routing_algorithm::RoutingAlgorithmInterface,
+        MasterKeyInterface, StorageInterface,
+    },
+    services::{authentication, kafka::KafkaProducer, Store},
+    types::{
+        domain,
+        storage::{self, business_profile},
+        AccessToken,
+    },
+};
+
+#[derive(Clone)]
+pub struct KafkaStore {
+    kafka_producer: KafkaProducer,
+    pub diesel_store: Store,
+}
+
+impl KafkaStore {
+    pub async fn new(store: Store, kafka_producer: KafkaProducer) -> Self {
+        Self {
+            kafka_producer,
+            diesel_store: store,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl AddressInterface for KafkaStore {
+    async fn find_address_by_address_id(
+        &self,
+        address_id: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::Address, errors::StorageError> {
+        self.diesel_store
+            .find_address_by_address_id(address_id, key_store)
+            .await
+    }
+
+    async fn update_address(
+        &self,
+        address_id: String,
+        address: storage::AddressUpdate,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::Address, errors::StorageError> {
+        self.diesel_store
+            .update_address(address_id, address, key_store)
+            .await
+    }
+
+    async fn update_address_for_payments(
+        &self,
+        this: domain::Address,
+        address: domain::AddressUpdate,
+        payment_id: String,
+        key_store: &domain::MerchantKeyStore,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<domain::Address, errors::StorageError> {
+        self.diesel_store
+            .update_address_for_payments(this, address, payment_id, key_store, storage_scheme)
+            .await
+    }
+
+    async fn insert_address_for_payments(
+        &self,
+        payment_id: &str,
+        address: domain::Address,
+        key_store: &domain::MerchantKeyStore,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<domain::Address, errors::StorageError> {
+        self.diesel_store
+            .insert_address_for_payments(payment_id, address, key_store, storage_scheme)
+            .await
+    }
+
+    async fn find_address_by_merchant_id_payment_id_address_id(
+        &self,
+        merchant_id: &str,
+        payment_id: &str,
+        address_id: &str,
+        key_store: &domain::MerchantKeyStore,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<domain::Address, errors::StorageError> {
+        self.diesel_store
+            .find_address_by_merchant_id_payment_id_address_id(
+                merchant_id,
+                payment_id,
+                address_id,
+                key_store,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn insert_address_for_customers(
+        &self,
+        address: domain::Address,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::Address, errors::StorageError> {
+        self.diesel_store
+            .insert_address_for_customers(address, key_store)
+            .await
+    }
+
+    async fn update_address_by_merchant_id_customer_id(
+        &self,
+        customer_id: &str,
+        merchant_id: &str,
+        address: storage::AddressUpdate,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<Vec<domain::Address>, errors::StorageError> {
+        self.diesel_store
+            .update_address_by_merchant_id_customer_id(customer_id, merchant_id, address, key_store)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl ApiKeyInterface for KafkaStore {
+    async fn insert_api_key(
+        &self,
+        api_key: storage::ApiKeyNew,
+    ) -> CustomResult<storage::ApiKey, errors::StorageError> {
+        self.diesel_store.insert_api_key(api_key).await
+    }
+
+    async fn update_api_key(
+        &self,
+        merchant_id: String,
+        key_id: String,
+        api_key: storage::ApiKeyUpdate,
+    ) -> CustomResult<storage::ApiKey, errors::StorageError> {
+        self.diesel_store
+            .update_api_key(merchant_id, key_id, api_key)
+            .await
+    }
+
+    async fn revoke_api_key(
+        &self,
+        merchant_id: &str,
+        key_id: &str,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store.revoke_api_key(merchant_id, key_id).await
+    }
+
+    async fn find_api_key_by_merchant_id_key_id_optional(
+        &self,
+        merchant_id: &str,
+        key_id: &str,
+    ) -> CustomResult<Option<storage::ApiKey>, errors::StorageError> {
+        self.diesel_store
+            .find_api_key_by_merchant_id_key_id_optional(merchant_id, key_id)
+            .await
+    }
+
+    async fn find_api_key_by_hash_optional(
+        &self,
+        hashed_api_key: storage::HashedApiKey,
+    ) -> CustomResult<Option<storage::ApiKey>, errors::StorageError> {
+        self.diesel_store
+            .find_api_key_by_hash_optional(hashed_api_key)
+            .await
+    }
+
+    async fn list_api_keys_by_merchant_id(
+        &self,
+        merchant_id: &str,
+        limit: Option<i64>,
+        offset: Option<i64>,
+    ) -> CustomResult<Vec<storage::ApiKey>, errors::StorageError> {
+        self.diesel_store
+            .list_api_keys_by_merchant_id(merchant_id, limit, offset)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl CardsInfoInterface for KafkaStore {
+    async fn get_card_info(
+        &self,
+        card_iin: &str,
+    ) -> CustomResult<Option<storage::CardInfo>, errors::StorageError> {
+        self.diesel_store.get_card_info(card_iin).await
+    }
+}
+
+#[async_trait::async_trait]
+impl ConfigInterface for KafkaStore {
+    async fn insert_config(
+        &self,
+        config: storage::ConfigNew,
+    ) -> CustomResult<storage::Config, errors::StorageError> {
+        self.diesel_store.insert_config(config).await
+    }
+
+    async fn find_config_by_key(
+        &self,
+        key: &str,
+    ) -> CustomResult<storage::Config, errors::StorageError> {
+        self.diesel_store.find_config_by_key(key).await
+    }
+
+    async fn find_config_by_key_from_db(
+        &self,
+        key: &str,
+    ) -> CustomResult<storage::Config, errors::StorageError> {
+        self.diesel_store.find_config_by_key_from_db(key).await
+    }
+
+    async fn update_config_in_database(
+        &self,
+        key: &str,
+        config_update: storage::ConfigUpdate,
+    ) -> CustomResult<storage::Config, errors::StorageError> {
+        self.diesel_store
+            .update_config_in_database(key, config_update)
+            .await
+    }
+
+    async fn update_config_by_key(
+        &self,
+        key: &str,
+        config_update: storage::ConfigUpdate,
+    ) -> CustomResult<storage::Config, errors::StorageError> {
+        self.diesel_store
+            .update_config_by_key(key, config_update)
+            .await
+    }
+
+    async fn delete_config_by_key(&self, key: &str) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store.delete_config_by_key(key).await
+    }
+
+    async fn find_config_by_key_unwrap_or(
+        &self,
+        key: &str,
+        default_config: Option<String>,
+    ) -> CustomResult<storage::Config, errors::StorageError> {
+        self.diesel_store
+            .find_config_by_key_unwrap_or(key, default_config)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl CustomerInterface for KafkaStore {
+    async fn delete_customer_by_customer_id_merchant_id(
+        &self,
+        customer_id: &str,
+        merchant_id: &str,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store
+            .delete_customer_by_customer_id_merchant_id(customer_id, merchant_id)
+            .await
+    }
+
+    async fn find_customer_optional_by_customer_id_merchant_id(
+        &self,
+        customer_id: &str,
+        merchant_id: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<Option<domain::Customer>, errors::StorageError> {
+        self.diesel_store
+            .find_customer_optional_by_customer_id_merchant_id(customer_id, merchant_id, key_store)
+            .await
+    }
+
+    async fn update_customer_by_customer_id_merchant_id(
+        &self,
+        customer_id: String,
+        merchant_id: String,
+        customer: storage::CustomerUpdate,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::Customer, errors::StorageError> {
+        self.diesel_store
+            .update_customer_by_customer_id_merchant_id(
+                customer_id,
+                merchant_id,
+                customer,
+                key_store,
+            )
+            .await
+    }
+
+    async fn list_customers_by_merchant_id(
+        &self,
+        merchant_id: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<Vec<domain::Customer>, errors::StorageError> {
+        self.diesel_store
+            .list_customers_by_merchant_id(merchant_id, key_store)
+            .await
+    }
+
+    async fn find_customer_by_customer_id_merchant_id(
+        &self,
+        customer_id: &str,
+        merchant_id: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::Customer, errors::StorageError> {
+        self.diesel_store
+            .find_customer_by_customer_id_merchant_id(customer_id, merchant_id, key_store)
+            .await
+    }
+
+    async fn insert_customer(
+        &self,
+        customer_data: domain::Customer,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::Customer, errors::StorageError> {
+        self.diesel_store
+            .insert_customer(customer_data, key_store)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl DisputeInterface for KafkaStore {
+    async fn insert_dispute(
+        &self,
+        dispute: storage::DisputeNew,
+    ) -> CustomResult<storage::Dispute, errors::StorageError> {
+        self.diesel_store.insert_dispute(dispute).await
+    }
+
+    async fn find_by_merchant_id_payment_id_connector_dispute_id(
+        &self,
+        merchant_id: &str,
+        payment_id: &str,
+        connector_dispute_id: &str,
+    ) -> CustomResult<Option<storage::Dispute>, errors::StorageError> {
+        self.diesel_store
+            .find_by_merchant_id_payment_id_connector_dispute_id(
+                merchant_id,
+                payment_id,
+                connector_dispute_id,
+            )
+            .await
+    }
+
+    async fn find_dispute_by_merchant_id_dispute_id(
+        &self,
+        merchant_id: &str,
+        dispute_id: &str,
+    ) -> CustomResult<storage::Dispute, errors::StorageError> {
+        self.diesel_store
+            .find_dispute_by_merchant_id_dispute_id(merchant_id, dispute_id)
+            .await
+    }
+
+    async fn find_disputes_by_merchant_id(
+        &self,
+        merchant_id: &str,
+        dispute_constraints: api_models::disputes::DisputeListConstraints,
+    ) -> CustomResult<Vec<storage::Dispute>, errors::StorageError> {
+        self.diesel_store
+            .find_disputes_by_merchant_id(merchant_id, dispute_constraints)
+            .await
+    }
+
+    async fn update_dispute(
+        &self,
+        this: storage::Dispute,
+        dispute: storage::DisputeUpdate,
+    ) -> CustomResult<storage::Dispute, errors::StorageError> {
+        self.diesel_store.update_dispute(this, dispute).await
+    }
+
+    async fn find_disputes_by_merchant_id_payment_id(
+        &self,
+        merchant_id: &str,
+        payment_id: &str,
+    ) -> CustomResult<Vec<storage::Dispute>, errors::StorageError> {
+        self.diesel_store
+            .find_disputes_by_merchant_id_payment_id(merchant_id, payment_id)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl EphemeralKeyInterface for KafkaStore {
+    async fn create_ephemeral_key(
+        &self,
+        ek: EphemeralKeyNew,
+        validity: i64,
+    ) -> CustomResult<EphemeralKey, errors::StorageError> {
+        self.diesel_store.create_ephemeral_key(ek, validity).await
+    }
+    async fn get_ephemeral_key(
+        &self,
+        key: &str,
+    ) -> CustomResult<EphemeralKey, errors::StorageError> {
+        self.diesel_store.get_ephemeral_key(key).await
+    }
+    async fn delete_ephemeral_key(
+        &self,
+        id: &str,
+    ) -> CustomResult<EphemeralKey, errors::StorageError> {
+        self.diesel_store.delete_ephemeral_key(id).await
+    }
+}
+
+#[async_trait::async_trait]
+impl EventInterface for KafkaStore {
+    async fn insert_event(
+        &self,
+        event: storage::EventNew,
+    ) -> CustomResult<storage::Event, errors::StorageError> {
+        self.diesel_store.insert_event(event).await
+    }
+
+    async fn update_event(
+        &self,
+        event_id: String,
+        event: storage::EventUpdate,
+    ) -> CustomResult<storage::Event, errors::StorageError> {
+        self.diesel_store.update_event(event_id, event).await
+    }
+}
+
+#[async_trait::async_trait]
+impl LockerMockUpInterface for KafkaStore {
+    async fn find_locker_by_card_id(
+        &self,
+        card_id: &str,
+    ) -> CustomResult<storage::LockerMockUp, errors::StorageError> {
+        self.diesel_store.find_locker_by_card_id(card_id).await
+    }
+
+    async fn insert_locker_mock_up(
+        &self,
+        new: storage::LockerMockUpNew,
+    ) -> CustomResult<storage::LockerMockUp, errors::StorageError> {
+        self.diesel_store.insert_locker_mock_up(new).await
+    }
+
+    async fn delete_locker_mock_up(
+        &self,
+        card_id: &str,
+    ) -> CustomResult<storage::LockerMockUp, errors::StorageError> {
+        self.diesel_store.delete_locker_mock_up(card_id).await
+    }
+}
+
+#[async_trait::async_trait]
+impl MandateInterface for KafkaStore {
+    async fn find_mandate_by_merchant_id_mandate_id(
+        &self,
+        merchant_id: &str,
+        mandate_id: &str,
+    ) -> CustomResult<storage::Mandate, errors::StorageError> {
+        self.diesel_store
+            .find_mandate_by_merchant_id_mandate_id(merchant_id, mandate_id)
+            .await
+    }
+
+    async fn find_mandate_by_merchant_id_connector_mandate_id(
+        &self,
+        merchant_id: &str,
+        connector_mandate_id: &str,
+    ) -> CustomResult<storage::Mandate, errors::StorageError> {
+        self.diesel_store
+            .find_mandate_by_merchant_id_connector_mandate_id(merchant_id, connector_mandate_id)
+            .await
+    }
+
+    async fn find_mandate_by_merchant_id_customer_id(
+        &self,
+        merchant_id: &str,
+        customer_id: &str,
+    ) -> CustomResult<Vec<storage::Mandate>, errors::StorageError> {
+        self.diesel_store
+            .find_mandate_by_merchant_id_customer_id(merchant_id, customer_id)
+            .await
+    }
+
+    async fn update_mandate_by_merchant_id_mandate_id(
+        &self,
+        merchant_id: &str,
+        mandate_id: &str,
+        mandate: storage::MandateUpdate,
+    ) -> CustomResult<storage::Mandate, errors::StorageError> {
+        self.diesel_store
+            .update_mandate_by_merchant_id_mandate_id(merchant_id, mandate_id, mandate)
+            .await
+    }
+
+    async fn find_mandates_by_merchant_id(
+        &self,
+        merchant_id: &str,
+        mandate_constraints: api_models::mandates::MandateListConstraints,
+    ) -> CustomResult<Vec<storage::Mandate>, errors::StorageError> {
+        self.diesel_store
+            .find_mandates_by_merchant_id(merchant_id, mandate_constraints)
+            .await
+    }
+
+    async fn insert_mandate(
+        &self,
+        mandate: storage::MandateNew,
+    ) -> CustomResult<storage::Mandate, errors::StorageError> {
+        self.diesel_store.insert_mandate(mandate).await
+    }
+}
+
+#[async_trait::async_trait]
+impl PaymentLinkInterface for KafkaStore {
+    async fn find_payment_link_by_payment_link_id(
+        &self,
+        payment_link_id: &str,
+    ) -> CustomResult<storage::PaymentLink, errors::StorageError> {
+        self.diesel_store
+            .find_payment_link_by_payment_link_id(payment_link_id)
+            .await
+    }
+
+    async fn insert_payment_link(
+        &self,
+        payment_link_object: storage::PaymentLinkNew,
+    ) -> CustomResult<storage::PaymentLink, errors::StorageError> {
+        self.diesel_store
+            .insert_payment_link(payment_link_object)
+            .await
+    }
+
+    async fn list_payment_link_by_merchant_id(
+        &self,
+        merchant_id: &str,
+        payment_link_constraints: api_models::payments::PaymentLinkListConstraints,
+    ) -> CustomResult<Vec<storage::PaymentLink>, errors::StorageError> {
+        self.diesel_store
+            .list_payment_link_by_merchant_id(merchant_id, payment_link_constraints)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl MerchantAccountInterface for KafkaStore {
+    async fn insert_merchant(
+        &self,
+        merchant_account: domain::MerchantAccount,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantAccount, errors::StorageError> {
+        self.diesel_store
+            .insert_merchant(merchant_account, key_store)
+            .await
+    }
+
+    async fn find_merchant_account_by_merchant_id(
+        &self,
+        merchant_id: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantAccount, errors::StorageError> {
+        self.diesel_store
+            .find_merchant_account_by_merchant_id(merchant_id, key_store)
+            .await
+    }
+
+    async fn update_merchant(
+        &self,
+        this: domain::MerchantAccount,
+        merchant_account: storage::MerchantAccountUpdate,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantAccount, errors::StorageError> {
+        self.diesel_store
+            .update_merchant(this, merchant_account, key_store)
+            .await
+    }
+
+    async fn update_specific_fields_in_merchant(
+        &self,
+        merchant_id: &str,
+        merchant_account: storage::MerchantAccountUpdate,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantAccount, errors::StorageError> {
+        self.diesel_store
+            .update_specific_fields_in_merchant(merchant_id, merchant_account, key_store)
+            .await
+    }
+
+    async fn find_merchant_account_by_publishable_key(
+        &self,
+        publishable_key: &str,
+    ) -> CustomResult<authentication::AuthenticationData, errors::StorageError> {
+        self.diesel_store
+            .find_merchant_account_by_publishable_key(publishable_key)
+            .await
+    }
+
+    #[cfg(feature = "olap")]
+    async fn list_merchant_accounts_by_organization_id(
+        &self,
+        organization_id: &str,
+    ) -> CustomResult<Vec<domain::MerchantAccount>, errors::StorageError> {
+        self.diesel_store
+            .list_merchant_accounts_by_organization_id(organization_id)
+            .await
+    }
+
+    async fn delete_merchant_account_by_merchant_id(
+        &self,
+        merchant_id: &str,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store
+            .delete_merchant_account_by_merchant_id(merchant_id)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl ConnectorAccessToken for KafkaStore {
+    async fn get_access_token(
+        &self,
+        merchant_id: &str,
+        connector_name: &str,
+    ) -> CustomResult<Option<AccessToken>, errors::StorageError> {
+        self.diesel_store
+            .get_access_token(merchant_id, connector_name)
+            .await
+    }
+
+    async fn set_access_token(
+        &self,
+        merchant_id: &str,
+        connector_name: &str,
+        access_token: AccessToken,
+    ) -> CustomResult<(), errors::StorageError> {
+        self.diesel_store
+            .set_access_token(merchant_id, connector_name, access_token)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl FileMetadataInterface for KafkaStore {
+    async fn insert_file_metadata(
+        &self,
+        file: storage::FileMetadataNew,
+    ) -> CustomResult<storage::FileMetadata, errors::StorageError> {
+        self.diesel_store.insert_file_metadata(file).await
+    }
+
+    async fn find_file_metadata_by_merchant_id_file_id(
+        &self,
+        merchant_id: &str,
+        file_id: &str,
+    ) -> CustomResult<storage::FileMetadata, errors::StorageError> {
+        self.diesel_store
+            .find_file_metadata_by_merchant_id_file_id(merchant_id, file_id)
+            .await
+    }
+
+    async fn delete_file_metadata_by_merchant_id_file_id(
+        &self,
+        merchant_id: &str,
+        file_id: &str,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store
+            .delete_file_metadata_by_merchant_id_file_id(merchant_id, file_id)
+            .await
+    }
+
+    async fn update_file_metadata(
+        &self,
+        this: storage::FileMetadata,
+        file_metadata: storage::FileMetadataUpdate,
+    ) -> CustomResult<storage::FileMetadata, errors::StorageError> {
+        self.diesel_store
+            .update_file_metadata(this, file_metadata)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl MerchantConnectorAccountInterface for KafkaStore {
+    async fn find_merchant_connector_account_by_merchant_id_connector_label(
+        &self,
+        merchant_id: &str,
+        connector: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantConnectorAccount, errors::StorageError> {
+        self.diesel_store
+            .find_merchant_connector_account_by_merchant_id_connector_label(
+                merchant_id,
+                connector,
+                key_store,
+            )
+            .await
+    }
+
+    async fn find_merchant_connector_account_by_merchant_id_connector_name(
+        &self,
+        merchant_id: &str,
+        connector_name: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<Vec<domain::MerchantConnectorAccount>, errors::StorageError> {
+        self.diesel_store
+            .find_merchant_connector_account_by_merchant_id_connector_name(
+                merchant_id,
+                connector_name,
+                key_store,
+            )
+            .await
+    }
+
+    async fn find_merchant_connector_account_by_profile_id_connector_name(
+        &self,
+        profile_id: &str,
+        connector_name: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantConnectorAccount, errors::StorageError> {
+        self.diesel_store
+            .find_merchant_connector_account_by_profile_id_connector_name(
+                profile_id,
+                connector_name,
+                key_store,
+            )
+            .await
+    }
+
+    async fn insert_merchant_connector_account(
+        &self,
+        t: domain::MerchantConnectorAccount,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantConnectorAccount, errors::StorageError> {
+        self.diesel_store
+            .insert_merchant_connector_account(t, key_store)
+            .await
+    }
+
+    async fn find_by_merchant_connector_account_merchant_id_merchant_connector_id(
+        &self,
+        merchant_id: &str,
+        merchant_connector_id: &str,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantConnectorAccount, errors::StorageError> {
+        self.diesel_store
+            .find_by_merchant_connector_account_merchant_id_merchant_connector_id(
+                merchant_id,
+                merchant_connector_id,
+                key_store,
+            )
+            .await
+    }
+
+    async fn find_merchant_connector_account_by_merchant_id_and_disabled_list(
+        &self,
+        merchant_id: &str,
+        get_disabled: bool,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<Vec<domain::MerchantConnectorAccount>, errors::StorageError> {
+        self.diesel_store
+            .find_merchant_connector_account_by_merchant_id_and_disabled_list(
+                merchant_id,
+                get_disabled,
+                key_store,
+            )
+            .await
+    }
+
+    async fn update_merchant_connector_account(
+        &self,
+        this: domain::MerchantConnectorAccount,
+        merchant_connector_account: storage::MerchantConnectorAccountUpdateInternal,
+        key_store: &domain::MerchantKeyStore,
+    ) -> CustomResult<domain::MerchantConnectorAccount, errors::StorageError> {
+        self.diesel_store
+            .update_merchant_connector_account(this, merchant_connector_account, key_store)
+            .await
+    }
+
+    async fn delete_merchant_connector_account_by_merchant_id_merchant_connector_id(
+        &self,
+        merchant_id: &str,
+        merchant_connector_id: &str,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store
+            .delete_merchant_connector_account_by_merchant_id_merchant_connector_id(
+                merchant_id,
+                merchant_connector_id,
+            )
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl QueueInterface for KafkaStore {
+    async fn fetch_consumer_tasks(
+        &self,
+        stream_name: &str,
+        group_name: &str,
+        consumer_name: &str,
+    ) -> CustomResult<Vec<storage::ProcessTracker>, ProcessTrackerError> {
+        self.diesel_store
+            .fetch_consumer_tasks(stream_name, group_name, consumer_name)
+            .await
+    }
+
+    async fn consumer_group_create(
+        &self,
+        stream: &str,
+        group: &str,
+        id: &RedisEntryId,
+    ) -> CustomResult<(), RedisError> {
+        self.diesel_store
+            .consumer_group_create(stream, group, id)
+            .await
+    }
+
+    async fn acquire_pt_lock(
+        &self,
+        tag: &str,
+        lock_key: &str,
+        lock_val: &str,
+        ttl: i64,
+    ) -> CustomResult<bool, RedisError> {
+        self.diesel_store
+            .acquire_pt_lock(tag, lock_key, lock_val, ttl)
+            .await
+    }
+
+    async fn release_pt_lock(&self, tag: &str, lock_key: &str) -> CustomResult<bool, RedisError> {
+        self.diesel_store.release_pt_lock(tag, lock_key).await
+    }
+
+    async fn stream_append_entry(
+        &self,
+        stream: &str,
+        entry_id: &RedisEntryId,
+        fields: Vec<(&str, String)>,
+    ) -> CustomResult<(), RedisError> {
+        self.diesel_store
+            .stream_append_entry(stream, entry_id, fields)
+            .await
+    }
+
+    async fn get_key(&self, key: &str) -> CustomResult<Vec<u8>, RedisError> {
+        self.diesel_store.get_key(key).await
+    }
+}
+
+#[async_trait::async_trait]
+impl PaymentAttemptInterface for KafkaStore {
+    async fn insert_payment_attempt(
+        &self,
+        payment_attempt: storage::PaymentAttemptNew,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        let attempt = self
+            .diesel_store
+            .insert_payment_attempt(payment_attempt, storage_scheme)
+            .await?;
+
+        if let Err(er) = self
+            .kafka_producer
+            .log_payment_attempt(&attempt, None)
+            .await
+        {
+            logger::error!(message="Failed to log analytics event for payment attempt {attempt:?}", error_message=?er)
+        }
+
+        Ok(attempt)
+    }
+
+    async fn update_payment_attempt_with_attempt_id(
+        &self,
+        this: storage::PaymentAttempt,
+        payment_attempt: storage::PaymentAttemptUpdate,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        let attempt = self
+            .diesel_store
+            .update_payment_attempt_with_attempt_id(this.clone(), payment_attempt, storage_scheme)
+            .await?;
+
+        if let Err(er) = self
+            .kafka_producer
+            .log_payment_attempt(&attempt, Some(this))
+            .await
+        {
+            logger::error!(message="Failed to log analytics event for payment attempt {attempt:?}", error_message=?er)
+        }
+
+        Ok(attempt)
+    }
+
+    async fn find_payment_attempt_by_connector_transaction_id_payment_id_merchant_id(
+        &self,
+        connector_transaction_id: &str,
+        payment_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        self.diesel_store
+            .find_payment_attempt_by_connector_transaction_id_payment_id_merchant_id(
+                connector_transaction_id,
+                payment_id,
+                merchant_id,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn find_payment_attempt_by_merchant_id_connector_txn_id(
+        &self,
+        merchant_id: &str,
+        connector_txn_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        self.diesel_store
+            .find_payment_attempt_by_merchant_id_connector_txn_id(
+                merchant_id,
+                connector_txn_id,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn find_payment_attempt_by_payment_id_merchant_id_attempt_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        attempt_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        self.diesel_store
+            .find_payment_attempt_by_payment_id_merchant_id_attempt_id(
+                payment_id,
+                merchant_id,
+                attempt_id,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn find_payment_attempt_by_attempt_id_merchant_id(
+        &self,
+        attempt_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        self.diesel_store
+            .find_payment_attempt_by_attempt_id_merchant_id(attempt_id, merchant_id, storage_scheme)
+            .await
+    }
+
+    async fn find_payment_attempt_last_successful_attempt_by_payment_id_merchant_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        self.diesel_store
+            .find_payment_attempt_last_successful_attempt_by_payment_id_merchant_id(
+                payment_id,
+                merchant_id,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn find_payment_attempt_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        self.diesel_store
+            .find_payment_attempt_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+                payment_id,
+                merchant_id,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn find_payment_attempt_by_preprocessing_id_merchant_id(
+        &self,
+        preprocessing_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentAttempt, errors::DataStorageError> {
+        self.diesel_store
+            .find_payment_attempt_by_preprocessing_id_merchant_id(
+                preprocessing_id,
+                merchant_id,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn get_filters_for_payments(
+        &self,
+        pi: &[data_models::payments::PaymentIntent],
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<
+        data_models::payments::payment_attempt::PaymentListFilters,
+        errors::DataStorageError,
+    > {
+        self.diesel_store
+            .get_filters_for_payments(pi, merchant_id, storage_scheme)
+            .await
+    }
+
+    async fn get_total_count_of_filtered_payment_attempts(
+        &self,
+        merchant_id: &str,
+        active_attempt_ids: &[String],
+        connector: Option<Vec<api_models::enums::Connector>>,
+        payment_method: Option<Vec<common_enums::PaymentMethod>>,
+        payment_method_type: Option<Vec<common_enums::PaymentMethodType>>,
+        authentication_type: Option<Vec<common_enums::AuthenticationType>>,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<i64, errors::DataStorageError> {
+        self.diesel_store
+            .get_total_count_of_filtered_payment_attempts(
+                merchant_id,
+                active_attempt_ids,
+                connector,
+                payment_method,
+                payment_method_type,
+                authentication_type,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn find_attempts_by_merchant_id_payment_id(
+        &self,
+        merchant_id: &str,
+        payment_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<Vec<storage::PaymentAttempt>, errors::DataStorageError> {
+        self.diesel_store
+            .find_attempts_by_merchant_id_payment_id(merchant_id, payment_id, storage_scheme)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl PaymentIntentInterface for KafkaStore {
+    async fn update_payment_intent(
+        &self,
+        this: storage::PaymentIntent,
+        payment_intent: storage::PaymentIntentUpdate,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentIntent, errors::DataStorageError> {
+        let intent = self
+            .diesel_store
+            .update_payment_intent(this.clone(), payment_intent, storage_scheme)
+            .await?;
+
+        if let Err(er) = self
+            .kafka_producer
+            .log_payment_intent(&intent, Some(this))
+            .await
+        {
+            logger::error!(message="Failed to add analytics entry for Payment Intent {intent:?}", error_message=?er);
+        };
+
+        Ok(intent)
+    }
+
+    async fn insert_payment_intent(
+        &self,
+        new: storage::PaymentIntentNew,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentIntent, errors::DataStorageError> {
+        logger::debug!("Inserting PaymentIntent Via KafkaStore");
+        let intent = self
+            .diesel_store
+            .insert_payment_intent(new, storage_scheme)
+            .await?;
+
+        if let Err(er) = self.kafka_producer.log_payment_intent(&intent, None).await {
+            logger::error!(message="Failed to add analytics entry for Payment Intent {intent:?}", error_message=?er);
+        };
+
+        Ok(intent)
+    }
+
+    async fn find_payment_intent_by_payment_id_merchant_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::PaymentIntent, errors::DataStorageError> {
+        self.diesel_store
+            .find_payment_intent_by_payment_id_merchant_id(payment_id, merchant_id, storage_scheme)
+            .await
+    }
+
+    #[cfg(feature = "olap")]
+    async fn filter_payment_intent_by_constraints(
+        &self,
+        merchant_id: &str,
+        filters: &data_models::payments::payment_intent::PaymentIntentFetchConstraints,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<Vec<storage::PaymentIntent>, errors::DataStorageError> {
+        self.diesel_store
+            .filter_payment_intent_by_constraints(merchant_id, filters, storage_scheme)
+            .await
+    }
+
+    #[cfg(feature = "olap")]
+    async fn filter_payment_intents_by_time_range_constraints(
+        &self,
+        merchant_id: &str,
+        time_range: &api_models::payments::TimeRange,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<Vec<storage::PaymentIntent>, errors::DataStorageError> {
+        self.diesel_store
+            .filter_payment_intents_by_time_range_constraints(
+                merchant_id,
+                time_range,
+                storage_scheme,
+            )
+            .await
+    }
+
+    #[cfg(feature = "olap")]
+    async fn get_filtered_payment_intents_attempt(
+        &self,
+        merchant_id: &str,
+        constraints: &data_models::payments::payment_intent::PaymentIntentFetchConstraints,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<
+        Vec<(
+            data_models::payments::PaymentIntent,
+            data_models::payments::payment_attempt::PaymentAttempt,
+        )>,
+        errors::DataStorageError,
+    > {
+        self.diesel_store
+            .get_filtered_payment_intents_attempt(merchant_id, constraints, storage_scheme)
+            .await
+    }
+
+    #[cfg(feature = "olap")]
+    async fn get_filtered_active_attempt_ids_for_total_count(
+        &self,
+        merchant_id: &str,
+        constraints: &data_models::payments::payment_intent::PaymentIntentFetchConstraints,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<Vec<String>, errors::DataStorageError> {
+        self.diesel_store
+            .get_filtered_active_attempt_ids_for_total_count(
+                merchant_id,
+                constraints,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn get_active_payment_attempt(
+        &self,
+        payment: &mut storage::PaymentIntent,
+        storage_scheme: MerchantStorageScheme,
+    ) -> error_stack::Result<storage::PaymentAttempt, errors::DataStorageError> {
+        self.diesel_store
+            .get_active_payment_attempt(payment, storage_scheme)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl PaymentMethodInterface for KafkaStore {
+    async fn find_payment_method(
+        &self,
+        payment_method_id: &str,
+    ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
+        self.diesel_store
+            .find_payment_method(payment_method_id)
+            .await
+    }
+
+    async fn find_payment_method_by_customer_id_merchant_id_list(
+        &self,
+        customer_id: &str,
+        merchant_id: &str,
+    ) -> CustomResult<Vec<storage::PaymentMethod>, errors::StorageError> {
+        self.diesel_store
+            .find_payment_method_by_customer_id_merchant_id_list(customer_id, merchant_id)
+            .await
+    }
+
+    async fn insert_payment_method(
+        &self,
+        m: storage::PaymentMethodNew,
+    ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
+        self.diesel_store.insert_payment_method(m).await
+    }
+
+    async fn update_payment_method(
+        &self,
+        payment_method: storage::PaymentMethod,
+        payment_method_update: storage::PaymentMethodUpdate,
+    ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
+        self.diesel_store
+            .update_payment_method(payment_method, payment_method_update)
+            .await
+    }
+
+    async fn delete_payment_method_by_merchant_id_payment_method_id(
+        &self,
+        merchant_id: &str,
+        payment_method_id: &str,
+    ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
+        self.diesel_store
+            .delete_payment_method_by_merchant_id_payment_method_id(merchant_id, payment_method_id)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl PayoutAttemptInterface for KafkaStore {
+    async fn find_payout_attempt_by_merchant_id_payout_id(
+        &self,
+        merchant_id: &str,
+        payout_id: &str,
+    ) -> CustomResult<storage::PayoutAttempt, errors::StorageError> {
+        self.diesel_store
+            .find_payout_attempt_by_merchant_id_payout_id(merchant_id, payout_id)
+            .await
+    }
+
+    async fn update_payout_attempt_by_merchant_id_payout_id(
+        &self,
+        merchant_id: &str,
+        payout_id: &str,
+        payout: storage::PayoutAttemptUpdate,
+    ) -> CustomResult<storage::PayoutAttempt, errors::StorageError> {
+        self.diesel_store
+            .update_payout_attempt_by_merchant_id_payout_id(merchant_id, payout_id, payout)
+            .await
+    }
+
+    async fn insert_payout_attempt(
+        &self,
+        payout: storage::PayoutAttemptNew,
+    ) -> CustomResult<storage::PayoutAttempt, errors::StorageError> {
+        self.diesel_store.insert_payout_attempt(payout).await
+    }
+}
+
+#[async_trait::async_trait]
+impl PayoutsInterface for KafkaStore {
+    async fn find_payout_by_merchant_id_payout_id(
+        &self,
+        merchant_id: &str,
+        payout_id: &str,
+    ) -> CustomResult<storage::Payouts, errors::StorageError> {
+        self.diesel_store
+            .find_payout_by_merchant_id_payout_id(merchant_id, payout_id)
+            .await
+    }
+
+    async fn update_payout_by_merchant_id_payout_id(
+        &self,
+        merchant_id: &str,
+        payout_id: &str,
+        payout: storage::PayoutsUpdate,
+    ) -> CustomResult<storage::Payouts, errors::StorageError> {
+        self.diesel_store
+            .update_payout_by_merchant_id_payout_id(merchant_id, payout_id, payout)
+            .await
+    }
+
+    async fn insert_payout(
+        &self,
+        payout: storage::PayoutsNew,
+    ) -> CustomResult<storage::Payouts, errors::StorageError> {
+        self.diesel_store.insert_payout(payout).await
+    }
+}
+
+#[async_trait::async_trait]
+impl ProcessTrackerInterface for KafkaStore {
+    async fn reinitialize_limbo_processes(
+        &self,
+        ids: Vec<String>,
+        schedule_time: PrimitiveDateTime,
+    ) -> CustomResult<usize, errors::StorageError> {
+        self.diesel_store
+            .reinitialize_limbo_processes(ids, schedule_time)
+            .await
+    }
+
+    async fn find_process_by_id(
+        &self,
+        id: &str,
+    ) -> CustomResult<Option<storage::ProcessTracker>, errors::StorageError> {
+        self.diesel_store.find_process_by_id(id).await
+    }
+
+    async fn update_process(
+        &self,
+        this: storage::ProcessTracker,
+        process: storage::ProcessTrackerUpdate,
+    ) -> CustomResult<storage::ProcessTracker, errors::StorageError> {
+        self.diesel_store.update_process(this, process).await
+    }
+
+    async fn process_tracker_update_process_status_by_ids(
+        &self,
+        task_ids: Vec<String>,
+        task_update: storage::ProcessTrackerUpdate,
+    ) -> CustomResult<usize, errors::StorageError> {
+        self.diesel_store
+            .process_tracker_update_process_status_by_ids(task_ids, task_update)
+            .await
+    }
+    async fn update_process_tracker(
+        &self,
+        this: storage::ProcessTracker,
+        process: storage::ProcessTrackerUpdate,
+    ) -> CustomResult<storage::ProcessTracker, errors::StorageError> {
+        self.diesel_store
+            .update_process_tracker(this, process)
+            .await
+    }
+
+    async fn insert_process(
+        &self,
+        new: storage::ProcessTrackerNew,
+    ) -> CustomResult<storage::ProcessTracker, errors::StorageError> {
+        self.diesel_store.insert_process(new).await
+    }
+
+    async fn find_processes_by_time_status(
+        &self,
+        time_lower_limit: PrimitiveDateTime,
+        time_upper_limit: PrimitiveDateTime,
+        status: ProcessTrackerStatus,
+        limit: Option<i64>,
+    ) -> CustomResult<Vec<storage::ProcessTracker>, errors::StorageError> {
+        self.diesel_store
+            .find_processes_by_time_status(time_lower_limit, time_upper_limit, status, limit)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl CaptureInterface for KafkaStore {
+    async fn insert_capture(
+        &self,
+        capture: storage::CaptureNew,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::Capture, errors::StorageError> {
+        self.diesel_store
+            .insert_capture(capture, storage_scheme)
+            .await
+    }
+
+    async fn update_capture_with_capture_id(
+        &self,
+        this: storage::Capture,
+        capture: storage::CaptureUpdate,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::Capture, errors::StorageError> {
+        self.diesel_store
+            .update_capture_with_capture_id(this, capture, storage_scheme)
+            .await
+    }
+
+    async fn find_all_captures_by_merchant_id_payment_id_authorized_attempt_id(
+        &self,
+        merchant_id: &str,
+        payment_id: &str,
+        authorized_attempt_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<Vec<storage::Capture>, errors::StorageError> {
+        self.diesel_store
+            .find_all_captures_by_merchant_id_payment_id_authorized_attempt_id(
+                merchant_id,
+                payment_id,
+                authorized_attempt_id,
+                storage_scheme,
+            )
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl RefundInterface for KafkaStore {
+    async fn find_refund_by_internal_reference_id_merchant_id(
+        &self,
+        internal_reference_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::Refund, errors::StorageError> {
+        self.diesel_store
+            .find_refund_by_internal_reference_id_merchant_id(
+                internal_reference_id,
+                merchant_id,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn find_refund_by_payment_id_merchant_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<Vec<storage::Refund>, errors::StorageError> {
+        self.diesel_store
+            .find_refund_by_payment_id_merchant_id(payment_id, merchant_id, storage_scheme)
+            .await
+    }
+
+    async fn find_refund_by_merchant_id_refund_id(
+        &self,
+        merchant_id: &str,
+        refund_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::Refund, errors::StorageError> {
+        self.diesel_store
+            .find_refund_by_merchant_id_refund_id(merchant_id, refund_id, storage_scheme)
+            .await
+    }
+
+    async fn find_refund_by_merchant_id_connector_refund_id_connector(
+        &self,
+        merchant_id: &str,
+        connector_refund_id: &str,
+        connector: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::Refund, errors::StorageError> {
+        self.diesel_store
+            .find_refund_by_merchant_id_connector_refund_id_connector(
+                merchant_id,
+                connector_refund_id,
+                connector,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn update_refund(
+        &self,
+        this: storage::Refund,
+        refund: storage::RefundUpdate,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::Refund, errors::StorageError> {
+        let refund = self
+            .diesel_store
+            .update_refund(this.clone(), refund, storage_scheme)
+            .await?;
+
+        if let Err(er) = self.kafka_producer.log_refund(&refund, Some(this)).await {
+            logger::error!(message="Failed to insert analytics event for Refund Update {refund?}", error_message=?er);
+        }
+        Ok(refund)
+    }
+
+    async fn find_refund_by_merchant_id_connector_transaction_id(
+        &self,
+        merchant_id: &str,
+        connector_transaction_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<Vec<storage::Refund>, errors::StorageError> {
+        self.diesel_store
+            .find_refund_by_merchant_id_connector_transaction_id(
+                merchant_id,
+                connector_transaction_id,
+                storage_scheme,
+            )
+            .await
+    }
+
+    async fn insert_refund(
+        &self,
+        new: storage::RefundNew,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<storage::Refund, errors::StorageError> {
+        let refund = self.diesel_store.insert_refund(new, storage_scheme).await?;
+
+        if let Err(er) = self.kafka_producer.log_refund(&refund, None).await {
+            logger::error!(message="Failed to insert analytics event for Refund Create {refund?}", error_message=?er);
+        }
+        Ok(refund)
+    }
+
+    #[cfg(feature = "olap")]
+    async fn filter_refund_by_constraints(
+        &self,
+        merchant_id: &str,
+        refund_details: &api_models::refunds::RefundListRequest,
+        storage_scheme: MerchantStorageScheme,
+        limit: i64,
+        offset: i64,
+    ) -> CustomResult<Vec<storage::Refund>, errors::StorageError> {
+        self.diesel_store
+            .filter_refund_by_constraints(
+                merchant_id,
+                refund_details,
+                storage_scheme,
+                limit,
+                offset,
+            )
+            .await
+    }
+
+    #[cfg(feature = "olap")]
+    async fn filter_refund_by_meta_constraints(
+        &self,
+        merchant_id: &str,
+        refund_details: &api_models::payments::TimeRange,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<api_models::refunds::RefundListMetaData, errors::StorageError> {
+        self.diesel_store
+            .filter_refund_by_meta_constraints(merchant_id, refund_details, storage_scheme)
+            .await
+    }
+
+    #[cfg(feature = "olap")]
+    async fn get_total_count_of_refunds(
+        &self,
+        merchant_id: &str,
+        refund_details: &api_models::refunds::RefundListRequest,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<i64, errors::StorageError> {
+        self.diesel_store
+            .get_total_count_of_refunds(merchant_id, refund_details, storage_scheme)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl MerchantKeyStoreInterface for KafkaStore {
+    async fn insert_merchant_key_store(
+        &self,
+        merchant_key_store: domain::MerchantKeyStore,
+        key: &Secret<Vec<u8>>,
+    ) -> CustomResult<domain::MerchantKeyStore, errors::StorageError> {
+        self.diesel_store
+            .insert_merchant_key_store(merchant_key_store, key)
+            .await
+    }
+
+    async fn get_merchant_key_store_by_merchant_id(
+        &self,
+        merchant_id: &str,
+        key: &Secret<Vec<u8>>,
+    ) -> CustomResult<domain::MerchantKeyStore, errors::StorageError> {
+        self.diesel_store
+            .get_merchant_key_store_by_merchant_id(merchant_id, key)
+            .await
+    }
+
+    async fn delete_merchant_key_store_by_merchant_id(
+        &self,
+        merchant_id: &str,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store
+            .delete_merchant_key_store_by_merchant_id(merchant_id)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl BusinessProfileInterface for KafkaStore {
+    async fn insert_business_profile(
+        &self,
+        business_profile: business_profile::BusinessProfileNew,
+    ) -> CustomResult<business_profile::BusinessProfile, errors::StorageError> {
+        self.diesel_store
+            .insert_business_profile(business_profile)
+            .await
+    }
+
+    async fn find_business_profile_by_profile_id(
+        &self,
+        profile_id: &str,
+    ) -> CustomResult<business_profile::BusinessProfile, errors::StorageError> {
+        self.diesel_store
+            .find_business_profile_by_profile_id(profile_id)
+            .await
+    }
+
+    async fn update_business_profile_by_profile_id(
+        &self,
+        current_state: business_profile::BusinessProfile,
+        business_profile_update: business_profile::BusinessProfileUpdateInternal,
+    ) -> CustomResult<business_profile::BusinessProfile, errors::StorageError> {
+        self.diesel_store
+            .update_business_profile_by_profile_id(current_state, business_profile_update)
+            .await
+    }
+
+    async fn delete_business_profile_by_profile_id_merchant_id(
+        &self,
+        profile_id: &str,
+        merchant_id: &str,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store
+            .delete_business_profile_by_profile_id_merchant_id(profile_id, merchant_id)
+            .await
+    }
+
+    async fn list_business_profile_by_merchant_id(
+        &self,
+        merchant_id: &str,
+    ) -> CustomResult<Vec<business_profile::BusinessProfile>, errors::StorageError> {
+        self.diesel_store
+            .list_business_profile_by_merchant_id(merchant_id)
+            .await
+    }
+
+    async fn find_business_profile_by_profile_name_merchant_id(
+        &self,
+        profile_name: &str,
+        merchant_id: &str,
+    ) -> CustomResult<business_profile::BusinessProfile, errors::StorageError> {
+        self.diesel_store
+            .find_business_profile_by_profile_name_merchant_id(profile_name, merchant_id)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl ReverseLookupInterface for KafkaStore {
+    async fn insert_reverse_lookup(
+        &self,
+        new: ReverseLookupNew,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<ReverseLookup, errors::StorageError> {
+        self.diesel_store
+            .insert_reverse_lookup(new, storage_scheme)
+            .await
+    }
+
+    async fn get_lookup_by_lookup_id(
+        &self,
+        id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<ReverseLookup, errors::StorageError> {
+        self.diesel_store
+            .get_lookup_by_lookup_id(id, storage_scheme)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl RoutingAlgorithmInterface for KafkaStore {
+    async fn insert_routing_algorithm(
+        &self,
+        routing_algorithm: storage::RoutingAlgorithm,
+    ) -> CustomResult<storage::RoutingAlgorithm, errors::StorageError> {
+        self.diesel_store
+            .insert_routing_algorithm(routing_algorithm)
+            .await
+    }
+
+    async fn find_routing_algorithm_by_profile_id_algorithm_id(
+        &self,
+        profile_id: &str,
+        algorithm_id: &str,
+    ) -> CustomResult<storage::RoutingAlgorithm, errors::StorageError> {
+        self.diesel_store
+            .find_routing_algorithm_by_profile_id_algorithm_id(profile_id, algorithm_id)
+            .await
+    }
+
+    async fn find_routing_algorithm_by_algorithm_id_merchant_id(
+        &self,
+        algorithm_id: &str,
+        merchant_id: &str,
+    ) -> CustomResult<storage::RoutingAlgorithm, errors::StorageError> {
+        self.diesel_store
+            .find_routing_algorithm_by_algorithm_id_merchant_id(algorithm_id, merchant_id)
+            .await
+    }
+
+    async fn find_routing_algorithm_metadata_by_algorithm_id_profile_id(
+        &self,
+        algorithm_id: &str,
+        profile_id: &str,
+    ) -> CustomResult<storage::RoutingProfileMetadata, errors::StorageError> {
+        self.diesel_store
+            .find_routing_algorithm_metadata_by_algorithm_id_profile_id(algorithm_id, profile_id)
+            .await
+    }
+
+    async fn list_routing_algorithm_metadata_by_profile_id(
+        &self,
+        profile_id: &str,
+        limit: i64,
+        offset: i64,
+    ) -> CustomResult<Vec<storage::RoutingAlgorithmMetadata>, errors::StorageError> {
+        self.diesel_store
+            .list_routing_algorithm_metadata_by_profile_id(profile_id, limit, offset)
+            .await
+    }
+
+    async fn list_routing_algorithm_metadata_by_merchant_id(
+        &self,
+        merchant_id: &str,
+        limit: i64,
+        offset: i64,
+    ) -> CustomResult<Vec<storage::RoutingProfileMetadata>, errors::StorageError> {
+        self.diesel_store
+            .list_routing_algorithm_metadata_by_merchant_id(merchant_id, limit, offset)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl GsmInterface for KafkaStore {
+    async fn add_gsm_rule(
+        &self,
+        rule: storage::GatewayStatusMappingNew,
+    ) -> CustomResult<storage::GatewayStatusMap, errors::StorageError> {
+        self.diesel_store.add_gsm_rule(rule).await
+    }
+
+    async fn find_gsm_decision(
+        &self,
+        connector: String,
+        flow: String,
+        sub_flow: String,
+        code: String,
+        message: String,
+    ) -> CustomResult<String, errors::StorageError> {
+        self.diesel_store
+            .find_gsm_decision(connector, flow, sub_flow, code, message)
+            .await
+    }
+
+    async fn find_gsm_rule(
+        &self,
+        connector: String,
+        flow: String,
+        sub_flow: String,
+        code: String,
+        message: String,
+    ) -> CustomResult<storage::GatewayStatusMap, errors::StorageError> {
+        self.diesel_store
+            .find_gsm_rule(connector, flow, sub_flow, code, message)
+            .await
+    }
+
+    async fn update_gsm_rule(
+        &self,
+        connector: String,
+        flow: String,
+        sub_flow: String,
+        code: String,
+        message: String,
+        data: storage::GatewayStatusMappingUpdate,
+    ) -> CustomResult<storage::GatewayStatusMap, errors::StorageError> {
+        self.diesel_store
+            .update_gsm_rule(connector, flow, sub_flow, code, message, data)
+            .await
+    }
+
+    async fn delete_gsm_rule(
+        &self,
+        connector: String,
+        flow: String,
+        sub_flow: String,
+        code: String,
+        message: String,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store
+            .delete_gsm_rule(connector, flow, sub_flow, code, message)
+            .await
+    }
+}
+
+#[async_trait::async_trait]
+impl StorageInterface for KafkaStore {
+    fn get_scheduler_db(&self) -> Box<dyn SchedulerInterface> {
+        Box::new(self.clone())
+    }
+}
+
+#[async_trait::async_trait]
+impl SchedulerInterface for KafkaStore {}
+
+impl MasterKeyInterface for KafkaStore {
+    fn get_master_key(&self) -> &[u8] {
+        self.diesel_store.get_master_key()
+    }
+}
+#[async_trait::async_trait]
+impl UserInterface for KafkaStore {
+    async fn insert_user(
+        &self,
+        user_data: storage::UserNew,
+    ) -> CustomResult<storage::User, errors::StorageError> {
+        self.diesel_store.insert_user(user_data).await
+    }
+
+    async fn find_user_by_email(
+        &self,
+        user_email: &str,
+    ) -> CustomResult<storage::User, errors::StorageError> {
+        self.diesel_store.find_user_by_email(user_email).await
+    }
+
+    async fn find_user_by_id(
+        &self,
+        user_id: &str,
+    ) -> CustomResult<storage::User, errors::StorageError> {
+        self.diesel_store.find_user_by_id(user_id).await
+    }
+
+    async fn update_user_by_user_id(
+        &self,
+        user_id: &str,
+        user: storage::UserUpdate,
+    ) -> CustomResult<storage::User, errors::StorageError> {
+        self.diesel_store
+            .update_user_by_user_id(user_id, user)
+            .await
+    }
+
+    async fn delete_user_by_user_id(
+        &self,
+        user_id: &str,
+    ) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store.delete_user_by_user_id(user_id).await
+    }
+}
+
+impl RedisConnInterface for KafkaStore {
+    fn get_redis_conn(&self) -> CustomResult<Arc<RedisConnectionPool>, RedisError> {
+        self.diesel_store.get_redis_conn()
+    }
+}
+
+#[async_trait::async_trait]
+impl UserRoleInterface for KafkaStore {
+    async fn insert_user_role(
+        &self,
+        user_role: user_storage::UserRoleNew,
+    ) -> CustomResult<user_storage::UserRole, errors::StorageError> {
+        self.diesel_store.insert_user_role(user_role).await
+    }
+    async fn find_user_role_by_user_id(
+        &self,
+        user_id: &str,
+    ) -> CustomResult<user_storage::UserRole, errors::StorageError> {
+        self.diesel_store.find_user_role_by_user_id(user_id).await
+    }
+    async fn update_user_role_by_user_id_merchant_id(
+        &self,
+        user_id: &str,
+        merchant_id: &str,
+        update: user_storage::UserRoleUpdate,
+    ) -> CustomResult<user_storage::UserRole, errors::StorageError> {
+        self.diesel_store
+            .update_user_role_by_user_id_merchant_id(user_id, merchant_id, update)
+            .await
+    }
+    async fn delete_user_role(&self, user_id: &str) -> CustomResult<bool, errors::StorageError> {
+        self.diesel_store.delete_user_role(user_id).await
+    }
+    async fn list_user_roles_by_user_id(
+        &self,
+        user_id: &str,
+    ) -> CustomResult<Vec<user_storage::UserRole>, errors::StorageError> {
+        self.diesel_store.list_user_roles_by_user_id(user_id).await
+    }
+}
+
+#[async_trait::async_trait]
+impl DashboardMetadataInterface for KafkaStore {
+    async fn insert_metadata(
+        &self,
+        metadata: storage::DashboardMetadataNew,
+    ) -> CustomResult<storage::DashboardMetadata, errors::StorageError> {
+        self.diesel_store.insert_metadata(metadata).await
+    }
+
+    async fn find_user_scoped_dashboard_metadata(
+        &self,
+        user_id: &str,
+        merchant_id: &str,
+        org_id: &str,
+        data_keys: Vec<enums::DashboardMetadata>,
+    ) -> CustomResult<Vec<storage::DashboardMetadata>, errors::StorageError> {
+        self.diesel_store
+            .find_user_scoped_dashboard_metadata(user_id, merchant_id, org_id, data_keys)
+            .await
+    }
+    async fn find_merchant_scoped_dashboard_metadata(
+        &self,
+        merchant_id: &str,
+        org_id: &str,
+        data_keys: Vec<enums::DashboardMetadata>,
+    ) -> CustomResult<Vec<storage::DashboardMetadata>, errors::StorageError> {
+        self.diesel_store
+            .find_merchant_scoped_dashboard_metadata(merchant_id, org_id, data_keys)
+            .await
+    }
+}
diff --git a/crates/router/src/events.rs b/crates/router/src/events.rs
index 39a8543a68c4..8f980fee504a 100644
--- a/crates/router/src/events.rs
+++ b/crates/router/src/events.rs
@@ -1,15 +1,21 @@
-use serde::Serialize;
+use data_models::errors::{StorageError, StorageResult};
+use error_stack::ResultExt;
+use serde::{Deserialize, Serialize};
+use storage_impl::errors::ApplicationError;
+
+use crate::{db::KafkaProducer, services::kafka::KafkaSettings};
 
 pub mod api_logs;
 pub mod event_logger;
+pub mod kafka_handler;
 
-pub trait EventHandler: Sync + Send + dyn_clone::DynClone {
+pub(super) trait EventHandler: Sync + Send + dyn_clone::DynClone {
     fn log_event(&self, event: RawEvent);
 }
 
 dyn_clone::clone_trait_object!(EventHandler);
 
-#[derive(Debug)]
+#[derive(Debug, Serialize)]
 pub struct RawEvent {
     pub event_type: EventType,
     pub key: String,
@@ -24,3 +30,55 @@ pub enum EventType {
     Refund,
     ApiLogs,
 }
+
+#[derive(Debug, Default, Deserialize, Clone)]
+#[serde(tag = "source")]
+#[serde(rename_all = "lowercase")]
+pub enum EventsConfig {
+    Kafka {
+        kafka: KafkaSettings,
+    },
+    #[default]
+    Logs,
+}
+
+#[derive(Debug, Clone)]
+pub enum EventsHandler {
+    Kafka(KafkaProducer),
+    Logs(event_logger::EventLogger),
+}
+
+impl Default for EventsHandler {
+    fn default() -> Self {
+        Self::Logs(event_logger::EventLogger {})
+    }
+}
+
+impl EventsConfig {
+    pub async fn get_event_handler(&self) -> StorageResult<EventsHandler> {
+        Ok(match self {
+            Self::Kafka { kafka } => EventsHandler::Kafka(
+                KafkaProducer::create(kafka)
+                    .await
+                    .change_context(StorageError::InitializationError)?,
+            ),
+            Self::Logs => EventsHandler::Logs(event_logger::EventLogger::default()),
+        })
+    }
+
+    pub fn validate(&self) -> Result<(), ApplicationError> {
+        match self {
+            Self::Kafka { kafka } => kafka.validate(),
+            Self::Logs => Ok(()),
+        }
+    }
+}
+
+impl EventsHandler {
+    pub fn log_event(&self, event: RawEvent) {
+        match self {
+            Self::Kafka(kafka) => kafka.log_event(event),
+            Self::Logs(logger) => logger.log_event(event),
+        }
+    }
+}
diff --git a/crates/router/src/events/api_logs.rs b/crates/router/src/events/api_logs.rs
index 3f0bf651c464..bfc10f722c1f 100644
--- a/crates/router/src/events/api_logs.rs
+++ b/crates/router/src/events/api_logs.rs
@@ -24,6 +24,7 @@ use crate::{
 #[derive(Clone, Debug, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub struct ApiEvent {
+    merchant_id: Option<String>,
     api_flow: String,
     created_at_timestamp: i128,
     request_id: String,
@@ -31,20 +32,22 @@ pub struct ApiEvent {
     status_code: i64,
     #[serde(flatten)]
     auth_type: AuthenticationType,
-    request: serde_json::Value,
+    request: String,
     user_agent: Option<String>,
     ip_addr: Option<String>,
     url_path: String,
-    response: Option<serde_json::Value>,
+    response: Option<String>,
     error: Option<serde_json::Value>,
     #[serde(flatten)]
     event_type: ApiEventsType,
     hs_latency: Option<u128>,
+    http_method: Option<String>,
 }
 
 impl ApiEvent {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
+        merchant_id: Option<String>,
         api_flow: &impl FlowMetric,
         request_id: &RequestId,
         latency: u128,
@@ -56,15 +59,17 @@ impl ApiEvent {
         error: Option<serde_json::Value>,
         event_type: ApiEventsType,
         http_req: &HttpRequest,
+        http_method: Option<String>,
     ) -> Self {
         Self {
+            merchant_id,
             api_flow: api_flow.to_string(),
-            created_at_timestamp: OffsetDateTime::now_utc().unix_timestamp_nanos(),
+            created_at_timestamp: OffsetDateTime::now_utc().unix_timestamp_nanos() / 1_000_000,
             request_id: request_id.as_hyphenated().to_string(),
             latency,
             status_code,
-            request,
-            response,
+            request: request.to_string(),
+            response: response.map(|resp| resp.to_string()),
             auth_type,
             error,
             ip_addr: http_req
@@ -78,6 +83,7 @@ impl ApiEvent {
             url_path: http_req.path().to_string(),
             event_type,
             hs_latency,
+            http_method,
         }
     }
 }
diff --git a/crates/router/src/events/event_logger.rs b/crates/router/src/events/event_logger.rs
index fda9b1a036ae..1bd75341be4a 100644
--- a/crates/router/src/events/event_logger.rs
+++ b/crates/router/src/events/event_logger.rs
@@ -7,6 +7,6 @@ pub struct EventLogger {}
 impl EventHandler for EventLogger {
     #[track_caller]
     fn log_event(&self, event: RawEvent) {
-        logger::info!(event = ?serde_json::to_string(&event.payload).unwrap_or(r#"{ "error": "Serialization failed" }"#.to_string()), event_type =? event.event_type, event_id =? event.key, log_type = "event");
+        logger::info!(event = ?event.payload.to_string(), event_type =? event.event_type, event_id =? event.key, log_type = "event");
     }
 }
diff --git a/crates/router/src/events/kafka_handler.rs b/crates/router/src/events/kafka_handler.rs
new file mode 100644
index 000000000000..d55847e6e8e7
--- /dev/null
+++ b/crates/router/src/events/kafka_handler.rs
@@ -0,0 +1,29 @@
+use error_stack::{IntoReport, ResultExt};
+use router_env::tracing;
+
+use super::{EventHandler, RawEvent};
+use crate::{
+    db::MQResult,
+    services::kafka::{KafkaError, KafkaMessage, KafkaProducer},
+};
+impl EventHandler for KafkaProducer {
+    fn log_event(&self, event: RawEvent) {
+        let topic = self.get_topic(event.event_type);
+        if let Err(er) = self.log_kafka_event(topic, &event) {
+            tracing::error!("Failed to log event to kafka: {:?}", er);
+        }
+    }
+}
+
+impl KafkaMessage for RawEvent {
+    fn key(&self) -> String {
+        self.key.clone()
+    }
+
+    fn value(&self) -> MQResult<Vec<u8>> {
+        // Add better error logging here
+        serde_json::to_vec(&self.payload)
+            .into_report()
+            .change_context(KafkaError::GenericError)
+    }
+}
diff --git a/crates/router/src/lib.rs b/crates/router/src/lib.rs
index 0bc8e492c40c..035314f71dfb 100644
--- a/crates/router/src/lib.rs
+++ b/crates/router/src/lib.rs
@@ -1,8 +1,6 @@
 #![forbid(unsafe_code)]
 #![recursion_limit = "256"]
 
-#[cfg(feature = "olap")]
-pub mod analytics;
 #[cfg(feature = "stripe")]
 pub mod compatibility;
 pub mod configs;
@@ -17,6 +15,8 @@ pub(crate) mod macros;
 pub mod routes;
 pub mod workflows;
 
+#[cfg(feature = "olap")]
+pub mod analytics;
 pub mod events;
 pub mod middleware;
 pub mod openapi;
@@ -35,10 +35,7 @@ use storage_impl::errors::ApplicationResult;
 use tokio::sync::{mpsc, oneshot};
 
 pub use self::env::logger;
-use crate::{
-    configs::settings,
-    core::errors::{self},
-};
+use crate::{configs::settings, core::errors};
 
 #[cfg(feature = "mimalloc")]
 #[global_allocator]
@@ -122,6 +119,7 @@ pub fn mk_app(
             .service(routes::Payments::server(state.clone()))
             .service(routes::Customers::server(state.clone()))
             .service(routes::Configs::server(state.clone()))
+            .service(routes::Forex::server(state.clone()))
             .service(routes::Refunds::server(state.clone()))
             .service(routes::MerchantConnectorAccount::server(state.clone()))
             .service(routes::Mandates::server(state.clone()))
diff --git a/crates/router/src/openapi.rs b/crates/router/src/openapi.rs
index 567ca90dbd32..a266a2d7e4a2 100644
--- a/crates/router/src/openapi.rs
+++ b/crates/router/src/openapi.rs
@@ -73,11 +73,11 @@ Never share your secret api keys. Keep them guarded and secure.
         // crate::routes::admin::retrieve_merchant_account,
         // crate::routes::admin::update_merchant_account,
         // crate::routes::admin::delete_merchant_account,
-        // crate::routes::admin::payment_connector_create,
-        // crate::routes::admin::payment_connector_retrieve,
-        // crate::routes::admin::payment_connector_list,
-        // crate::routes::admin::payment_connector_update,
-        // crate::routes::admin::payment_connector_delete,
+        crate::routes::admin::payment_connector_create,
+        crate::routes::admin::payment_connector_retrieve,
+        crate::routes::admin::payment_connector_list,
+        crate::routes::admin::payment_connector_update,
+        crate::routes::admin::payment_connector_delete,
         crate::routes::mandates::get_mandate,
         crate::routes::mandates::revoke_mandate,
         crate::routes::payments::payments_create,
@@ -249,6 +249,7 @@ Never share your secret api keys. Keep them guarded and secure.
         api_models::payments::OnlineMandate,
         api_models::payments::Card,
         api_models::payments::CardRedirectData,
+        api_models::payments::CardToken,
         api_models::payments::CustomerAcceptance,
         api_models::payments::PaymentsRequest,
         api_models::payments::PaymentsCreateRequest,
diff --git a/crates/router/src/routes.rs b/crates/router/src/routes.rs
index 5166e326fb91..22c2610d3255 100644
--- a/crates/router/src/routes.rs
+++ b/crates/router/src/routes.rs
@@ -4,6 +4,8 @@ pub mod app;
 pub mod cache;
 pub mod cards_info;
 pub mod configs;
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub mod currency;
 pub mod customers;
 pub mod disputes;
 #[cfg(feature = "dummy_connector")]
@@ -27,11 +29,15 @@ pub mod routing;
 pub mod user;
 #[cfg(all(feature = "olap", feature = "kms"))]
 pub mod verification;
+#[cfg(feature = "olap")]
+pub mod verify_connector;
 pub mod webhooks;
 
 pub mod locker_migration;
 #[cfg(feature = "dummy_connector")]
 pub use self::app::DummyConnector;
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub use self::app::Forex;
 #[cfg(feature = "payouts")]
 pub use self::app::Payouts;
 #[cfg(feature = "olap")]
diff --git a/crates/router/src/routes/admin.rs b/crates/router/src/routes/admin.rs
index 0586faabbf76..ce6a2a97e28d 100644
--- a/crates/router/src/routes/admin.rs
+++ b/crates/router/src/routes/admin.rs
@@ -190,7 +190,7 @@ pub async fn delete_merchant_account(
     )
     .await
 }
-/// PaymentsConnectors - Create
+/// Merchant Connector - Create
 ///
 /// Create a new Merchant Connector for the merchant account. The connector could be a payment processor / facilitator / acquirer or specialized services like Fraud / Accounting etc."
 #[utoipa::path(
diff --git a/crates/router/src/routes/app.rs b/crates/router/src/routes/app.rs
index 84848e030120..2f8932057fb4 100644
--- a/crates/router/src/routes/app.rs
+++ b/crates/router/src/routes/app.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use actix_web::{web, Scope};
 #[cfg(feature = "email")]
-use external_services::email::{AwsSes, EmailClient};
+use external_services::email::{ses::AwsSes, EmailService};
 #[cfg(feature = "kms")]
 use external_services::kms::{self, decrypt::KmsDecrypt};
 use router_env::tracing_actix_web::RequestId;
@@ -10,6 +10,8 @@ use scheduler::SchedulerInterface;
 use storage_impl::MockDb;
 use tokio::sync::oneshot;
 
+#[cfg(any(feature = "olap", feature = "oltp"))]
+use super::currency;
 #[cfg(feature = "dummy_connector")]
 use super::dummy_connector::*;
 #[cfg(feature = "payouts")]
@@ -28,10 +30,12 @@ use super::{cache::*, health::*};
 use super::{configs::*, customers::*, mandates::*, payments::*, refunds::*};
 #[cfg(feature = "oltp")]
 use super::{ephemeral_key::*, payment_methods::*, webhooks::*};
-use crate::{
+#[cfg(feature = "olap")]
+use crate::routes::verify_connector::payment_connector_verify;
+pub use crate::{
     configs::settings,
     db::{StorageImpl, StorageInterface},
-    events::{event_logger::EventLogger, EventHandler},
+    events::EventsHandler,
     routes::cards_info::card_iin_info,
     services::get_store,
 };
@@ -41,9 +45,9 @@ pub struct AppState {
     pub flow_name: String,
     pub store: Box<dyn StorageInterface>,
     pub conf: Arc<settings::Settings>,
-    pub event_handler: Box<dyn EventHandler>,
+    pub event_handler: EventsHandler,
     #[cfg(feature = "email")]
-    pub email_client: Arc<dyn EmailClient>,
+    pub email_client: Arc<dyn EmailService>,
     #[cfg(feature = "kms")]
     pub kms_secrets: Arc<settings::ActiveKmsSecrets>,
     pub api_client: Box<dyn crate::services::ApiClient>,
@@ -60,9 +64,9 @@ impl scheduler::SchedulerAppState for AppState {
 pub trait AppStateInfo {
     fn conf(&self) -> settings::Settings;
     fn store(&self) -> Box<dyn StorageInterface>;
-    fn event_handler(&self) -> Box<dyn EventHandler>;
+    fn event_handler(&self) -> EventsHandler;
     #[cfg(feature = "email")]
-    fn email_client(&self) -> Arc<dyn EmailClient>;
+    fn email_client(&self) -> Arc<dyn EmailService>;
     fn add_request_id(&mut self, request_id: RequestId);
     fn add_merchant_id(&mut self, merchant_id: Option<String>);
     fn add_flow_name(&mut self, flow_name: String);
@@ -77,11 +81,11 @@ impl AppStateInfo for AppState {
         self.store.to_owned()
     }
     #[cfg(feature = "email")]
-    fn email_client(&self) -> Arc<dyn EmailClient> {
+    fn email_client(&self) -> Arc<dyn EmailService> {
         self.email_client.to_owned()
     }
-    fn event_handler(&self) -> Box<dyn EventHandler> {
-        self.event_handler.to_owned()
+    fn event_handler(&self) -> EventsHandler {
+        self.event_handler.clone()
     }
     fn add_request_id(&mut self, request_id: RequestId) {
         self.api_client.add_request_id(request_id);
@@ -105,6 +109,15 @@ impl AsRef<Self> for AppState {
     }
 }
 
+#[cfg(feature = "email")]
+pub async fn create_email_client(settings: &settings::Settings) -> impl EmailService {
+    match settings.email.active_email_client {
+        external_services::email::AvailableEmailClients::SES => {
+            AwsSes::create(&settings.email, settings.proxy.https_url.to_owned()).await
+        }
+    }
+}
+
 impl AppState {
     /// # Panics
     ///
@@ -119,13 +132,31 @@ impl AppState {
             #[cfg(feature = "kms")]
             let kms_client = kms::get_kms_client(&conf.kms).await;
             let testable = storage_impl == StorageImpl::PostgresqlTest;
+            #[allow(clippy::expect_used)]
+            let event_handler = conf
+                .events
+                .get_event_handler()
+                .await
+                .expect("Failed to create event handler");
             let store: Box<dyn StorageInterface> = match storage_impl {
-                StorageImpl::Postgresql | StorageImpl::PostgresqlTest => Box::new(
-                    #[allow(clippy::expect_used)]
-                    get_store(&conf, shut_down_signal, testable)
-                        .await
-                        .expect("Failed to create store"),
-                ),
+                StorageImpl::Postgresql | StorageImpl::PostgresqlTest => match &event_handler {
+                    EventsHandler::Kafka(kafka_client) => Box::new(
+                        crate::db::KafkaStore::new(
+                            #[allow(clippy::expect_used)]
+                            get_store(&conf.clone(), shut_down_signal, testable)
+                                .await
+                                .expect("Failed to create store"),
+                            kafka_client.clone(),
+                        )
+                        .await,
+                    ),
+                    EventsHandler::Logs(_) => Box::new(
+                        #[allow(clippy::expect_used)]
+                        get_store(&conf, shut_down_signal, testable)
+                            .await
+                            .expect("Failed to create store"),
+                    ),
+                },
                 #[allow(clippy::expect_used)]
                 StorageImpl::Mock => Box::new(
                     MockDb::new(&conf.redis)
@@ -135,12 +166,7 @@ impl AppState {
             };
 
             #[cfg(feature = "olap")]
-            let pool = crate::analytics::AnalyticsProvider::from_conf(
-                &conf.analytics,
-                #[cfg(feature = "kms")]
-                kms_client,
-            )
-            .await;
+            let pool = crate::analytics::AnalyticsProvider::from_conf(&conf.analytics).await;
 
             #[cfg(feature = "kms")]
             #[allow(clippy::expect_used)]
@@ -152,7 +178,8 @@ impl AppState {
             .expect("Failed while performing KMS decryption");
 
             #[cfg(feature = "email")]
-            let email_client = Arc::new(AwsSes::new(&conf.email).await);
+            let email_client = Arc::new(create_email_client(&conf).await);
+
             Self {
                 flow_name: String::from("default"),
                 store,
@@ -162,7 +189,7 @@ impl AppState {
                 #[cfg(feature = "kms")]
                 kms_secrets: Arc::new(kms_secrets),
                 api_client,
-                event_handler: Box::<EventLogger>::default(),
+                event_handler,
                 #[cfg(feature = "olap")]
                 pool,
             }
@@ -302,6 +329,22 @@ impl Payments {
     }
 }
 
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub struct Forex;
+
+#[cfg(any(feature = "olap", feature = "oltp"))]
+impl Forex {
+    pub fn server(state: AppState) -> Scope {
+        web::scope("/forex")
+            .app_data(web::Data::new(state.clone()))
+            .app_data(web::Data::new(state.clone()))
+            .service(web::resource("/rates").route(web::get().to(currency::retrieve_forex)))
+            .service(
+                web::resource("/convert_from_minor").route(web::get().to(currency::convert_forex)),
+            )
+    }
+}
+
 #[cfg(feature = "olap")]
 pub struct Routing;
 
@@ -507,6 +550,10 @@ impl MerchantConnectorAccount {
             use super::admin::*;
 
             route = route
+                .service(
+                    web::resource("/connectors/verify")
+                        .route(web::post().to(payment_connector_verify)),
+                )
                 .service(
                     web::resource("/{merchant_id}/connectors")
                         .route(web::post().to(payment_connector_create))
@@ -760,6 +807,11 @@ impl User {
             .service(web::resource("/v2/signin").route(web::post().to(user_connect_account)))
             .service(web::resource("/v2/signup").route(web::post().to(user_connect_account)))
             .service(web::resource("/change_password").route(web::post().to(change_password)))
+            .service(
+                web::resource("/data/merchant")
+                    .route(web::post().to(set_merchant_scoped_dashboard_metadata)),
+            )
+            .service(web::resource("/data").route(web::get().to(get_multiple_dashboard_metadata)))
     }
 }
 
diff --git a/crates/router/src/routes/currency.rs b/crates/router/src/routes/currency.rs
new file mode 100644
index 000000000000..1e1858517176
--- /dev/null
+++ b/crates/router/src/routes/currency.rs
@@ -0,0 +1,58 @@
+use actix_web::{web, HttpRequest, HttpResponse};
+use router_env::Flow;
+
+use crate::{
+    core::{api_locking, currency},
+    routes::AppState,
+    services::{api, authentication as auth, authorization::permissions::Permission},
+};
+
+pub async fn retrieve_forex(state: web::Data<AppState>, req: HttpRequest) -> HttpResponse {
+    let flow = Flow::RetrieveForexFlow;
+    Box::pin(api::server_wrap(
+        flow,
+        state,
+        &req,
+        (),
+        |state, _auth: auth::AuthenticationData, _| currency::retrieve_forex(state),
+        auth::auth_type(
+            &auth::ApiKeyAuth,
+            &auth::JWTAuth(Permission::ForexRead),
+            req.headers(),
+        ),
+        api_locking::LockAction::NotApplicable,
+    ))
+    .await
+}
+
+pub async fn convert_forex(
+    state: web::Data<AppState>,
+    req: HttpRequest,
+    params: web::Query<api_models::currency::CurrencyConversionParams>,
+) -> HttpResponse {
+    let flow = Flow::RetrieveForexFlow;
+    let amount = &params.amount;
+    let to_currency = &params.to_currency;
+    let from_currency = &params.from_currency;
+    Box::pin(api::server_wrap(
+        flow,
+        state.clone(),
+        &req,
+        (),
+        |state, _, _| {
+            currency::convert_forex(
+                state,
+                *amount,
+                to_currency.to_string(),
+                from_currency.to_string(),
+            )
+        },
+        auth::auth_type(
+            &auth::ApiKeyAuth,
+            &auth::JWTAuth(Permission::ForexRead),
+            req.headers(),
+        ),
+        api_locking::LockAction::NotApplicable,
+    ))
+    .await
+}
diff --git a/crates/router/src/routes/lock_utils.rs b/crates/router/src/routes/lock_utils.rs
index 219948bdd4d2..72bc3c9cd417 100644
--- a/crates/router/src/routes/lock_utils.rs
+++ b/crates/router/src/routes/lock_utils.rs
@@ -23,6 +23,7 @@ pub enum ApiIdentifier {
     ApiKeys,
     PaymentLink,
     Routing,
+    Forex,
     RustLockerMigration,
     Gsm,
     User,
@@ -51,6 +52,8 @@ impl From<Flow> for ApiIdentifier {
             | Flow::DecisionManagerRetrieveConfig
             | Flow::DecisionManagerUpsertConfig => Self::Routing,
 
+            Flow::RetrieveForexFlow => Self::Forex,
+
             Flow::MerchantConnectorsCreate
             | Flow::MerchantConnectorsRetrieve
             | Flow::MerchantConnectorsUpdate
@@ -144,7 +147,11 @@ impl From<Flow> for ApiIdentifier {
             | Flow::GsmRuleUpdate
             | Flow::GsmRuleDelete => Self::Gsm,
 
-            Flow::UserConnectAccount | Flow::ChangePassword => Self::User,
+            Flow::UserConnectAccount
+            | Flow::ChangePassword
+            | Flow::SetDashboardMetadata
+            | Flow::GetMutltipleDashboardMetadata
+            | Flow::VerifyPaymentConnector => Self::User,
         }
     }
 }
diff --git a/crates/router/src/routes/user.rs b/crates/router/src/routes/user.rs
index 7d3d183eda76..3f5f7815ffbc 100644
--- a/crates/router/src/routes/user.rs
+++ b/crates/router/src/routes/user.rs
@@ -1,5 +1,6 @@
 use actix_web::{web, HttpRequest, HttpResponse};
-use api_models::user as user_api;
+use api_models::{errors::types::ApiErrorResponse, user as user_api};
+use common_utils::errors::ReportSwitchExt;
 use router_env::Flow;
 
 use super::AppState;
@@ -8,7 +9,9 @@ use crate::{
     services::{
         api,
         authentication::{self as auth},
+        authorization::permissions::Permission,
     },
+    utils::user::dashboard_metadata::{parse_string_to_enums, set_ip_address_if_required},
 };
 
 pub async fn user_connect_account(
@@ -47,3 +50,55 @@ pub async fn change_password(
     ))
     .await
 }
+
+pub async fn set_merchant_scoped_dashboard_metadata(
+    state: web::Data<AppState>,
+    req: HttpRequest,
+    json_payload: web::Json<user_api::dashboard_metadata::SetMetaDataRequest>,
+) -> HttpResponse {
+    let flow = Flow::SetDashboardMetadata;
+    let mut payload = json_payload.into_inner();
+
+    if let Err(e) = common_utils::errors::ReportSwitchExt::<(), ApiErrorResponse>::switch(
+        set_ip_address_if_required(&mut payload, req.headers()),
+    ) {
+        return api::log_and_return_error_response(e);
+    }
+
+    Box::pin(api::server_wrap(
+        flow,
+        state,
+        &req,
+        payload,
+        user::dashboard_metadata::set_metadata,
+        &auth::JWTAuth(Permission::MerchantAccountWrite),
+        api_locking::LockAction::NotApplicable,
+    ))
+    .await
+}
+
+pub async fn get_multiple_dashboard_metadata(
+    state: web::Data<AppState>,
+    req: HttpRequest,
+    query: web::Query<user_api::dashboard_metadata::GetMultipleMetaDataRequest>,
+) -> HttpResponse {
+    let flow = Flow::GetMutltipleDashboardMetadata;
+    let payload = match ReportSwitchExt::<_, ApiErrorResponse>::switch(parse_string_to_enums(
+        query.into_inner().keys,
+    )) {
+        Ok(payload) => payload,
+        Err(e) => {
+            return api::log_and_return_error_response(e);
+        }
+    };
+    Box::pin(api::server_wrap(
+        flow,
+        state,
+        &req,
+        payload,
+        user::dashboard_metadata::get_multiple_metadata,
+        &auth::DashboardNoPermissionAuth,
+        api_locking::LockAction::NotApplicable,
+    ))
+    .await
+}
diff --git a/crates/router/src/routes/verify_connector.rs b/crates/router/src/routes/verify_connector.rs
new file mode 100644
index 000000000000..bfb1b781ada4
--- /dev/null
+++ b/crates/router/src/routes/verify_connector.rs
@@ -0,0 +1,28 @@
+use actix_web::{web, HttpRequest, HttpResponse};
+use api_models::verify_connector::VerifyConnectorRequest;
+use router_env::{instrument, tracing, Flow};
+
+use super::AppState;
+use crate::{
+    core::{api_locking, verify_connector},
+    services::{self, authentication as auth, authorization::permissions::Permission},
+};
+
+#[instrument(skip_all, fields(flow = ?Flow::VerifyPaymentConnector))]
+pub async fn payment_connector_verify(
+    state: web::Data<AppState>,
+    req: HttpRequest,
+    json_payload: web::Json<VerifyConnectorRequest>,
+) -> HttpResponse {
+    let flow = Flow::VerifyPaymentConnector;
+    Box::pin(services::server_wrap(
+        flow,
+        state,
+        &req,
+        json_payload.into_inner(),
+        |state, _: (), req| verify_connector::verify_connector_credentials(state, req),
+        &auth::JWTAuth(Permission::MerchantConnectorAccountWrite),
+        api_locking::LockAction::NotApplicable,
+    ))
+    .await
+}
diff --git a/crates/router/src/services.rs b/crates/router/src/services.rs
index 2d5552b59d17..e46612b95dfc 100644
--- a/crates/router/src/services.rs
+++ b/crates/router/src/services.rs
@@ -4,8 +4,12 @@ pub mod authorization;
 pub mod encryption;
 #[cfg(feature = "olap")]
 pub mod jwt;
+pub mod kafka;
 pub mod logger;
 
+#[cfg(feature = "email")]
+pub mod email;
+
 #[cfg(feature = "kms")]
 use data_models::errors::StorageError;
 use data_models::errors::StorageResult;
diff --git a/crates/router/src/services/api.rs b/crates/router/src/services/api.rs
index 5481d5c5cf9d..1ff46474db59 100644
--- a/crates/router/src/services/api.rs
+++ b/crates/router/src/services/api.rs
@@ -873,6 +873,7 @@ where
     };
 
     let api_event = ApiEvent::new(
+        Some(merchant_id.clone()),
         flow,
         &request_id,
         request_duration,
@@ -884,6 +885,7 @@ where
         error,
         event_type.unwrap_or(ApiEventsType::Miscellaneous),
         request,
+        Some(request.method().to_string()),
     );
     match api_event.clone().try_into() {
         Ok(event) => {
diff --git a/crates/router/src/services/authentication.rs b/crates/router/src/services/authentication.rs
index e24c7cebcb2a..b01e3762bfab 100644
--- a/crates/router/src/services/authentication.rs
+++ b/crates/router/src/services/authentication.rs
@@ -47,11 +47,11 @@ pub enum AuthenticationType {
         key_id: String,
     },
     AdminApiKey,
-    MerchantJWT {
+    MerchantJwt {
         merchant_id: String,
         user_id: Option<String>,
     },
-    MerchantID {
+    MerchantId {
         merchant_id: String,
     },
     PublishableKey {
@@ -70,9 +70,9 @@ impl AuthenticationType {
                 merchant_id,
                 key_id: _,
             }
-            | Self::MerchantID { merchant_id }
+            | Self::MerchantId { merchant_id }
             | Self::PublishableKey { merchant_id }
-            | Self::MerchantJWT {
+            | Self::MerchantJwt {
                 merchant_id,
                 user_id: _,
             }
@@ -352,7 +352,7 @@ where
         };
         Ok((
             auth.clone(),
-            AuthenticationType::MerchantID {
+            AuthenticationType::MerchantId {
                 merchant_id: auth.merchant_account.merchant_id.clone(),
             },
         ))
@@ -423,7 +423,7 @@ where
 
         Ok((
             (),
-            AuthenticationType::MerchantJWT {
+            AuthenticationType::MerchantJwt {
                 merchant_id: payload.merchant_id,
                 user_id: Some(payload.user_id),
             },
@@ -451,7 +451,7 @@ where
                 org_id: payload.org_id,
                 role_id: payload.role_id,
             },
-            AuthenticationType::MerchantJWT {
+            AuthenticationType::MerchantJwt {
                 merchant_id: payload.merchant_id,
                 user_id: Some(payload.user_id),
             },
@@ -479,13 +479,13 @@ where
         let permissions = authorization::get_permissions(&payload.role_id)?;
         authorization::check_authorization(&self.required_permission, permissions)?;
 
-        // Check if token has access to merchantID that has been requested through query param
+        // Check if token has access to MerchantId that has been requested through query param
         if payload.merchant_id != self.merchant_id {
             return Err(report!(errors::ApiErrorResponse::InvalidJwtToken));
         }
         Ok((
             (),
-            AuthenticationType::MerchantJWT {
+            AuthenticationType::MerchantJwt {
                 merchant_id: payload.merchant_id,
                 user_id: Some(payload.user_id),
             },
@@ -549,7 +549,7 @@ where
         };
         Ok((
             auth.clone(),
-            AuthenticationType::MerchantJWT {
+            AuthenticationType::MerchantJwt {
                 merchant_id: auth.merchant_account.merchant_id.clone(),
                 user_id: None,
             },
@@ -579,7 +579,7 @@ where
                 org_id: payload.org_id,
                 role_id: payload.role_id,
             },
-            AuthenticationType::MerchantJWT {
+            AuthenticationType::MerchantJwt {
                 merchant_id: payload.merchant_id,
                 user_id: Some(payload.user_id),
             },
diff --git a/crates/router/src/services/email.rs b/crates/router/src/services/email.rs
new file mode 100644
index 000000000000..cd408564ea08
--- /dev/null
+++ b/crates/router/src/services/email.rs
@@ -0,0 +1 @@
+pub mod types;
diff --git a/crates/router/src/services/email/assets/invite.html b/crates/router/src/services/email/assets/invite.html
new file mode 100644
index 000000000000..307ec6cead85
--- /dev/null
+++ b/crates/router/src/services/email/assets/invite.html
@@ -0,0 +1,243 @@
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<title>Welcome to HyperSwitch!</title>
+
+<body style="background-color: #ececec">
+    <style>
+        .apple-footer a {{
+                text-decoration: none !important;
+                color: #999 !important;
+                border: none !important;
+          }}
+
+        .apple-email a {{
+                text-decoration: none !important;
+                color: #448bff !important;
+                border: none !important;
+            }}
+    </style>
+    <div id="wrapper" style="
+      background-color: none;
+      margin: 0 auto;
+      text-align: center;
+      width: 60%;
+      -premailer-height: 200;
+    ">
+        <table align="center" class="main-table" style="
+        -premailer-cellpadding: 0;
+        -premailer-cellspacing: 0;
+        background-color: #fff;
+        border: 0;
+        border-top: 5px solid #0165ef;
+        margin: 0 auto;
+        mso-table-lspace: 0;
+        mso-table-rspace: 0;
+        padding: 0 40;
+        text-align: center;
+        width: 100%;
+      " bgcolor="#ffffff" cellpadding="0" cellspacing="0">
+            <tr>
+                <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="75" width="100%"></td>
+            </tr>
+            <tr>
+                <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="25" width="100%"></td>
+            </tr>
+            <tr>
+                <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="50" width="100%"></td>
+            </tr>
+            <tr>
+                <td class="headline" style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 30px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          " align="center">
+                    Welcome to HyperSwitch!
+                </td>
+            </tr>
+            <tr>
+                <td class="spacer-sm" style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          " width="100%"></td>
+            </tr>
+            <tr>
+              <td class="copy" style="
+                  color: #666;
+                  font-family: Roboto, Helvetica, Arial, san-serif;
+                  font-size: 14px;
+                  text-align: center;
+                  line-height: 20px;
+                  margin-top: 20px;
+                  padding: 0;
+                " 20px!important; align="center">
+                <br />
+                Hi {username}<br />
+              </td>
+            </tr>
+            <tr>
+                <td class="spacer-sm" style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          " width="100%"></td>
+            </tr>
+            <tr>
+                <td class="copy" style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: center;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          " 20px!important; align="center">
+                    <br />
+                    You have received this email because your administrator has invited you as a new user on
+                    Hyperswitch.
+                    <br />
+                </td>
+            </tr>
+            <tr>
+                <td class="spacer-sm" style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          " width="100%"></td>
+            </tr>
+            <tr>
+                <td class="copy" style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: center;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          " 20px!important; align="center">
+                    <br />
+                    <b>To get started, click on the button below. </b>
+                </td>
+            </tr>
+            <tr>
+                <td class="spacer-sm" style="
+            -premailer-height: 20;
+            -premailer-width: 100%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          " height="20" width="100%"></td>
+            </tr>
+            <tr>
+                <td>
+                    <table align="center">
+                        <tr>
+                            <td align="center" width="160" height="40" class="button" style="
+                  background-color: #0165ef;
+                  border-radius: 2.5px;
+                  display: block;
+                ">
+                                <a href="{link}" style="
+                    width: 100%;
+                    display: inline-block;
+                    text-decoration: none;
+                    font-weight: medium;
+                    color: #fff;
+                    font-family: Roboto, Helvetica, Arial, san-serif;
+                    font-size: 14px;
+                    text-align: center;
+                    line-height: 40px;
+                  ">Click here to Join</a>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td class="copy" style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: center;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          " 20px!important; align="center">
+                    <br />
+                    If the link has already expired, you can request a new link from your administrator or reach out to
+                    your internal support for more assistance.<br />
+                </td>
+            </tr>
+            <tr>
+                <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="75" width="100%"></td>
+            </tr>
+            <tr>
+                <td class="headline" style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 18px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          " align="center">
+                    Thanks,<br />
+                    Team Hyperswitch
+                </td>
+            </tr>
+            <tr>
+                <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="75" width="100%"></td>
+            </tr>
+            <tr>
+                <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="75" width="100%"></td>
+            </tr>
+        </table>
+    </div>
+</body>
diff --git a/crates/router/src/services/email/assets/magic_link.html b/crates/router/src/services/email/assets/magic_link.html
new file mode 100644
index 000000000000..6439c83f227c
--- /dev/null
+++ b/crates/router/src/services/email/assets/magic_link.html
@@ -0,0 +1,260 @@
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<title>Login to Hyperswitch</title>
+<body style="background-color: #ececec">
+  <style>
+    .apple-footer a {
+       {
+        text-decoration: none !important;
+        color: #999 !important;
+        border: none !important;
+      }
+    }
+    .apple-email a {
+       {
+        text-decoration: none !important;
+        color: #448bff !important;
+        border: none !important;
+      }
+    }
+  </style>
+  <div
+    id="wrapper"
+    style="
+      background-color: none;
+      margin: 0 auto;
+      text-align: center;
+      width: 60%;
+      -premailer-height: 200;
+    "
+  >
+    <table
+      align="center"
+      class="main-table"
+      style="
+        -premailer-cellpadding: 0;
+        -premailer-cellspacing: 0;
+        background-color: #fff;
+        border: 0;
+        border-top: 5px solid #0165ef;
+        margin: 0 auto;
+        mso-table-lspace: 0;
+        mso-table-rspace: 0;
+        padding: 0 40px;
+        text-align: center;
+        width: 100%;
+      "
+      bgcolor="#ffffff"
+      cellpadding="0"
+      cellspacing="0"
+    >
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="25"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="50"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="headline"
+          style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 30px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          "
+          align="center"
+        >
+          Welcome to Hyperswitch!
+          <p style="font-size: 18px">Dear {user_name},</p>
+          <span style="font-size: 18px"
+            >We are thrilled to welcome you into our community!
+          </span>
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-sm"
+          style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="copy"
+          style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: center;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          "
+          20px!important;
+          align="center"
+        >
+          <br />
+          Simply click on the link below, and you'll be granted instant access
+          to your Hyperswitch account. Note that this link expires in 24 hours
+          and can only be used once.<br />
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-sm"
+          style="
+            -premailer-height: 20;
+            -premailer-width: 100%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="20"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td>
+          <table align="center">
+            <tr>
+              <td
+                align="center"
+                width="160"
+                height="40"
+                class="button"
+                style="
+                  background-color: #0165ef;
+                  border-radius: 2.5px;
+                  display: block;
+                "
+              >
+                <a
+                  href="{link}"
+                  style="
+                    width: 100%;
+                    display: inline-block;
+                    text-decoration: none;
+                    font-weight: medium;
+                    color: #fff;
+                    font-family: Roboto, Helvetica, Arial, san-serif;
+                    font-size: 14px;
+                    text-align: center;
+                    line-height: 40px;
+                  "
+                  >Unlock Hyperswitch</a
+                >
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="headline"
+          style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 18px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          "
+          align="center"
+        >
+          Thanks,<br />
+          Team Hyperswitch
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+    </table>
+  </div>
+</body>
diff --git a/crates/router/src/services/email/assets/recon_activated.html b/crates/router/src/services/email/assets/recon_activated.html
new file mode 100644
index 000000000000..7feffacb09df
--- /dev/null
+++ b/crates/router/src/services/email/assets/recon_activated.html
@@ -0,0 +1,309 @@
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<title>Access Granted to HyperSwitch Recon Dashboard!</title>
+
+<body style="background-color: #ececec">
+  <style>
+    <style>
+    .apple-footer a {{
+      text-decoration: none !important;
+      color: #999 !important;
+      border: none !important;
+    }}
+
+    .apple-email a {{
+      text-decoration: none !important;
+      color: #448bff !important;
+      border: none !important;
+    }}
+  </style>
+  </style>
+  <div
+    id="wrapper"
+    style="
+      background-color: none;
+      margin: 0 auto;
+      text-align: center;
+      width: 60%;
+      -premailer-height: 200;
+    "
+  >
+    <table
+      align="center"
+      class="main-table"
+      style="
+        -premailer-cellpadding: 0;
+        -premailer-cellspacing: 0;
+        background-color: #fff;
+        border: 0;
+        border-top: 5px solid #0165ef;
+        margin: 0 auto;
+        mso-table-lspace: 0;
+        mso-table-rspace: 0;
+        padding: 0 40;
+        text-align: center;
+        width: 100%;
+      "
+      bgcolor="#ffffff"
+      cellpadding="0"
+      cellspacing="0"
+    >
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="25"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="50"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="headline"
+          style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 30px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          "
+          align="center"
+        >
+          Access Granted to HyperSwitch Recon Dashboard!
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-sm"
+          style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="copy"
+          style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: left;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          "
+          20px!important;
+          align="left"
+        >
+          <br />
+          Dear {username}<br />
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-sm"
+          style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="copy"
+          style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: left;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          "
+          20px!important;
+          align="left"
+        >
+          <br />
+          We are pleased to inform you that your Reconciliation access request
+          has been approved. As a result, you now have authorized access to the
+          Recon dashboard, allowing you to test its functionality and experience
+          its benefits firsthand.
+          <br />
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-sm"
+          style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="copy"
+          style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: left;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          "
+          20px!important;
+          align="left"
+        >
+          <br />
+          <b>To access the Recon dashboard, please follow these steps </b>
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="copy"
+          style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: left;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          "
+          20px!important;
+          align="left"
+        >
+          <br />
+          <ol type="1">
+            <li>
+              Visit our website at
+              <a href="https://app.hyperswitch.io/">Hyperswitch Dashboard</a>.
+            </li>
+            <li>Click on the "Login" button.</li>
+            <li>Enter your login credentials to log in.</li>
+            <li>
+              Once logged in, you will have full access to the Recon dashboard,
+              where you can explore its comprehensive features.
+            </li>
+          </ol>
+          Should you have any inquiries or require any form of assistance,
+          please do not hesitate to reach out to our team on
+          <a href="https://hyperswitch-io.slack.com/ssb/redirect">Slack </a>,
+          and we will be more than willing to assist you promptly. <br /><br />
+          Wishing you a seamless and successful experience as you explore the
+          capabilities of Hyperswitch.<br />
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="headline"
+          style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 18px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          "
+          align="center"
+        >
+          Thanks,<br />
+          Team Hyperswitch
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+    </table>
+  </div>
+</body>
\ No newline at end of file
diff --git a/crates/router/src/services/email/assets/reset.html b/crates/router/src/services/email/assets/reset.html
new file mode 100644
index 000000000000..98ddf8a7bd16
--- /dev/null
+++ b/crates/router/src/services/email/assets/reset.html
@@ -0,0 +1,229 @@
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<title>Hyperswitch Merchant</title>
+
+<body style="background-color: #ececec">
+  <style>
+    .apple-footer a {{
+      text-decoration: none !important;
+      color: #999 !important;
+      border: none !important;
+    }}
+
+    .apple-email a {{
+      text-decoration: none !important;
+      color: #448bff !important;
+      border: none !important;
+    }}
+  </style>
+  <div id="wrapper" style="
+      background-color: none;
+      margin: 0 auto;
+      text-align: center;
+      width: 60%;
+      -premailer-height: 200;
+    ">
+    <table align="center" class="main-table" style="
+        -premailer-cellpadding: 0;
+        -premailer-cellspacing: 0;
+        background-color: #fff;
+        border: 0;
+        border-top: 5px solid #0165ef;
+        margin: 0 auto;
+        mso-table-lspace: 0;
+        mso-table-rspace: 0;
+        padding: 0 40;
+        text-align: center;
+        width: 100%;
+      " bgcolor="#ffffff" cellpadding="0" cellspacing="0">
+      <tr>
+        <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="75" width="100%"></td>
+      </tr>
+      <tr>
+        <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="25" width="100%"></td>
+      </tr>
+      <tr>
+        <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="50" width="100%"></td>
+      </tr>
+      <tr>
+        <td class="headline" style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 30px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          " align="center">
+          Reset Your Password
+        </td>
+      </tr>
+      <tr>
+        <td class="spacer-sm" style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          " width="100%"></td>
+      </tr>
+      <tr>
+        <td class="copy" style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: center;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          " 20px!important; align="center">
+          <br />
+          Hey {username}<br />
+        </td>
+      </tr>
+      <tr>
+        <td class="spacer-sm" style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          " width="100%"></td>
+      </tr>
+      <tr>
+        <td class="copy" style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: center;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          " 20px!important; align="center">
+          <br />
+          We have received a request to reset your password associated with
+          <br />
+          <span style="font-weight: bold"> username : </span>
+          {username}<br />
+        </td>
+      </tr>
+      <tr>
+        <td class="spacer-sm" style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          " width="100%"></td>
+      </tr>
+      <tr>
+        <td class="copy" style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: center;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          " 20px!important; align="center">
+          <br />
+          Click on the below button to reset your password. <br />
+        </td>
+      </tr>
+      <tr>
+        <td class="spacer-sm" style="
+            -premailer-height: 20;
+            -premailer-width: 100%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          " height="20" width="100%"></td>
+      </tr>
+      <tr>
+        <td>
+          <table align="center">
+            <tr>
+              <td align="center" width="160" height="40" class="button" style="
+                  background-color: #0165ef;
+                  border-radius: 2.5px;
+                  display: block;
+                ">
+                <a href="{link}" style="
+                    width: 100%;
+                    display: inline-block;
+                    text-decoration: none;
+                    font-weight: medium;
+                    color: #fff;
+                    font-family: Roboto, Helvetica, Arial, san-serif;
+                    font-size: 14px;
+                    text-align: center;
+                    line-height: 40px;
+                  ">Reset Password</a>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="75" width="100%"></td>
+      </tr>
+      <tr>
+        <td class="headline" style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 18px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          " align="center">
+          Thanks,<br />
+          Team Hyperswitch
+        </td>
+      </tr>
+      <tr>
+        <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="75" width="100%"></td>
+      </tr>
+      <tr>
+        <td class="spacer-lg" style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          " height="75" width="100%"></td>
+      </tr>
+    </table>
+  </div>
+</body>
diff --git a/crates/router/src/services/email/assets/verify.html b/crates/router/src/services/email/assets/verify.html
new file mode 100644
index 000000000000..47d0e3b5c6d5
--- /dev/null
+++ b/crates/router/src/services/email/assets/verify.html
@@ -0,0 +1,253 @@
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<title>Hyperswitch Merchant</title>
+<body style="background-color: #ececec">
+  <style>
+    .apple-footer a {{
+      text-decoration: none !important;
+      color: #999 !important;
+      border: none !important;
+    }}
+    .apple-email a {{
+      text-decoration: none !important;
+      color: #448bff !important;
+      border: none !important;
+    }}
+  </style>
+  <div
+    id="wrapper"
+    style="
+      background-color: none;
+      margin: 0 auto;
+      text-align: center;
+      width: 60%;
+      -premailer-height: 200;
+    "
+  >
+    <table
+      align="center"
+      class="main-table"
+      style="
+        -premailer-cellpadding: 0;
+        -premailer-cellspacing: 0;
+        background-color: #fff;
+        border: 0;
+        border-top: 5px solid #0165ef;
+        margin: 0 auto;
+        mso-table-lspace: 0;
+        mso-table-rspace: 0;
+        padding: 0 40;
+        text-align: center;
+        width: 100%;
+      "
+      bgcolor="#ffffff"
+      cellpadding="0"
+      cellspacing="0"
+    >
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="25"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="50"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="headline"
+          style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 30px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          "
+          align="center"
+        >
+          Thanks for signing up!<br /><span style="font-size: 18px"
+            >We need a confirmation of your email address to complete your
+            registration.</span
+          >
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-sm"
+          style="
+            -premailer-height: 20;
+            -premailer-width: 80%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="copy"
+          style="
+            color: #666;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 14px;
+            text-align: center;
+            line-height: 20px;
+            margin-top: 20px;
+            padding: 0;
+          "
+          20px!important;
+          align="center"
+        >
+          <br />
+          Click below to confirm your email address. <br />
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-sm"
+          style="
+            -premailer-height: 20;
+            -premailer-width: 100%;
+            line-height: 10px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="20"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td>
+          <table align="center">
+            <tr>
+              <td
+                align="center"
+                width="160"
+                height="40"
+                class="button"
+                style="
+                  background-color: #0165ef;
+                  border-radius: 2.5px;
+                  display: block;
+                "
+              >
+                <a
+                  href="{link}"
+                  style="
+                    width: 100%;
+                    display: inline-block;
+                    text-decoration: none;
+                    font-weight: medium;
+                    color: #fff;
+                    font-family: Roboto, Helvetica, Arial, san-serif;
+                    font-size: 14px;
+                    text-align: center;
+                    line-height: 40px;
+                  "
+                  >Verify Email Now</a
+                >
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="headline"
+          style="
+            color: #444;
+            font-family: Roboto, Helvetica, Arial, san-serif;
+            font-size: 18px;
+            font-weight: 100;
+            line-height: 36px;
+            margin: 0 auto;
+            padding: 0;
+            text-align: center;
+          "
+          align="center"
+        >
+          Thanks,<br />
+          Team Hyperswitch
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+      <tr>
+        <td
+          class="spacer-lg"
+          style="
+            -premailer-height: 75;
+            -premailer-width: 100%;
+            line-height: 30px;
+            margin: 0 auto;
+            padding: 0;
+          "
+          height="75"
+          width="100%"
+        ></td>
+      </tr>
+    </table>
+  </div>
+</body>
diff --git a/crates/router/src/services/email/types.rs b/crates/router/src/services/email/types.rs
new file mode 100644
index 000000000000..8650e1c27c22
--- /dev/null
+++ b/crates/router/src/services/email/types.rs
@@ -0,0 +1,80 @@
+use common_utils::errors::CustomResult;
+use error_stack::ResultExt;
+use external_services::email::{EmailContents, EmailData, EmailError};
+use masking::ExposeInterface;
+
+use crate::{configs, consts};
+#[cfg(feature = "olap")]
+use crate::{core::errors::UserErrors, services::jwt, types::domain::UserEmail};
+
+pub enum EmailBody {
+    Verify { link: String },
+}
+
+pub mod html {
+    use crate::services::email::types::EmailBody;
+
+    pub fn get_html_body(email_body: EmailBody) -> String {
+        match email_body {
+            EmailBody::Verify { link } => {
+                format!(include_str!("assets/verify.html"), link = link)
+            }
+        }
+    }
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+pub struct EmailToken {
+    email: String,
+    expiration: u64,
+}
+
+impl EmailToken {
+    pub async fn new_token(
+        email: UserEmail,
+        settings: &configs::settings::Settings,
+    ) -> CustomResult<String, UserErrors> {
+        let expiration_duration = std::time::Duration::from_secs(consts::EMAIL_TOKEN_TIME_IN_SECS);
+        let expiration = jwt::generate_exp(expiration_duration)?.as_secs();
+        let token_payload = Self {
+            email: email.get_secret().expose(),
+            expiration,
+        };
+        jwt::generate_jwt(&token_payload, settings).await
+    }
+}
+
+pub struct WelcomeEmail {
+    pub recipient_email: UserEmail,
+    pub settings: std::sync::Arc<configs::settings::Settings>,
+}
+
+pub fn get_email_verification_link(
+    base_url: impl std::fmt::Display,
+    token: impl std::fmt::Display,
+) -> String {
+    format!("{base_url}/user/verify_email/?token={token}")
+}
+
+/// Currently only HTML is supported
+#[async_trait::async_trait]
+impl EmailData for WelcomeEmail {
+    async fn get_email_data(&self) -> CustomResult<EmailContents, EmailError> {
+        let token = EmailToken::new_token(self.recipient_email.clone(), &self.settings)
+            .await
+            .change_context(EmailError::TokenGenerationFailure)?;
+
+        let verify_email_link = get_email_verification_link(&self.settings.server.base_url, token);
+
+        let body = html::get_html_body(EmailBody::Verify {
+            link: verify_email_link,
+        });
+        let subject = "Welcome to the Hyperswitch community!".to_string();
+
+        Ok(EmailContents {
+            subject,
+            body: external_services::email::IntermediateString::new(body),
+            recipient: self.recipient_email.clone().into_inner(),
+        })
+    }
+}
diff --git a/crates/router/src/services/kafka.rs b/crates/router/src/services/kafka.rs
new file mode 100644
index 000000000000..497ac16721b5
--- /dev/null
+++ b/crates/router/src/services/kafka.rs
@@ -0,0 +1,314 @@
+use std::sync::Arc;
+
+use common_utils::errors::CustomResult;
+use error_stack::{report, IntoReport, ResultExt};
+use rdkafka::{
+    config::FromClientConfig,
+    producer::{BaseRecord, DefaultProducerContext, Producer, ThreadedProducer},
+};
+
+use crate::events::EventType;
+mod api_event;
+pub mod outgoing_request;
+mod payment_attempt;
+mod payment_intent;
+mod refund;
+pub use api_event::{ApiCallEventType, ApiEvents, ApiEventsType};
+use data_models::payments::{payment_attempt::PaymentAttempt, PaymentIntent};
+use diesel_models::refund::Refund;
+use serde::Serialize;
+use time::OffsetDateTime;
+
+use self::{
+    payment_attempt::KafkaPaymentAttempt, payment_intent::KafkaPaymentIntent, refund::KafkaRefund,
+};
+// Using message queue result here to avoid confusion with Kafka result provided by library
+pub type MQResult<T> = CustomResult<T, KafkaError>;
+
+pub trait KafkaMessage
+where
+    Self: Serialize,
+{
+    fn value(&self) -> MQResult<Vec<u8>> {
+        // Add better error logging here
+        serde_json::to_vec(&self)
+            .into_report()
+            .change_context(KafkaError::GenericError)
+    }
+
+    fn key(&self) -> String;
+
+    fn creation_timestamp(&self) -> Option<i64> {
+        None
+    }
+}
+
+#[derive(serde::Serialize, Debug)]
+struct KafkaEvent<'a, T: KafkaMessage> {
+    #[serde(flatten)]
+    event: &'a T,
+    sign_flag: i32,
+}
+
+impl<'a, T: KafkaMessage> KafkaEvent<'a, T> {
+    fn new(event: &'a T) -> Self {
+        Self {
+            event,
+            sign_flag: 1,
+        }
+    }
+    fn old(event: &'a T) -> Self {
+        Self {
+            event,
+            sign_flag: -1,
+        }
+    }
+}
+
+impl<'a, T: KafkaMessage> KafkaMessage for KafkaEvent<'a, T> {
+    fn key(&self) -> String {
+        self.event.key()
+    }
+
+    fn creation_timestamp(&self) -> Option<i64> {
+        self.event.creation_timestamp()
+    }
+}
+
+#[derive(Debug, serde::Deserialize, Clone, Default)]
+#[serde(default)]
+pub struct KafkaSettings {
+    brokers: Vec<String>,
+    intent_analytics_topic: String,
+    attempt_analytics_topic: String,
+    refund_analytics_topic: String,
+    api_logs_topic: String,
+}
+
+impl KafkaSettings {
+    pub fn validate(&self) -> Result<(), crate::core::errors::ApplicationError> {
+        use common_utils::ext_traits::ConfigExt;
+
+        use crate::core::errors::ApplicationError;
+
+        common_utils::fp_utils::when(self.brokers.is_empty(), || {
+            Err(ApplicationError::InvalidConfigurationValueError(
+                "Kafka brokers must not be empty".into(),
+            ))
+        })?;
+
+        common_utils::fp_utils::when(self.intent_analytics_topic.is_default_or_empty(), || {
+            Err(ApplicationError::InvalidConfigurationValueError(
+                "Kafka Intent Analytics topic must not be empty".into(),
+            ))
+        })?;
+
+        common_utils::fp_utils::when(self.attempt_analytics_topic.is_default_or_empty(), || {
+            Err(ApplicationError::InvalidConfigurationValueError(
+                "Kafka Attempt Analytics topic must not be empty".into(),
+            ))
+        })?;
+
+        common_utils::fp_utils::when(self.refund_analytics_topic.is_default_or_empty(), || {
+            Err(ApplicationError::InvalidConfigurationValueError(
+                "Kafka Refund Analytics topic must not be empty".into(),
+            ))
+        })?;
+
+        common_utils::fp_utils::when(self.api_logs_topic.is_default_or_empty(), || {
+            Err(ApplicationError::InvalidConfigurationValueError(
+                "Kafka API event Analytics topic must not be empty".into(),
+            ))
+        })
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct KafkaProducer {
+    producer: Arc<RdKafkaProducer>,
+    intent_analytics_topic: String,
+    attempt_analytics_topic: String,
+    refund_analytics_topic: String,
+    api_logs_topic: String,
+}
+
+struct RdKafkaProducer(ThreadedProducer<DefaultProducerContext>);
+
+impl std::fmt::Debug for RdKafkaProducer {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str("RdKafkaProducer")
+    }
+}
+
+#[derive(Debug, Clone, thiserror::Error)]
+pub enum KafkaError {
+    #[error("Generic Kafka Error")]
+    GenericError,
+    #[error("Kafka not implemented")]
+    NotImplemented,
+    #[error("Kafka Initialization Error")]
+    InitializationError,
+}
+
+#[allow(unused)]
+impl KafkaProducer {
+    pub async fn create(conf: &KafkaSettings) -> MQResult<Self> {
+        Ok(Self {
+            producer: Arc::new(RdKafkaProducer(
+                ThreadedProducer::from_config(
+                    rdkafka::ClientConfig::new().set("bootstrap.servers", conf.brokers.join(",")),
+                )
+                .into_report()
+                .change_context(KafkaError::InitializationError)?,
+            )),
+
+            intent_analytics_topic: conf.intent_analytics_topic.clone(),
+            attempt_analytics_topic: conf.attempt_analytics_topic.clone(),
+            refund_analytics_topic: conf.refund_analytics_topic.clone(),
+            api_logs_topic: conf.api_logs_topic.clone(),
+        })
+    }
+
+    pub fn log_kafka_event<T: KafkaMessage + std::fmt::Debug>(
+        &self,
+        topic: &str,
+        event: &T,
+    ) -> MQResult<()> {
+        router_env::logger::debug!("Logging Kafka Event {event:?}");
+        self.producer
+            .0
+            .send(
+                BaseRecord::to(topic)
+                    .key(&event.key())
+                    .payload(&event.value()?)
+                    .timestamp(
+                        event
+                            .creation_timestamp()
+                            .unwrap_or_else(|| OffsetDateTime::now_utc().unix_timestamp()),
+                    ),
+            )
+            .map_err(|(error, record)| report!(error).attach_printable(format!("{record:?}")))
+            .change_context(KafkaError::GenericError)
+    }
+
+    pub async fn log_payment_attempt(
+        &self,
+        attempt: &PaymentAttempt,
+        old_attempt: Option<PaymentAttempt>,
+    ) -> MQResult<()> {
+        if let Some(negative_event) = old_attempt {
+            self.log_kafka_event(
+                &self.attempt_analytics_topic,
+                &KafkaEvent::old(&KafkaPaymentAttempt::from_storage(&negative_event)),
+            )
+            .attach_printable_lazy(|| {
+                format!("Failed to add negative attempt event {negative_event:?}")
+            })?;
+        };
+        self.log_kafka_event(
+            &self.attempt_analytics_topic,
+            &KafkaEvent::new(&KafkaPaymentAttempt::from_storage(attempt)),
+        )
+        .attach_printable_lazy(|| format!("Failed to add positive attempt event {attempt:?}"))
+    }
+
+    pub async fn log_payment_attempt_delete(
+        &self,
+        delete_old_attempt: &PaymentAttempt,
+    ) -> MQResult<()> {
+        self.log_kafka_event(
+            &self.attempt_analytics_topic,
+            &KafkaEvent::old(&KafkaPaymentAttempt::from_storage(delete_old_attempt)),
+        )
+        .attach_printable_lazy(|| {
+            format!("Failed to add negative attempt event {delete_old_attempt:?}")
+        })
+    }
+
+    pub async fn log_payment_intent(
+        &self,
+        intent: &PaymentIntent,
+        old_intent: Option<PaymentIntent>,
+    ) -> MQResult<()> {
+        if let Some(negative_event) = old_intent {
+            self.log_kafka_event(
+                &self.intent_analytics_topic,
+                &KafkaEvent::old(&KafkaPaymentIntent::from_storage(&negative_event)),
+            )
+            .attach_printable_lazy(|| {
+                format!("Failed to add negative intent event {negative_event:?}")
+            })?;
+        };
+        self.log_kafka_event(
+            &self.intent_analytics_topic,
+            &KafkaEvent::new(&KafkaPaymentIntent::from_storage(intent)),
+        )
+        .attach_printable_lazy(|| format!("Failed to add positive intent event {intent:?}"))
+    }
+
+    pub async fn log_payment_intent_delete(
+        &self,
+        delete_old_intent: &PaymentIntent,
+    ) -> MQResult<()> {
+        self.log_kafka_event(
+            &self.intent_analytics_topic,
+            &KafkaEvent::old(&KafkaPaymentIntent::from_storage(delete_old_intent)),
+        )
+        .attach_printable_lazy(|| {
+            format!("Failed to add negative intent event {delete_old_intent:?}")
+        })
+    }
+
+    pub async fn log_refund(&self, refund: &Refund, old_refund: Option<Refund>) -> MQResult<()> {
+        if let Some(negative_event) = old_refund {
+            self.log_kafka_event(
+                &self.refund_analytics_topic,
+                &KafkaEvent::old(&KafkaRefund::from_storage(&negative_event)),
+            )
+            .attach_printable_lazy(|| {
+                format!("Failed to add negative refund event {negative_event:?}")
+            })?;
+        };
+        self.log_kafka_event(
+            &self.refund_analytics_topic,
+            &KafkaEvent::new(&KafkaRefund::from_storage(refund)),
+        )
+        .attach_printable_lazy(|| format!("Failed to add positive refund event {refund:?}"))
+    }
+
+    pub async fn log_refund_delete(&self, delete_old_refund: &Refund) -> MQResult<()> {
+        self.log_kafka_event(
+            &self.refund_analytics_topic,
+            &KafkaEvent::old(&KafkaRefund::from_storage(delete_old_refund)),
+        )
+        .attach_printable_lazy(|| {
+            format!("Failed to add negative refund event {delete_old_refund:?}")
+        })
+    }
+
+    pub async fn log_api_event(&self, event: &ApiEvents) -> MQResult<()> {
+        self.log_kafka_event(&self.api_logs_topic, event)
+            .attach_printable_lazy(|| format!("Failed to add api log event {event:?}"))
+    }
+
+    pub fn get_topic(&self, event: EventType) -> &str {
+        match event {
+            EventType::ApiLogs => &self.api_logs_topic,
+            EventType::PaymentAttempt => &self.attempt_analytics_topic,
+            EventType::PaymentIntent => &self.intent_analytics_topic,
+            EventType::Refund => &self.refund_analytics_topic,
+        }
+    }
+}
+
+impl Drop for RdKafkaProducer {
+    fn drop(&mut self) {
+        // Flush the producer to send any pending messages
+        match self.0.flush(rdkafka::util::Timeout::After(
+            std::time::Duration::from_secs(5),
+        )) {
+            Ok(_) => router_env::logger::info!("Kafka events flush Successful"),
+            Err(error) => router_env::logger::error!("Failed to flush Kafka Events {error:?}"),
+        }
+    }
+}
diff --git a/crates/router/src/services/kafka/api_event.rs b/crates/router/src/services/kafka/api_event.rs
new file mode 100644
index 000000000000..7de271915927
--- /dev/null
+++ b/crates/router/src/services/kafka/api_event.rs
@@ -0,0 +1,108 @@
+use api_models::enums as api_enums;
+use serde::{Deserialize, Serialize};
+use time::OffsetDateTime;
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "flow_type")]
+pub enum ApiEventsType {
+    Payment {
+        payment_id: String,
+    },
+    Refund {
+        payment_id: String,
+        refund_id: String,
+    },
+    Default,
+    PaymentMethod {
+        payment_method_id: String,
+        payment_method: Option<api_enums::PaymentMethod>,
+        payment_method_type: Option<api_enums::PaymentMethodType>,
+    },
+    Customer {
+        customer_id: String,
+    },
+    User {
+        //specified merchant_id will overridden on global defined
+        merchant_id: String,
+        user_id: String,
+    },
+    Webhooks {
+        connector: String,
+        payment_id: Option<String>,
+    },
+    OutgoingEvent,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub struct ApiEvents {
+    pub api_name: String,
+    pub request_id: Option<String>,
+    //It is require to solve ambiquity in case of event_type is User
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub merchant_id: Option<String>,
+    pub request: String,
+    pub response: String,
+    pub status_code: u16,
+    #[serde(with = "time::serde::timestamp")]
+    pub created_at: OffsetDateTime,
+    pub latency: u128,
+    //conflicting fields underlying enums will be used
+    #[serde(flatten)]
+    pub event_type: ApiEventsType,
+    pub user_agent: Option<String>,
+    pub ip_addr: Option<String>,
+    pub url_path: Option<String>,
+    pub api_event_type: Option<ApiCallEventType>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub enum ApiCallEventType {
+    IncomingApiEvent,
+    OutgoingApiEvent,
+}
+
+impl super::KafkaMessage for ApiEvents {
+    fn key(&self) -> String {
+        match &self.event_type {
+            ApiEventsType::Payment { payment_id } => format!(
+                "{}_{}",
+                self.merchant_id
+                    .as_ref()
+                    .unwrap_or(&"default_merchant_id".to_string()),
+                payment_id
+            ),
+            ApiEventsType::Refund {
+                payment_id,
+                refund_id,
+            } => format!("{payment_id}_{refund_id}"),
+            ApiEventsType::Default => "key".to_string(),
+            ApiEventsType::PaymentMethod {
+                payment_method_id,
+                payment_method,
+                payment_method_type,
+            } => format!(
+                "{:?}_{:?}_{:?}",
+                payment_method_id.clone(),
+                payment_method.clone(),
+                payment_method_type.clone(),
+            ),
+            ApiEventsType::Customer { customer_id } => customer_id.to_string(),
+            ApiEventsType::User {
+                merchant_id,
+                user_id,
+            } => format!("{}_{}", merchant_id, user_id),
+            ApiEventsType::Webhooks {
+                connector,
+                payment_id,
+            } => format!(
+                "webhook_{}_{connector}",
+                payment_id.clone().unwrap_or_default()
+            ),
+            ApiEventsType::OutgoingEvent => "outgoing_event".to_string(),
+        }
+    }
+
+    fn creation_timestamp(&self) -> Option<i64> {
+        Some(self.created_at.unix_timestamp())
+    }
+}
diff --git a/crates/router/src/services/kafka/outgoing_request.rs b/crates/router/src/services/kafka/outgoing_request.rs
new file mode 100644
index 000000000000..bb09fe91fe6d
--- /dev/null
+++ b/crates/router/src/services/kafka/outgoing_request.rs
@@ -0,0 +1,19 @@
+use reqwest::Url;
+
+pub struct OutgoingRequest {
+    pub url: Url,
+    pub latency: u128,
+}
+
+// impl super::KafkaMessage for OutgoingRequest {
+//     fn key(&self) -> String {
+//         format!(
+//             "{}_{}",
+
+//         )
+//     }
+
+//     fn creation_timestamp(&self) -> Option<i64> {
+//         Some(self.created_at.unix_timestamp())
+//     }
+// }
diff --git a/crates/router/src/services/kafka/payment_attempt.rs b/crates/router/src/services/kafka/payment_attempt.rs
new file mode 100644
index 000000000000..ea0721f418e5
--- /dev/null
+++ b/crates/router/src/services/kafka/payment_attempt.rs
@@ -0,0 +1,92 @@
+use data_models::payments::payment_attempt::PaymentAttempt;
+use diesel_models::enums as storage_enums;
+use time::OffsetDateTime;
+
+#[derive(serde::Serialize, Debug)]
+pub struct KafkaPaymentAttempt<'a> {
+    pub payment_id: &'a String,
+    pub merchant_id: &'a String,
+    pub attempt_id: &'a String,
+    pub status: storage_enums::AttemptStatus,
+    pub amount: i64,
+    pub currency: Option<storage_enums::Currency>,
+    pub save_to_locker: Option<bool>,
+    pub connector: Option<&'a String>,
+    pub error_message: Option<&'a String>,
+    pub offer_amount: Option<i64>,
+    pub surcharge_amount: Option<i64>,
+    pub tax_amount: Option<i64>,
+    pub payment_method_id: Option<&'a String>,
+    pub payment_method: Option<storage_enums::PaymentMethod>,
+    pub connector_transaction_id: Option<&'a String>,
+    pub capture_method: Option<storage_enums::CaptureMethod>,
+    #[serde(default, with = "time::serde::timestamp::option")]
+    pub capture_on: Option<OffsetDateTime>,
+    pub confirm: bool,
+    pub authentication_type: Option<storage_enums::AuthenticationType>,
+    #[serde(with = "time::serde::timestamp")]
+    pub created_at: OffsetDateTime,
+    #[serde(with = "time::serde::timestamp")]
+    pub modified_at: OffsetDateTime,
+    #[serde(default, with = "time::serde::timestamp::option")]
+    pub last_synced: Option<OffsetDateTime>,
+    pub cancellation_reason: Option<&'a String>,
+    pub amount_to_capture: Option<i64>,
+    pub mandate_id: Option<&'a String>,
+    pub browser_info: Option<String>,
+    pub error_code: Option<&'a String>,
+    pub connector_metadata: Option<String>,
+    // TODO: These types should implement copy ideally
+    pub payment_experience: Option<&'a storage_enums::PaymentExperience>,
+    pub payment_method_type: Option<&'a storage_enums::PaymentMethodType>,
+}
+
+impl<'a> KafkaPaymentAttempt<'a> {
+    pub fn from_storage(attempt: &'a PaymentAttempt) -> Self {
+        Self {
+            payment_id: &attempt.payment_id,
+            merchant_id: &attempt.merchant_id,
+            attempt_id: &attempt.attempt_id,
+            status: attempt.status,
+            amount: attempt.amount,
+            currency: attempt.currency,
+            save_to_locker: attempt.save_to_locker,
+            connector: attempt.connector.as_ref(),
+            error_message: attempt.error_message.as_ref(),
+            offer_amount: attempt.offer_amount,
+            surcharge_amount: attempt.surcharge_amount,
+            tax_amount: attempt.tax_amount,
+            payment_method_id: attempt.payment_method_id.as_ref(),
+            payment_method: attempt.payment_method,
+            connector_transaction_id: attempt.connector_transaction_id.as_ref(),
+            capture_method: attempt.capture_method,
+            capture_on: attempt.capture_on.map(|i| i.assume_utc()),
+            confirm: attempt.confirm,
+            authentication_type: attempt.authentication_type,
+            created_at: attempt.created_at.assume_utc(),
+            modified_at: attempt.modified_at.assume_utc(),
+            last_synced: attempt.last_synced.map(|i| i.assume_utc()),
+            cancellation_reason: attempt.cancellation_reason.as_ref(),
+            amount_to_capture: attempt.amount_to_capture,
+            mandate_id: attempt.mandate_id.as_ref(),
+            browser_info: attempt.browser_info.as_ref().map(|v| v.to_string()),
+            error_code: attempt.error_code.as_ref(),
+            connector_metadata: attempt.connector_metadata.as_ref().map(|v| v.to_string()),
+            payment_experience: attempt.payment_experience.as_ref(),
+            payment_method_type: attempt.payment_method_type.as_ref(),
+        }
+    }
+}
+
+impl<'a> super::KafkaMessage for KafkaPaymentAttempt<'a> {
+    fn key(&self) -> String {
+        format!(
+            "{}_{}_{}",
+            self.merchant_id, self.payment_id, self.attempt_id
+        )
+    }
+
+    fn creation_timestamp(&self) -> Option<i64> {
+        Some(self.modified_at.unix_timestamp())
+    }
+}
diff --git a/crates/router/src/services/kafka/payment_intent.rs b/crates/router/src/services/kafka/payment_intent.rs
new file mode 100644
index 000000000000..70980a6e8652
--- /dev/null
+++ b/crates/router/src/services/kafka/payment_intent.rs
@@ -0,0 +1,71 @@
+use data_models::payments::PaymentIntent;
+use diesel_models::enums as storage_enums;
+use time::OffsetDateTime;
+
+#[derive(serde::Serialize, Debug)]
+pub struct KafkaPaymentIntent<'a> {
+    pub payment_id: &'a String,
+    pub merchant_id: &'a String,
+    pub status: storage_enums::IntentStatus,
+    pub amount: i64,
+    pub currency: Option<storage_enums::Currency>,
+    pub amount_captured: Option<i64>,
+    pub customer_id: Option<&'a String>,
+    pub description: Option<&'a String>,
+    pub return_url: Option<&'a String>,
+    pub connector_id: Option<&'a String>,
+    pub statement_descriptor_name: Option<&'a String>,
+    pub statement_descriptor_suffix: Option<&'a String>,
+    #[serde(with = "time::serde::timestamp")]
+    pub created_at: OffsetDateTime,
+    #[serde(with = "time::serde::timestamp")]
+    pub modified_at: OffsetDateTime,
+    #[serde(default, with = "time::serde::timestamp::option")]
+    pub last_synced: Option<OffsetDateTime>,
+    pub setup_future_usage: Option<storage_enums::FutureUsage>,
+    pub off_session: Option<bool>,
+    pub client_secret: Option<&'a String>,
+    pub active_attempt_id: String,
+    pub business_country: Option<storage_enums::CountryAlpha2>,
+    pub business_label: Option<&'a String>,
+    pub attempt_count: i16,
+}
+
+impl<'a> KafkaPaymentIntent<'a> {
+    pub fn from_storage(intent: &'a PaymentIntent) -> Self {
+        Self {
+            payment_id: &intent.payment_id,
+            merchant_id: &intent.merchant_id,
+            status: intent.status,
+            amount: intent.amount,
+            currency: intent.currency,
+            amount_captured: intent.amount_captured,
+            customer_id: intent.customer_id.as_ref(),
+            description: intent.description.as_ref(),
+            return_url: intent.return_url.as_ref(),
+            connector_id: intent.connector_id.as_ref(),
+            statement_descriptor_name: intent.statement_descriptor_name.as_ref(),
+            statement_descriptor_suffix: intent.statement_descriptor_suffix.as_ref(),
+            created_at: intent.created_at.assume_utc(),
+            modified_at: intent.modified_at.assume_utc(),
+            last_synced: intent.last_synced.map(|i| i.assume_utc()),
+            setup_future_usage: intent.setup_future_usage,
+            off_session: intent.off_session,
+            client_secret: intent.client_secret.as_ref(),
+            active_attempt_id: intent.active_attempt.get_id(),
+            business_country: intent.business_country,
+            business_label: intent.business_label.as_ref(),
+            attempt_count: intent.attempt_count,
+        }
+    }
+}
+
+impl<'a> super::KafkaMessage for KafkaPaymentIntent<'a> {
+    fn key(&self) -> String {
+        format!("{}_{}", self.merchant_id, self.payment_id)
+    }
+
+    fn creation_timestamp(&self) -> Option<i64> {
+        Some(self.modified_at.unix_timestamp())
+    }
+}
diff --git a/crates/router/src/services/kafka/refund.rs b/crates/router/src/services/kafka/refund.rs
new file mode 100644
index 000000000000..0cc4865e7512
--- /dev/null
+++ b/crates/router/src/services/kafka/refund.rs
@@ -0,0 +1,68 @@
+use diesel_models::{enums as storage_enums, refund::Refund};
+use time::OffsetDateTime;
+
+#[derive(serde::Serialize, Debug)]
+pub struct KafkaRefund<'a> {
+    pub internal_reference_id: &'a String,
+    pub refund_id: &'a String, //merchant_reference id
+    pub payment_id: &'a String,
+    pub merchant_id: &'a String,
+    pub connector_transaction_id: &'a String,
+    pub connector: &'a String,
+    pub connector_refund_id: Option<&'a String>,
+    pub external_reference_id: Option<&'a String>,
+    pub refund_type: &'a storage_enums::RefundType,
+    pub total_amount: &'a i64,
+    pub currency: &'a storage_enums::Currency,
+    pub refund_amount: &'a i64,
+    pub refund_status: &'a storage_enums::RefundStatus,
+    pub sent_to_gateway: &'a bool,
+    pub refund_error_message: Option<&'a String>,
+    pub refund_arn: Option<&'a String>,
+    #[serde(default, with = "time::serde::timestamp")]
+    pub created_at: OffsetDateTime,
+    #[serde(default, with = "time::serde::timestamp")]
+    pub modified_at: OffsetDateTime,
+    pub description: Option<&'a String>,
+    pub attempt_id: &'a String,
+    pub refund_reason: Option<&'a String>,
+    pub refund_error_code: Option<&'a String>,
+}
+
+impl<'a> KafkaRefund<'a> {
+    pub fn from_storage(refund: &'a Refund) -> Self {
+        Self {
+            internal_reference_id: &refund.internal_reference_id,
+            refund_id: &refund.refund_id,
+            payment_id: &refund.payment_id,
+            merchant_id: &refund.merchant_id,
+            connector_transaction_id: &refund.connector_transaction_id,
+            connector: &refund.connector,
+            connector_refund_id: refund.connector_refund_id.as_ref(),
+            external_reference_id: refund.external_reference_id.as_ref(),
+            refund_type: &refund.refund_type,
+            total_amount: &refund.total_amount,
+            currency: &refund.currency,
+            refund_amount: &refund.refund_amount,
+            refund_status: &refund.refund_status,
+            sent_to_gateway: &refund.sent_to_gateway,
+            refund_error_message: refund.refund_error_message.as_ref(),
+            refund_arn: refund.refund_arn.as_ref(),
+            created_at: refund.created_at.assume_utc(),
+            modified_at: refund.updated_at.assume_utc(),
+            description: refund.description.as_ref(),
+            attempt_id: &refund.attempt_id,
+            refund_reason: refund.refund_reason.as_ref(),
+            refund_error_code: refund.refund_error_code.as_ref(),
+        }
+    }
+}
+
+impl<'a> super::KafkaMessage for KafkaRefund<'a> {
+    fn key(&self) -> String {
+        format!(
+            "{}_{}_{}_{}",
+            self.merchant_id, self.payment_id, self.attempt_id, self.refund_id
+        )
+    }
+}
diff --git a/crates/router/src/types.rs b/crates/router/src/types.rs
index 8c9d030965c9..c267a54cc57b 100644
--- a/crates/router/src/types.rs
+++ b/crates/router/src/types.rs
@@ -33,7 +33,7 @@ use crate::{
         payments::{PaymentData, RecurringMandatePaymentData},
     },
     services,
-    types::storage::payment_attempt::PaymentAttemptExt,
+    types::{storage::payment_attempt::PaymentAttemptExt, transformers::ForeignFrom},
     utils::OptionExt,
 };
 
@@ -323,7 +323,7 @@ pub struct ApplePayCryptogramData {
 #[derive(Debug, Clone)]
 pub struct PaymentMethodBalance {
     pub amount: i64,
-    pub currency: String,
+    pub currency: storage_enums::Currency,
 }
 
 #[cfg(feature = "payouts")]
@@ -381,6 +381,7 @@ pub struct PaymentsAuthorizeData {
     pub payment_method_type: Option<storage_enums::PaymentMethodType>,
     pub surcharge_details: Option<api_models::payment_methods::SurchargeDetailsResponse>,
     pub customer_id: Option<String>,
+    pub request_incremental_authorization: bool,
 }
 
 #[derive(Debug, Clone, Default)]
@@ -442,6 +443,7 @@ pub struct PaymentsPreProcessingData {
     pub complete_authorize_url: Option<String>,
     pub surcharge_details: Option<api_models::payment_methods::SurchargeDetailsResponse>,
     pub browser_info: Option<BrowserInformation>,
+    pub connector_transaction_id: Option<String>,
 }
 
 #[derive(Debug, Clone)]
@@ -535,6 +537,7 @@ pub struct SetupMandateRequestData {
     pub email: Option<Email>,
     pub return_url: Option<String>,
     pub payment_method_type: Option<storage_enums::PaymentMethodType>,
+    pub request_incremental_authorization: bool,
 }
 
 #[derive(Debug, Clone)]
@@ -668,6 +671,7 @@ pub enum PaymentsResponseData {
         connector_metadata: Option<serde_json::Value>,
         network_txn_id: Option<String>,
         connector_response_reference_id: Option<String>,
+        incremental_authorization_allowed: Option<bool>,
     },
     MultipleCaptureResponse {
         // pending_capture_id_list: Vec<String>,
@@ -941,6 +945,78 @@ pub enum ConnectorAuthType {
     NoKey,
 }
 
+impl From<api_models::admin::ConnectorAuthType> for ConnectorAuthType {
+    fn from(value: api_models::admin::ConnectorAuthType) -> Self {
+        match value {
+            api_models::admin::ConnectorAuthType::TemporaryAuth => Self::TemporaryAuth,
+            api_models::admin::ConnectorAuthType::HeaderKey { api_key } => {
+                Self::HeaderKey { api_key }
+            }
+            api_models::admin::ConnectorAuthType::BodyKey { api_key, key1 } => {
+                Self::BodyKey { api_key, key1 }
+            }
+            api_models::admin::ConnectorAuthType::SignatureKey {
+                api_key,
+                key1,
+                api_secret,
+            } => Self::SignatureKey {
+                api_key,
+                key1,
+                api_secret,
+            },
+            api_models::admin::ConnectorAuthType::MultiAuthKey {
+                api_key,
+                key1,
+                api_secret,
+                key2,
+            } => Self::MultiAuthKey {
+                api_key,
+                key1,
+                api_secret,
+                key2,
+            },
+            api_models::admin::ConnectorAuthType::CurrencyAuthKey { auth_key_map } => {
+                Self::CurrencyAuthKey { auth_key_map }
+            }
+            api_models::admin::ConnectorAuthType::NoKey => Self::NoKey,
+        }
+    }
+}
+
+impl ForeignFrom<ConnectorAuthType> for api_models::admin::ConnectorAuthType {
+    fn foreign_from(from: ConnectorAuthType) -> Self {
+        match from {
+            ConnectorAuthType::TemporaryAuth => Self::TemporaryAuth,
+            ConnectorAuthType::HeaderKey { api_key } => Self::HeaderKey { api_key },
+            ConnectorAuthType::BodyKey { api_key, key1 } => Self::BodyKey { api_key, key1 },
+            ConnectorAuthType::SignatureKey {
+                api_key,
+                key1,
+                api_secret,
+            } => Self::SignatureKey {
+                api_key,
+                key1,
+                api_secret,
+            },
+            ConnectorAuthType::MultiAuthKey {
+                api_key,
+                key1,
+                api_secret,
+                key2,
+            } => Self::MultiAuthKey {
+                api_key,
+                key1,
+                api_secret,
+                key2,
+            },
+            ConnectorAuthType::CurrencyAuthKey { auth_key_map } => {
+                Self::CurrencyAuthKey { auth_key_map }
+            }
+            ConnectorAuthType::NoKey => Self::NoKey,
+        }
+    }
+}
+
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct ConnectorsList {
     pub connectors: Vec<String>,
@@ -1127,6 +1203,7 @@ impl From<&SetupMandateRouterData> for PaymentsAuthorizeData {
             payment_method_type: None,
             customer_id: None,
             surcharge_details: None,
+            request_incremental_authorization: data.request.request_incremental_authorization,
         }
     }
 }
diff --git a/crates/router/src/types/api.rs b/crates/router/src/types/api.rs
index bcb3a9add553..96bcaca3ed5d 100644
--- a/crates/router/src/types/api.rs
+++ b/crates/router/src/types/api.rs
@@ -13,6 +13,8 @@ pub mod payments;
 pub mod payouts;
 pub mod refunds;
 pub mod routing;
+#[cfg(feature = "olap")]
+pub mod verify_connector;
 pub mod webhooks;
 
 use std::{fmt::Debug, str::FromStr};
diff --git a/crates/router/src/types/api/admin.rs b/crates/router/src/types/api/admin.rs
index 9f06a5cebbd0..57b9b51de84d 100644
--- a/crates/router/src/types/api/admin.rs
+++ b/crates/router/src/types/api/admin.rs
@@ -137,9 +137,10 @@ impl ForeignTryFrom<(domain::MerchantAccount, BusinessProfileCreate)>
                 .unwrap_or(merchant_account.redirect_to_merchant_with_http_post),
             webhook_details: webhook_details.or(merchant_account.webhook_details),
             metadata: request.metadata,
-            routing_algorithm: request
-                .routing_algorithm
-                .or(merchant_account.routing_algorithm),
+            routing_algorithm: Some(serde_json::json!({
+                "algorithm_id": null,
+                "timestamp": 0
+            })),
             intent_fulfillment_time: request
                 .intent_fulfillment_time
                 .map(i64::from)
diff --git a/crates/router/src/types/api/verify_connector.rs b/crates/router/src/types/api/verify_connector.rs
new file mode 100644
index 000000000000..74b15f911b9a
--- /dev/null
+++ b/crates/router/src/types/api/verify_connector.rs
@@ -0,0 +1,182 @@
+pub mod paypal;
+pub mod stripe;
+
+use error_stack::{IntoReport, ResultExt};
+
+use crate::{
+    consts,
+    core::errors,
+    services,
+    services::ConnectorIntegration,
+    types::{self, api, storage::enums as storage_enums},
+    AppState,
+};
+
+#[derive(Clone, Debug)]
+pub struct VerifyConnectorData {
+    pub connector: &'static (dyn types::api::Connector + Sync),
+    pub connector_auth: types::ConnectorAuthType,
+    pub card_details: api::Card,
+}
+
+impl VerifyConnectorData {
+    fn get_payment_authorize_data(&self) -> types::PaymentsAuthorizeData {
+        types::PaymentsAuthorizeData {
+            payment_method_data: api::PaymentMethodData::Card(self.card_details.clone()),
+            email: None,
+            amount: 1000,
+            confirm: true,
+            currency: storage_enums::Currency::USD,
+            mandate_id: None,
+            webhook_url: None,
+            customer_id: None,
+            off_session: None,
+            browser_info: None,
+            session_token: None,
+            order_details: None,
+            order_category: None,
+            capture_method: None,
+            enrolled_for_3ds: false,
+            router_return_url: None,
+            surcharge_details: None,
+            setup_future_usage: None,
+            payment_experience: None,
+            payment_method_type: None,
+            statement_descriptor: None,
+            setup_mandate_details: None,
+            complete_authorize_url: None,
+            related_transaction_id: None,
+            statement_descriptor_suffix: None,
+            request_incremental_authorization: false,
+        }
+    }
+
+    fn get_router_data<F, R1, R2>(
+        &self,
+        request_data: R1,
+        access_token: Option<types::AccessToken>,
+    ) -> types::RouterData<F, R1, R2> {
+        let attempt_id =
+            common_utils::generate_id_with_default_len(consts::VERIFY_CONNECTOR_ID_PREFIX);
+        types::RouterData {
+            flow: std::marker::PhantomData,
+            status: storage_enums::AttemptStatus::Started,
+            request: request_data,
+            response: Err(errors::ApiErrorResponse::InternalServerError.into()),
+            connector: self.connector.id().to_string(),
+            auth_type: storage_enums::AuthenticationType::NoThreeDs,
+            test_mode: None,
+            return_url: None,
+            attempt_id: attempt_id.clone(),
+            description: None,
+            customer_id: None,
+            merchant_id: consts::VERIFY_CONNECTOR_MERCHANT_ID.to_string(),
+            reference_id: None,
+            access_token,
+            session_token: None,
+            payment_method: storage_enums::PaymentMethod::Card,
+            amount_captured: None,
+            preprocessing_id: None,
+            payment_method_id: None,
+            connector_customer: None,
+            connector_auth_type: self.connector_auth.clone(),
+            connector_meta_data: None,
+            payment_method_token: None,
+            connector_api_version: None,
+            recurring_mandate_payment_data: None,
+            connector_request_reference_id: attempt_id,
+            address: types::PaymentAddress {
+                shipping: None,
+                billing: None,
+            },
+            payment_id: common_utils::generate_id_with_default_len(
+                consts::VERIFY_CONNECTOR_ID_PREFIX,
+            ),
+            #[cfg(feature = "payouts")]
+            payout_method_data: None,
+            #[cfg(feature = "payouts")]
+            quote_id: None,
+            payment_method_balance: None,
+            connector_http_status_code: None,
+            external_latency: None,
+            apple_pay_flow: None,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+pub trait VerifyConnector {
+    async fn verify(
+        state: &AppState,
+        connector_data: VerifyConnectorData,
+    ) -> errors::RouterResponse<()> {
+        let authorize_data = connector_data.get_payment_authorize_data();
+        let access_token = Self::get_access_token(state, connector_data.clone()).await?;
+        let router_data = connector_data.get_router_data(authorize_data, access_token);
+
+        let request = connector_data
+            .connector
+            .build_request(&router_data, &state.conf.connectors)
+            .change_context(errors::ApiErrorResponse::InvalidRequestData {
+                message: "Payment request cannot be built".to_string(),
+            })?
+            .ok_or(errors::ApiErrorResponse::InternalServerError)?;
+
+        let response = services::call_connector_api(&state.to_owned(), request)
+            .await
+            .change_context(errors::ApiErrorResponse::InternalServerError)?;
+
+        match response {
+            Ok(_) => Ok(services::ApplicationResponse::StatusOk),
+            Err(error_response) => {
+                Self::handle_payment_error_response::<
+                    api::Authorize,
+                    types::PaymentsAuthorizeData,
+                    types::PaymentsResponseData,
+                >(connector_data.connector, error_response)
+                .await
+            }
+        }
+    }
+
+    async fn get_access_token(
+        _state: &AppState,
+        _connector_data: VerifyConnectorData,
+    ) -> errors::CustomResult<Option<types::AccessToken>, errors::ApiErrorResponse> {
+        // AccessToken is None for the connectors without the AccessToken Flow.
+        // If a connector has that, then it should override this implementation.
+        Ok(None)
+    }
+
+    async fn handle_payment_error_response<F, R1, R2>(
+        connector: &(dyn types::api::Connector + Sync),
+        error_response: types::Response,
+    ) -> errors::RouterResponse<()>
+    where
+        dyn types::api::Connector + Sync: ConnectorIntegration<F, R1, R2>,
+    {
+        let error = connector
+            .get_error_response(error_response)
+            .change_context(errors::ApiErrorResponse::InternalServerError)?;
+        Err(errors::ApiErrorResponse::InvalidRequestData {
+            message: error.reason.unwrap_or(error.message),
+        })
+        .into_report()
+    }
+
+    async fn handle_access_token_error_response<F, R1, R2>(
+        connector: &(dyn types::api::Connector + Sync),
+        error_response: types::Response,
+    ) -> errors::RouterResult<Option<types::AccessToken>>
+    where
+        dyn types::api::Connector + Sync: ConnectorIntegration<F, R1, R2>,
+    {
+        let error = connector
+            .get_error_response(error_response)
+            .change_context(errors::ApiErrorResponse::InternalServerError)?;
+        Err(errors::ApiErrorResponse::InvalidRequestData {
+            message: error.reason.unwrap_or(error.message),
+        })
+        .into_report()
+    }
+}
diff --git a/crates/router/src/types/api/verify_connector/paypal.rs b/crates/router/src/types/api/verify_connector/paypal.rs
new file mode 100644
index 000000000000..33e848f909df
--- /dev/null
+++ b/crates/router/src/types/api/verify_connector/paypal.rs
@@ -0,0 +1,54 @@
+use error_stack::ResultExt;
+
+use super::{VerifyConnector, VerifyConnectorData};
+use crate::{
+    connector,
+    core::errors,
+    routes::AppState,
+    services,
+    types::{self, api},
+};
+
+#[async_trait::async_trait]
+impl VerifyConnector for connector::Paypal {
+    async fn get_access_token(
+        state: &AppState,
+        connector_data: VerifyConnectorData,
+    ) -> errors::CustomResult<Option<types::AccessToken>, errors::ApiErrorResponse> {
+        let token_data: types::AccessTokenRequestData =
+            connector_data.connector_auth.clone().try_into()?;
+        let router_data = connector_data.get_router_data(token_data, None);
+
+        let request = connector_data
+            .connector
+            .build_request(&router_data, &state.conf.connectors)
+            .change_context(errors::ApiErrorResponse::InvalidRequestData {
+                message: "Payment request cannot be built".to_string(),
+            })?
+            .ok_or(errors::ApiErrorResponse::InternalServerError)?;
+
+        let response = services::call_connector_api(&state.to_owned(), request)
+            .await
+            .change_context(errors::ApiErrorResponse::InternalServerError)?;
+
+        match response {
+            Ok(res) => Some(
+                connector_data
+                    .connector
+                    .handle_response(&router_data, res)
+                    .change_context(errors::ApiErrorResponse::InternalServerError)?
+                    .response
+                    .map_err(|_| errors::ApiErrorResponse::InternalServerError.into()),
+            )
+            .transpose(),
+            Err(response_data) => {
+                Self::handle_access_token_error_response::<
+                    api::AccessTokenAuth,
+                    types::AccessTokenRequestData,
+                    types::AccessToken,
+                >(connector_data.connector, response_data)
+                .await
+            }
+        }
+    }
+}
diff --git a/crates/router/src/types/api/verify_connector/stripe.rs b/crates/router/src/types/api/verify_connector/stripe.rs
new file mode 100644
index 000000000000..ece9fa15a1d9
--- /dev/null
+++ b/crates/router/src/types/api/verify_connector/stripe.rs
@@ -0,0 +1,36 @@
+use error_stack::{IntoReport, ResultExt};
+use router_env::env;
+
+use super::VerifyConnector;
+use crate::{
+    connector,
+    core::errors,
+    services::{self, ConnectorIntegration},
+    types,
+};
+
+#[async_trait::async_trait]
+impl VerifyConnector for connector::Stripe {
+    async fn handle_payment_error_response<F, R1, R2>(
+        connector: &(dyn types::api::Connector + Sync),
+        error_response: types::Response,
+    ) -> errors::RouterResponse<()>
+    where
+        dyn types::api::Connector + Sync: ConnectorIntegration<F, R1, R2>,
+    {
+        let error = connector
+            .get_error_response(error_response)
+            .change_context(errors::ApiErrorResponse::InternalServerError)?;
+        match (env::which(), error.code.as_str()) {
+            // In situations where an attempt is made to process a payment using a
+            // Stripe production key along with a test card (which verify_connector is using),
+            // Stripe will respond with a "card_declined" error. In production,
+            // when this scenario occurs we will send back an "Ok" response.
+            (env::Env::Production, "card_declined") => Ok(services::ApplicationResponse::StatusOk),
+            _ => Err(errors::ApiErrorResponse::InvalidRequestData {
+                message: error.reason.unwrap_or(error.message),
+            })
+            .into_report(),
+        }
+    }
+}
diff --git a/crates/router/src/types/domain/user.rs b/crates/router/src/types/domain/user.rs
index 3febd779da08..d2f3e55e4417 100644
--- a/crates/router/src/types/domain/user.rs
+++ b/crates/router/src/types/domain/user.rs
@@ -27,6 +27,8 @@ use crate::{
     utils::user::password,
 };
 
+pub mod dashboard_metadata;
+
 #[derive(Clone)]
 pub struct UserName(Secret<String>);
 
diff --git a/crates/router/src/types/domain/user/dashboard_metadata.rs b/crates/router/src/types/domain/user/dashboard_metadata.rs
new file mode 100644
index 000000000000..e65379346ac9
--- /dev/null
+++ b/crates/router/src/types/domain/user/dashboard_metadata.rs
@@ -0,0 +1,56 @@
+use api_models::user::dashboard_metadata as api;
+use diesel_models::enums::DashboardMetadata as DBEnum;
+use masking::Secret;
+use time::PrimitiveDateTime;
+
+pub enum MetaData {
+    ProductionAgreement(ProductionAgreementValue),
+    SetupProcessor(api::SetupProcessor),
+    ConfigureEndpoint(bool),
+    SetupComplete(bool),
+    FirstProcessorConnected(api::ProcessorConnected),
+    SecondProcessorConnected(api::ProcessorConnected),
+    ConfiguredRouting(api::ConfiguredRouting),
+    TestPayment(api::TestPayment),
+    IntegrationMethod(api::IntegrationMethod),
+    IntegrationCompleted(bool),
+    StripeConnected(api::ProcessorConnected),
+    PaypalConnected(api::ProcessorConnected),
+    SPRoutingConfigured(api::ConfiguredRouting),
+    SPTestPayment(bool),
+    DownloadWoocom(bool),
+    ConfigureWoocom(bool),
+    SetupWoocomWebhook(bool),
+    IsMultipleConfiguration(bool),
+}
+
+impl From<&MetaData> for DBEnum {
+    fn from(value: &MetaData) -> Self {
+        match value {
+            MetaData::ProductionAgreement(_) => Self::ProductionAgreement,
+            MetaData::SetupProcessor(_) => Self::SetupProcessor,
+            MetaData::ConfigureEndpoint(_) => Self::ConfigureEndpoint,
+            MetaData::SetupComplete(_) => Self::SetupComplete,
+            MetaData::FirstProcessorConnected(_) => Self::FirstProcessorConnected,
+            MetaData::SecondProcessorConnected(_) => Self::SecondProcessorConnected,
+            MetaData::ConfiguredRouting(_) => Self::ConfiguredRouting,
+            MetaData::TestPayment(_) => Self::TestPayment,
+            MetaData::IntegrationMethod(_) => Self::IntegrationMethod,
+            MetaData::IntegrationCompleted(_) => Self::IntegrationCompleted,
+            MetaData::StripeConnected(_) => Self::StripeConnected,
+            MetaData::PaypalConnected(_) => Self::PaypalConnected,
+            MetaData::SPRoutingConfigured(_) => Self::SpRoutingConfigured,
+            MetaData::SPTestPayment(_) => Self::SpTestPayment,
+            MetaData::DownloadWoocom(_) => Self::DownloadWoocom,
+            MetaData::ConfigureWoocom(_) => Self::ConfigureWoocom,
+            MetaData::SetupWoocomWebhook(_) => Self::SetupWoocomWebhook,
+            MetaData::IsMultipleConfiguration(_) => Self::IsMultipleConfiguration,
+        }
+    }
+}
+#[derive(Debug, serde::Serialize)]
+pub struct ProductionAgreementValue {
+    pub version: String,
+    pub ip_address: Secret<String, common_utils::pii::IpAddress>,
+    pub timestamp: PrimitiveDateTime,
+}
diff --git a/crates/router/src/types/storage.rs b/crates/router/src/types/storage.rs
index e3e19323357b..a83a405f3554 100644
--- a/crates/router/src/types/storage.rs
+++ b/crates/router/src/types/storage.rs
@@ -5,6 +5,7 @@ pub mod capture;
 pub mod cards_info;
 pub mod configs;
 pub mod customers;
+pub mod dashboard_metadata;
 pub mod dispute;
 pub mod enums;
 pub mod ephemeral_key;
@@ -42,11 +43,11 @@ pub use data_models::payments::{
 };
 
 pub use self::{
-    address::*, api_keys::*, capture::*, cards_info::*, configs::*, customers::*, dispute::*,
-    ephemeral_key::*, events::*, file::*, gsm::*, locker_mock_up::*, mandate::*,
-    merchant_account::*, merchant_connector_account::*, merchant_key_store::*, payment_link::*,
-    payment_method::*, payout_attempt::*, payouts::*, process_tracker::*, refund::*,
-    reverse_lookup::*, routing_algorithm::*, user::*, user_role::*,
+    address::*, api_keys::*, capture::*, cards_info::*, configs::*, customers::*,
+    dashboard_metadata::*, dispute::*, ephemeral_key::*, events::*, file::*, gsm::*,
+    locker_mock_up::*, mandate::*, merchant_account::*, merchant_connector_account::*,
+    merchant_key_store::*, payment_link::*, payment_method::*, payout_attempt::*, payouts::*,
+    process_tracker::*, refund::*, reverse_lookup::*, routing_algorithm::*, user::*, user_role::*,
 };
 use crate::types::api::routing;
 
diff --git a/crates/router/src/types/storage/dashboard_metadata.rs b/crates/router/src/types/storage/dashboard_metadata.rs
new file mode 100644
index 000000000000..d804dfb1ff8b
--- /dev/null
+++ b/crates/router/src/types/storage/dashboard_metadata.rs
@@ -0,0 +1 @@
+pub use diesel_models::user::dashboard_metadata::*;
diff --git a/crates/router/src/types/storage/payment_attempt.rs b/crates/router/src/types/storage/payment_attempt.rs
index f94d06997ca9..13b9f3dd5d5c 100644
--- a/crates/router/src/types/storage/payment_attempt.rs
+++ b/crates/router/src/types/storage/payment_attempt.rs
@@ -7,7 +7,6 @@ use error_stack::ResultExt;
 use crate::{
     core::errors, errors::RouterResult, types::transformers::ForeignFrom, utils::OptionExt,
 };
-
 pub trait PaymentAttemptExt {
     fn make_new_capture(
         &self,
@@ -134,9 +133,7 @@ mod tests {
         use crate::configs::settings::Settings;
         let conf = Settings::new().expect("invalid settings");
         let tx: oneshot::Sender<()> = oneshot::channel().0;
-
         let api_client = Box::new(services::MockApiClient);
-
         let state =
             routes::AppState::with_storage(conf, StorageImpl::PostgresqlTest, tx, api_client).await;
 
@@ -187,7 +184,6 @@ mod tests {
         let tx: oneshot::Sender<()> = oneshot::channel().0;
 
         let api_client = Box::new(services::MockApiClient);
-
         let state =
             routes::AppState::with_storage(conf, StorageImpl::PostgresqlTest, tx, api_client).await;
         let current_time = common_utils::date_time::now();
diff --git a/crates/router/src/types/transformers.rs b/crates/router/src/types/transformers.rs
index 6fde61a03837..a5ee309f24e3 100644
--- a/crates/router/src/types/transformers.rs
+++ b/crates/router/src/types/transformers.rs
@@ -9,7 +9,6 @@ use common_utils::{
 };
 use diesel_models::enums as storage_enums;
 use error_stack::{IntoReport, ResultExt};
-use euclid::enums as dsl_enums;
 use masking::{ExposeInterface, PeekInterface};
 
 use super::domain;
@@ -174,25 +173,11 @@ impl ForeignFrom<storage_enums::MandateDataType> for api_models::payments::Manda
     }
 }
 
-impl ForeignTryFrom<api_enums::Connector> for api_enums::RoutableConnectors {
+impl ForeignTryFrom<api_enums::Connector> for common_enums::RoutableConnectors {
     type Error = error_stack::Report<common_utils::errors::ValidationError>;
 
     fn foreign_try_from(from: api_enums::Connector) -> Result<Self, Self::Error> {
         Ok(match from {
-            #[cfg(feature = "dummy_connector")]
-            api_enums::Connector::DummyConnector1 => Self::DummyConnector1,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::Connector::DummyConnector2 => Self::DummyConnector2,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::Connector::DummyConnector3 => Self::DummyConnector3,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::Connector::DummyConnector4 => Self::DummyConnector4,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::Connector::DummyConnector5 => Self::DummyConnector5,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::Connector::DummyConnector6 => Self::DummyConnector6,
-            #[cfg(feature = "dummy_connector")]
-            api_enums::Connector::DummyConnector7 => Self::DummyConnector7,
             api_enums::Connector::Aci => Self::Aci,
             api_enums::Connector::Adyen => Self::Adyen,
             api_enums::Connector::Airwallex => Self::Airwallex,
@@ -253,76 +238,21 @@ impl ForeignTryFrom<api_enums::Connector> for api_enums::RoutableConnectors {
             api_enums::Connector::Worldline => Self::Worldline,
             api_enums::Connector::Worldpay => Self::Worldpay,
             api_enums::Connector::Zen => Self::Zen,
-        })
-    }
-}
-
-impl ForeignFrom<dsl_enums::Connector> for api_enums::RoutableConnectors {
-    fn foreign_from(from: dsl_enums::Connector) -> Self {
-        match from {
             #[cfg(feature = "dummy_connector")]
-            dsl_enums::Connector::DummyConnector1 => Self::DummyConnector1,
+            api_enums::Connector::DummyConnector1 => Self::DummyConnector1,
             #[cfg(feature = "dummy_connector")]
-            dsl_enums::Connector::DummyConnector2 => Self::DummyConnector2,
+            api_enums::Connector::DummyConnector2 => Self::DummyConnector2,
             #[cfg(feature = "dummy_connector")]
-            dsl_enums::Connector::DummyConnector3 => Self::DummyConnector3,
+            api_enums::Connector::DummyConnector3 => Self::DummyConnector3,
             #[cfg(feature = "dummy_connector")]
-            dsl_enums::Connector::DummyConnector4 => Self::DummyConnector4,
+            api_enums::Connector::DummyConnector4 => Self::DummyConnector4,
             #[cfg(feature = "dummy_connector")]
-            dsl_enums::Connector::DummyConnector5 => Self::DummyConnector5,
+            api_enums::Connector::DummyConnector5 => Self::DummyConnector5,
             #[cfg(feature = "dummy_connector")]
-            dsl_enums::Connector::DummyConnector6 => Self::DummyConnector6,
+            api_enums::Connector::DummyConnector6 => Self::DummyConnector6,
             #[cfg(feature = "dummy_connector")]
-            dsl_enums::Connector::DummyConnector7 => Self::DummyConnector7,
-            dsl_enums::Connector::Aci => Self::Aci,
-            dsl_enums::Connector::Adyen => Self::Adyen,
-            dsl_enums::Connector::Airwallex => Self::Airwallex,
-            dsl_enums::Connector::Authorizedotnet => Self::Authorizedotnet,
-            dsl_enums::Connector::Bambora => Self::Bambora,
-            dsl_enums::Connector::Bankofamerica => Self::Bankofamerica,
-            dsl_enums::Connector::Bitpay => Self::Bitpay,
-            dsl_enums::Connector::Bluesnap => Self::Bluesnap,
-            dsl_enums::Connector::Boku => Self::Boku,
-            dsl_enums::Connector::Braintree => Self::Braintree,
-            dsl_enums::Connector::Cashtocode => Self::Cashtocode,
-            dsl_enums::Connector::Checkout => Self::Checkout,
-            dsl_enums::Connector::Coinbase => Self::Coinbase,
-            dsl_enums::Connector::Cryptopay => Self::Cryptopay,
-            dsl_enums::Connector::Cybersource => Self::Cybersource,
-            dsl_enums::Connector::Dlocal => Self::Dlocal,
-            dsl_enums::Connector::Fiserv => Self::Fiserv,
-            dsl_enums::Connector::Forte => Self::Forte,
-            dsl_enums::Connector::Globalpay => Self::Globalpay,
-            dsl_enums::Connector::Globepay => Self::Globepay,
-            dsl_enums::Connector::Gocardless => Self::Gocardless,
-            dsl_enums::Connector::Helcim => Self::Helcim,
-            dsl_enums::Connector::Iatapay => Self::Iatapay,
-            dsl_enums::Connector::Klarna => Self::Klarna,
-            dsl_enums::Connector::Mollie => Self::Mollie,
-            dsl_enums::Connector::Multisafepay => Self::Multisafepay,
-            dsl_enums::Connector::Nexinets => Self::Nexinets,
-            dsl_enums::Connector::Nmi => Self::Nmi,
-            dsl_enums::Connector::Noon => Self::Noon,
-            dsl_enums::Connector::Nuvei => Self::Nuvei,
-            dsl_enums::Connector::Opennode => Self::Opennode,
-            dsl_enums::Connector::Payme => Self::Payme,
-            dsl_enums::Connector::Paypal => Self::Paypal,
-            dsl_enums::Connector::Payu => Self::Payu,
-            dsl_enums::Connector::Powertranz => Self::Powertranz,
-            dsl_enums::Connector::Prophetpay => Self::Prophetpay,
-            dsl_enums::Connector::Rapyd => Self::Rapyd,
-            dsl_enums::Connector::Shift4 => Self::Shift4,
-            dsl_enums::Connector::Square => Self::Square,
-            dsl_enums::Connector::Stax => Self::Stax,
-            dsl_enums::Connector::Stripe => Self::Stripe,
-            dsl_enums::Connector::Trustpay => Self::Trustpay,
-            dsl_enums::Connector::Tsys => Self::Tsys,
-            dsl_enums::Connector::Volt => Self::Volt,
-            dsl_enums::Connector::Wise => Self::Wise,
-            dsl_enums::Connector::Worldline => Self::Worldline,
-            dsl_enums::Connector::Worldpay => Self::Worldpay,
-            dsl_enums::Connector::Zen => Self::Zen,
-        }
+            api_enums::Connector::DummyConnector7 => Self::DummyConnector7,
+        })
     }
 }
 
@@ -522,7 +452,8 @@ impl ForeignTryFrom<api_models::payments::PaymentMethodData> for api_enums::Paym
         payment_method_data: api_models::payments::PaymentMethodData,
     ) -> Result<Self, Self::Error> {
         match payment_method_data {
-            api_models::payments::PaymentMethodData::Card(..) => Ok(Self::Card),
+            api_models::payments::PaymentMethodData::Card(..)
+            | api_models::payments::PaymentMethodData::CardToken(..) => Ok(Self::Card),
             api_models::payments::PaymentMethodData::Wallet(..) => Ok(Self::Wallet),
             api_models::payments::PaymentMethodData::PayLater(..) => Ok(Self::PayLater),
             api_models::payments::PaymentMethodData::BankRedirect(..) => Ok(Self::BankRedirect),
diff --git a/crates/router/src/utils.rs b/crates/router/src/utils.rs
index 901e84997e67..81968cd9b628 100644
--- a/crates/router/src/utils.rs
+++ b/crates/router/src/utils.rs
@@ -1,11 +1,13 @@
+pub mod currency;
 pub mod custom_serde;
 pub mod db_utils;
 pub mod ext_traits;
-#[cfg(feature = "olap")]
-pub mod user;
-
 #[cfg(feature = "kv_store")]
 pub mod storage_partitioning;
+#[cfg(feature = "olap")]
+pub mod user;
+#[cfg(feature = "olap")]
+pub mod verify_connector;
 
 use std::fmt::Debug;
 
diff --git a/crates/router/src/utils/currency.rs b/crates/router/src/utils/currency.rs
new file mode 100644
index 000000000000..118d9df28e22
--- /dev/null
+++ b/crates/router/src/utils/currency.rs
@@ -0,0 +1,641 @@
+use std::{collections::HashMap, ops::Deref, str::FromStr, sync::Arc, time::Duration};
+
+use api_models::enums;
+use common_utils::{date_time, errors::CustomResult, events::ApiEventMetric, ext_traits::AsyncExt};
+use currency_conversion::types::{CurrencyFactors, ExchangeRates};
+use error_stack::{IntoReport, ResultExt};
+#[cfg(feature = "kms")]
+use external_services::kms;
+use masking::PeekInterface;
+use once_cell::sync::Lazy;
+use redis_interface::DelReply;
+use rust_decimal::Decimal;
+use strum::IntoEnumIterator;
+use tokio::{sync::RwLock, time::sleep};
+
+use crate::{
+    logger,
+    routes::app::settings::{Conversion, DefaultExchangeRates},
+    services, AppState,
+};
+const REDIX_FOREX_CACHE_KEY: &str = "{forex_cache}_lock";
+const REDIX_FOREX_CACHE_DATA: &str = "{forex_cache}_data";
+const FOREX_API_TIMEOUT: u64 = 5;
+const FOREX_BASE_URL: &str = "https://openexchangerates.org/api/latest.json?app_id=";
+const FOREX_BASE_CURRENCY: &str = "&base=USD";
+const FALLBACK_FOREX_BASE_URL: &str = "http://apilayer.net/api/live?access_key=";
+const FALLBACK_FOREX_API_CURRENCY_PREFIX: &str = "USD";
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct FxExchangeRatesCacheEntry {
+    data: Arc<ExchangeRates>,
+    timestamp: i64,
+}
+
+static FX_EXCHANGE_RATES_CACHE: Lazy<RwLock<Option<FxExchangeRatesCacheEntry>>> =
+    Lazy::new(|| RwLock::new(None));
+
+impl ApiEventMetric for FxExchangeRatesCacheEntry {}
+
+#[derive(Debug, Clone, thiserror::Error)]
+pub enum ForexCacheError {
+    #[error("API error")]
+    ApiError,
+    #[error("API timeout")]
+    ApiTimeout,
+    #[error("API unresponsive")]
+    ApiUnresponsive,
+    #[error("Conversion error")]
+    ConversionError,
+    #[error("Could not acquire the lock for cache entry")]
+    CouldNotAcquireLock,
+    #[error("Provided currency not acceptable")]
+    CurrencyNotAcceptable,
+    #[error("Incorrect entries in default Currency response")]
+    DefaultCurrencyParsingError,
+    #[error("Entry not found in cache")]
+    EntryNotFound,
+    #[error("Expiration time invalid")]
+    InvalidLogExpiry,
+    #[error("Error reading local")]
+    LocalReadError,
+    #[error("Error writing to local cache")]
+    LocalWriteError,
+    #[error("Json Parsing error")]
+    ParsingError,
+    #[error("Kms decryption error")]
+    KmsDecryptionFailed,
+    #[error("Error connecting to redis")]
+    RedisConnectionError,
+    #[error("Not able to release write lock")]
+    RedisLockReleaseFailed,
+    #[error("Error writing to redis")]
+    RedisWriteError,
+    #[error("Not able to acquire write lock")]
+    WriteLockNotAcquired,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+struct ForexResponse {
+    pub rates: HashMap<String, FloatDecimal>,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+struct FallbackForexResponse {
+    pub quotes: HashMap<String, FloatDecimal>,
+}
+
+#[derive(Debug, Copy, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(transparent)]
+struct FloatDecimal(#[serde(with = "rust_decimal::serde::float")] Decimal);
+
+impl Deref for FloatDecimal {
+    type Target = Decimal;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl FxExchangeRatesCacheEntry {
+    fn new(exchange_rate: ExchangeRates) -> Self {
+        Self {
+            data: Arc::new(exchange_rate),
+            timestamp: date_time::now_unix_timestamp(),
+        }
+    }
+    fn is_expired(&self, call_delay: i64) -> bool {
+        self.timestamp + call_delay < date_time::now_unix_timestamp()
+    }
+}
+
+async fn retrieve_forex_from_local() -> Option<FxExchangeRatesCacheEntry> {
+    FX_EXCHANGE_RATES_CACHE.read().await.clone()
+}
+
+async fn save_forex_to_local(
+    exchange_rates_cache_entry: FxExchangeRatesCacheEntry,
+) -> CustomResult<(), ForexCacheError> {
+    let mut local = FX_EXCHANGE_RATES_CACHE.write().await;
+    *local = Some(exchange_rates_cache_entry);
+    Ok(())
+}
+
+// Alternative handler for handling the case, When no data in local as well as redis
+#[allow(dead_code)]
+async fn waited_fetch_and_update_caches(
+    state: &AppState,
+    local_fetch_retry_delay: u64,
+    local_fetch_retry_count: u64,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
+    for _n in 1..local_fetch_retry_count {
+        sleep(Duration::from_millis(local_fetch_retry_delay)).await;
+        //read from redis and update local plus break the loop and return
+        match retrieve_forex_from_redis(state).await {
+            Ok(Some(rates)) => {
+                save_forex_to_local(rates.clone()).await?;
+                return Ok(rates.clone());
+            }
+            Ok(None) => continue,
+            Err(e) => {
+                logger::error!(?e);
+                continue;
+            }
+        }
+    }
+    //acquire lock one last time and try to fetch and update local & redis
+    successive_fetch_and_save_forex(
+        state,
+        None,
+        #[cfg(feature = "kms")]
+        kms_config,
+    )
+    .await
+}
+
+impl TryFrom<DefaultExchangeRates> for ExchangeRates {
+    type Error = error_stack::Report<ForexCacheError>;
+    fn try_from(value: DefaultExchangeRates) -> Result<Self, Self::Error> {
+        let mut conversion_usable: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();
+        for (curr, conversion) in value.conversion {
+            let enum_curr = enums::Currency::from_str(curr.as_str())
+                .into_report()
+                .change_context(ForexCacheError::ConversionError)?;
+            conversion_usable.insert(enum_curr, CurrencyFactors::from(conversion));
+        }
+        let base_curr = enums::Currency::from_str(value.base_currency.as_str())
+            .into_report()
+            .change_context(ForexCacheError::ConversionError)?;
+        Ok(Self {
+            base_currency: base_curr,
+            conversion: conversion_usable,
+        })
+    }
+}
+
+impl From<Conversion> for CurrencyFactors {
+    fn from(value: Conversion) -> Self {
+        Self {
+            to_factor: value.to_factor,
+            from_factor: value.from_factor,
+        }
+    }
+}
+pub async fn get_forex_rates(
+    state: &AppState,
+    call_delay: i64,
+    local_fetch_retry_delay: u64,
+    local_fetch_retry_count: u64,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
+    if let Some(local_rates) = retrieve_forex_from_local().await {
+        if local_rates.is_expired(call_delay) {
+            // expired local data
+            handler_local_expired(
+                state,
+                call_delay,
+                local_rates,
+                #[cfg(feature = "kms")]
+                kms_config,
+            )
+            .await
+        } else {
+            // Valid data present in local
+            Ok(local_rates)
+        }
+    } else {
+        // No data in local
+        handler_local_no_data(
+            state,
+            call_delay,
+            local_fetch_retry_delay,
+            local_fetch_retry_count,
+            #[cfg(feature = "kms")]
+            kms_config,
+        )
+        .await
+    }
+}
+
+async fn handler_local_no_data(
+    state: &AppState,
+    call_delay: i64,
+    _local_fetch_retry_delay: u64,
+    _local_fetch_retry_count: u64,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
+    match retrieve_forex_from_redis(state).await {
+        Ok(Some(data)) => {
+            fallback_forex_redis_check(
+                state,
+                data,
+                call_delay,
+                #[cfg(feature = "kms")]
+                kms_config,
+            )
+            .await
+        }
+        Ok(None) => {
+            // No data in local as well as redis
+            Ok(successive_fetch_and_save_forex(
+                state,
+                None,
+                #[cfg(feature = "kms")]
+                kms_config,
+            )
+            .await?)
+        }
+        Err(err) => {
+            logger::error!(?err);
+            Ok(successive_fetch_and_save_forex(
+                state,
+                None,
+                #[cfg(feature = "kms")]
+                kms_config,
+            )
+            .await?)
+        }
+    }
+}
+
+async fn successive_fetch_and_save_forex(
+    state: &AppState,
+    stale_redis_data: Option<FxExchangeRatesCacheEntry>,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
+    match acquire_redis_lock(state).await {
+        Ok(lock_acquired) => {
+            if !lock_acquired {
+                return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());
+            }
+            let api_rates = fetch_forex_rates(
+                state,
+                #[cfg(feature = "kms")]
+                kms_config,
+            )
+            .await;
+            match api_rates {
+                Ok(rates) => successive_save_data_to_redis_local(state, rates).await,
+                Err(err) => {
+                    // API not able to fetch data call secondary service
+                    logger::error!(?err);
+                    let secondary_api_rates = fallback_fetch_forex_rates(
+                        state,
+                        #[cfg(feature = "kms")]
+                        kms_config,
+                    )
+                    .await;
+                    match secondary_api_rates {
+                        Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),
+                        Err(err) => stale_redis_data.ok_or({
+                            logger::error!(?err);
+                            ForexCacheError::ApiUnresponsive.into()
+                        }),
+                    }
+                }
+            }
+        }
+        Err(e) => stale_redis_data.ok_or({
+            logger::error!(?e);
+            ForexCacheError::ApiUnresponsive.into()
+        }),
+    }
+}
+
+async fn successive_save_data_to_redis_local(
+    state: &AppState,
+    forex: FxExchangeRatesCacheEntry,
+) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
+    Ok(save_forex_to_redis(state, &forex)
+        .await
+        .async_and_then(|_rates| async { release_redis_lock(state).await })
+        .await
+        .async_and_then(|_val| async { Ok(save_forex_to_local(forex.clone()).await) })
+        .await
+        .map_or_else(
+            |e| {
+                logger::error!(?e);
+                forex.clone()
+            },
+            |_| forex.clone(),
+        ))
+}
+
+async fn fallback_forex_redis_check(
+    state: &AppState,
+    redis_data: FxExchangeRatesCacheEntry,
+    call_delay: i64,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
+    match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {
+        Some(redis_forex) => {
+            // Valid data present in redis
+            let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());
+            save_forex_to_local(exchange_rates.clone()).await?;
+            Ok(exchange_rates)
+        }
+        None => {
+            // redis expired
+            successive_fetch_and_save_forex(
+                state,
+                Some(redis_data),
+                #[cfg(feature = "kms")]
+                kms_config,
+            )
+            .await
+        }
+    }
+}
+
+async fn handler_local_expired(
+    state: &AppState,
+    call_delay: i64,
+    local_rates: FxExchangeRatesCacheEntry,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
+    match retrieve_forex_from_redis(state).await {
+        Ok(redis_data) => {
+            match is_redis_expired(redis_data.as_ref(), call_delay).await {
+                Some(redis_forex) => {
+                    // Valid data present in redis
+                    let exchange_rates =
+                        FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());
+                    save_forex_to_local(exchange_rates.clone()).await?;
+                    Ok(exchange_rates)
+                }
+                None => {
+                    // Redis is expired going for API request
+                    successive_fetch_and_save_forex(
+                        state,
+                        Some(local_rates),
+                        #[cfg(feature = "kms")]
+                        kms_config,
+                    )
+                    .await
+                }
+            }
+        }
+        Err(e) => {
+            //  data  not present in redis waited fetch
+            logger::error!(?e);
+            successive_fetch_and_save_forex(
+                state,
+                Some(local_rates),
+                #[cfg(feature = "kms")]
+                kms_config,
+            )
+            .await
+        }
+    }
+}
+
+async fn fetch_forex_rates(
+    state: &AppState,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {
+    #[cfg(feature = "kms")]
+    let forex_api_key = kms::get_kms_client(kms_config)
+        .await
+        .decrypt(state.conf.forex_api.api_key.peek())
+        .await
+        .change_context(ForexCacheError::KmsDecryptionFailed)?;
+
+    #[cfg(not(feature = "kms"))]
+    let forex_api_key = state.conf.forex_api.api_key.peek();
+
+    let forex_url: String = format!("{}{}{}", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);
+    let forex_request = services::RequestBuilder::new()
+        .method(services::Method::Get)
+        .url(&forex_url)
+        .build();
+
+    logger::info!(?forex_request);
+    let response = state
+        .api_client
+        .send_request(
+            &state.clone(),
+            forex_request,
+            Some(FOREX_API_TIMEOUT),
+            false,
+        )
+        .await
+        .change_context(ForexCacheError::ApiUnresponsive)?;
+    let forex_response = response
+        .json::<ForexResponse>()
+        .await
+        .into_report()
+        .change_context(ForexCacheError::ParsingError)?;
+
+    logger::info!("{:?}", forex_response);
+
+    let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();
+    for enum_curr in enums::Currency::iter() {
+        match forex_response.rates.get(&enum_curr.to_string()) {
+            Some(rate) => {
+                let from_factor = match Decimal::new(1, 0).checked_div(**rate) {
+                    Some(rate) => rate,
+                    None => {
+                        logger::error!("Rates for {} not received from API", &enum_curr);
+                        continue;
+                    }
+                };
+                let currency_factors = CurrencyFactors::new(**rate, from_factor);
+                conversions.insert(enum_curr, currency_factors);
+            }
+            None => {
+                logger::error!("Rates for {} not received from API", &enum_curr);
+            }
+        };
+    }
+
+    Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(
+        enums::Currency::USD,
+        conversions,
+    )))
+}
+
+pub async fn fallback_fetch_forex_rates(
+    state: &AppState,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
+    #[cfg(feature = "kms")]
+    let fallback_forex_api_key = kms::get_kms_client(kms_config)
+        .await
+        .decrypt(state.conf.forex_api.fallback_api_key.peek())
+        .await
+        .change_context(ForexCacheError::KmsDecryptionFailed)?;
+
+    #[cfg(not(feature = "kms"))]
+    let fallback_forex_api_key = state.conf.forex_api.fallback_api_key.peek();
+
+    let fallback_forex_url: String =
+        format!("{}{}", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);
+    let fallback_forex_request = services::RequestBuilder::new()
+        .method(services::Method::Get)
+        .url(&fallback_forex_url)
+        .build();
+
+    logger::info!(?fallback_forex_request);
+    let response = state
+        .api_client
+        .send_request(
+            &state.clone(),
+            fallback_forex_request,
+            Some(FOREX_API_TIMEOUT),
+            false,
+        )
+        .await
+        .change_context(ForexCacheError::ApiUnresponsive)?;
+    let fallback_forex_response = response
+        .json::<FallbackForexResponse>()
+        .await
+        .into_report()
+        .change_context(ForexCacheError::ParsingError)?;
+
+    logger::info!("{:?}", fallback_forex_response);
+    let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();
+    for enum_curr in enums::Currency::iter() {
+        match fallback_forex_response.quotes.get(
+            format!(
+                "{}{}",
+                FALLBACK_FOREX_API_CURRENCY_PREFIX,
+                &enum_curr.to_string()
+            )
+            .as_str(),
+        ) {
+            Some(rate) => {
+                let from_factor = match Decimal::new(1, 0).checked_div(**rate) {
+                    Some(rate) => rate,
+                    None => {
+                        logger::error!("Rates for {} not received from API", &enum_curr);
+                        continue;
+                    }
+                };
+                let currency_factors = CurrencyFactors::new(**rate, from_factor);
+                conversions.insert(enum_curr, currency_factors);
+            }
+            None => {
+                logger::error!("Rates for {} not received from API", &enum_curr);
+            }
+        };
+    }
+
+    let rates =
+        FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));
+    match acquire_redis_lock(state).await {
+        Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),
+        Err(e) => {
+            logger::error!(?e);
+            Ok(rates)
+        }
+    }
+}
+
+async fn release_redis_lock(
+    state: &AppState,
+) -> Result<DelReply, error_stack::Report<ForexCacheError>> {
+    state
+        .store
+        .get_redis_conn()
+        .change_context(ForexCacheError::RedisConnectionError)?
+        .delete_key(REDIX_FOREX_CACHE_KEY)
+        .await
+        .change_context(ForexCacheError::RedisLockReleaseFailed)
+}
+
+async fn acquire_redis_lock(app_state: &AppState) -> CustomResult<bool, ForexCacheError> {
+    app_state
+        .store
+        .get_redis_conn()
+        .change_context(ForexCacheError::RedisConnectionError)?
+        .set_key_if_not_exists_with_expiry(
+            REDIX_FOREX_CACHE_KEY,
+            "",
+            Some(
+                (app_state.conf.forex_api.local_fetch_retry_count
+                    * app_state.conf.forex_api.local_fetch_retry_delay
+                    + app_state.conf.forex_api.api_timeout)
+                    .try_into()
+                    .into_report()
+                    .change_context(ForexCacheError::ConversionError)?,
+            ),
+        )
+        .await
+        .map(|val| matches!(val, redis_interface::SetnxReply::KeySet))
+        .change_context(ForexCacheError::CouldNotAcquireLock)
+}
+
+async fn save_forex_to_redis(
+    app_state: &AppState,
+    forex_exchange_cache_entry: &FxExchangeRatesCacheEntry,
+) -> CustomResult<(), ForexCacheError> {
+    app_state
+        .store
+        .get_redis_conn()
+        .change_context(ForexCacheError::RedisConnectionError)?
+        .serialize_and_set_key(REDIX_FOREX_CACHE_DATA, forex_exchange_cache_entry)
+        .await
+        .change_context(ForexCacheError::RedisWriteError)
+}
+
+async fn retrieve_forex_from_redis(
+    app_state: &AppState,
+) -> CustomResult<Option<FxExchangeRatesCacheEntry>, ForexCacheError> {
+    app_state
+        .store
+        .get_redis_conn()
+        .change_context(ForexCacheError::RedisConnectionError)?
+        .get_and_deserialize_key(REDIX_FOREX_CACHE_DATA, "FxExchangeRatesCache")
+        .await
+        .change_context(ForexCacheError::EntryNotFound)
+}
+
+async fn is_redis_expired(
+    redis_cache: Option<&FxExchangeRatesCacheEntry>,
+    call_delay: i64,
+) -> Option<Arc<ExchangeRates>> {
+    redis_cache.and_then(|cache| {
+        if cache.timestamp + call_delay > date_time::now_unix_timestamp() {
+            Some(cache.data.clone())
+        } else {
+            None
+        }
+    })
+}
+
+pub async fn convert_currency(
+    state: AppState,
+    amount: i64,
+    to_currency: String,
+    from_currency: String,
+    #[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
+) -> CustomResult<api_models::currency::CurrencyConversionResponse, ForexCacheError> {
+    let rates = get_forex_rates(
+        &state,
+        state.conf.forex_api.call_delay,
+        state.conf.forex_api.local_fetch_retry_delay,
+        state.conf.forex_api.local_fetch_retry_count,
+        #[cfg(feature = "kms")]
+        kms_config,
+    )
+    .await
+    .change_context(ForexCacheError::ApiError)?;
+
+    let to_currency = api_models::enums::Currency::from_str(to_currency.as_str())
+        .into_report()
+        .change_context(ForexCacheError::CurrencyNotAcceptable)?;
+
+    let from_currency = api_models::enums::Currency::from_str(from_currency.as_str())
+        .into_report()
+        .change_context(ForexCacheError::CurrencyNotAcceptable)?;
+
+    let converted_amount =
+        currency_conversion::conversion::convert(&rates.data, from_currency, to_currency, amount)
+            .into_report()
+            .change_context(ForexCacheError::ConversionError)?;
+
+    Ok(api_models::currency::CurrencyConversionResponse {
+        converted_amount: converted_amount.to_string(),
+        currency: to_currency.to_string(),
+    })
+}
diff --git a/crates/router/src/utils/user.rs b/crates/router/src/utils/user.rs
index c72e4b9feb3c..824f7f63af75 100644
--- a/crates/router/src/utils/user.rs
+++ b/crates/router/src/utils/user.rs
@@ -1 +1,2 @@
+pub mod dashboard_metadata;
 pub mod password;
diff --git a/crates/router/src/utils/user/dashboard_metadata.rs b/crates/router/src/utils/user/dashboard_metadata.rs
new file mode 100644
index 000000000000..5f354e613f95
--- /dev/null
+++ b/crates/router/src/utils/user/dashboard_metadata.rs
@@ -0,0 +1,162 @@
+use std::{net::IpAddr, str::FromStr};
+
+use actix_web::http::header::HeaderMap;
+use api_models::user::dashboard_metadata::{
+    GetMetaDataRequest, GetMultipleMetaDataPayload, SetMetaDataRequest,
+};
+use diesel_models::{
+    enums::DashboardMetadata as DBEnum,
+    user::dashboard_metadata::{DashboardMetadata, DashboardMetadataNew},
+};
+use error_stack::{IntoReport, ResultExt};
+use masking::Secret;
+
+use crate::{
+    core::errors::{UserErrors, UserResult},
+    headers, AppState,
+};
+
+pub async fn insert_merchant_scoped_metadata_to_db(
+    state: &AppState,
+    user_id: String,
+    merchant_id: String,
+    org_id: String,
+    metadata_key: DBEnum,
+    metadata_value: impl serde::Serialize,
+) -> UserResult<DashboardMetadata> {
+    let now = common_utils::date_time::now();
+    let data_value = serde_json::to_value(metadata_value)
+        .into_report()
+        .change_context(UserErrors::InternalServerError)
+        .attach_printable("Error Converting Struct To Serde Value")?;
+    state
+        .store
+        .insert_metadata(DashboardMetadataNew {
+            user_id: None,
+            merchant_id,
+            org_id,
+            data_key: metadata_key,
+            data_value,
+            created_by: user_id.clone(),
+            created_at: now,
+            last_modified_by: user_id,
+            last_modified_at: now,
+        })
+        .await
+        .map_err(|e| {
+            if e.current_context().is_db_unique_violation() {
+                return e.change_context(UserErrors::MetadataAlreadySet);
+            }
+            e.change_context(UserErrors::InternalServerError)
+        })
+}
+
+pub async fn get_merchant_scoped_metadata_from_db(
+    state: &AppState,
+    merchant_id: String,
+    org_id: String,
+    metadata_keys: Vec<DBEnum>,
+) -> UserResult<Vec<DashboardMetadata>> {
+    match state
+        .store
+        .find_merchant_scoped_dashboard_metadata(&merchant_id, &org_id, metadata_keys)
+        .await
+    {
+        Ok(data) => Ok(data),
+        Err(e) => {
+            if e.current_context().is_db_not_found() {
+                return Ok(Vec::with_capacity(0));
+            }
+            Err(e
+                .change_context(UserErrors::InternalServerError)
+                .attach_printable("DB Error Fetching DashboardMetaData"))
+        }
+    }
+}
+
+pub fn deserialize_to_response<T>(data: Option<&DashboardMetadata>) -> UserResult<Option<T>>
+where
+    T: serde::de::DeserializeOwned,
+{
+    data.map(|metadata| serde_json::from_value(metadata.data_value.clone()))
+        .transpose()
+        .map_err(|_| UserErrors::InternalServerError.into())
+        .attach_printable("Error Serializing Metadata from DB")
+}
+
+pub fn separate_metadata_type_based_on_scope(
+    metadata_keys: Vec<DBEnum>,
+) -> (Vec<DBEnum>, Vec<DBEnum>) {
+    let (mut merchant_scoped, user_scoped) = (
+        Vec::with_capacity(metadata_keys.len()),
+        Vec::with_capacity(metadata_keys.len()),
+    );
+    for key in metadata_keys {
+        match key {
+            DBEnum::ProductionAgreement
+            | DBEnum::SetupProcessor
+            | DBEnum::ConfigureEndpoint
+            | DBEnum::SetupComplete
+            | DBEnum::FirstProcessorConnected
+            | DBEnum::SecondProcessorConnected
+            | DBEnum::ConfiguredRouting
+            | DBEnum::TestPayment
+            | DBEnum::IntegrationMethod
+            | DBEnum::IntegrationCompleted
+            | DBEnum::StripeConnected
+            | DBEnum::PaypalConnected
+            | DBEnum::SpRoutingConfigured
+            | DBEnum::SpTestPayment
+            | DBEnum::DownloadWoocom
+            | DBEnum::ConfigureWoocom
+            | DBEnum::SetupWoocomWebhook
+            | DBEnum::IsMultipleConfiguration => merchant_scoped.push(key),
+        }
+    }
+    (merchant_scoped, user_scoped)
+}
+
+pub fn is_backfill_required(metadata_key: &DBEnum) -> bool {
+    matches!(
+        metadata_key,
+        DBEnum::StripeConnected | DBEnum::PaypalConnected
+    )
+}
+
+pub fn set_ip_address_if_required(
+    request: &mut SetMetaDataRequest,
+    headers: &HeaderMap,
+) -> UserResult<()> {
+    if let SetMetaDataRequest::ProductionAgreement(req) = request {
+        let ip_address_from_request: Secret<String, common_utils::pii::IpAddress> = headers
+            .get(headers::X_FORWARDED_FOR)
+            .ok_or(UserErrors::IpAddressParsingFailed.into())
+            .attach_printable("X-Forwarded-For header not found")?
+            .to_str()
+            .map_err(|_| UserErrors::IpAddressParsingFailed.into())
+            .attach_printable("Error converting Header Value to Str")?
+            .split(',')
+            .next()
+            .and_then(|ip| {
+                let ip_addr: Result<IpAddr, _> = ip.parse();
+                ip_addr.ok()
+            })
+            .ok_or(UserErrors::IpAddressParsingFailed.into())
+            .attach_printable("Error Parsing header value to ip")?
+            .to_string()
+            .into();
+        req.ip_address = Some(ip_address_from_request)
+    }
+    Ok(())
+}
+
+pub fn parse_string_to_enums(query: String) -> UserResult<GetMultipleMetaDataPayload> {
+    Ok(GetMultipleMetaDataPayload {
+        results: query
+            .split(',')
+            .map(GetMetaDataRequest::from_str)
+            .collect::<Result<Vec<GetMetaDataRequest>, _>>()
+            .map_err(|_| UserErrors::InvalidMetadataRequest.into())
+            .attach_printable("Error Parsing to DashboardMetadata enums")?,
+    })
+}
diff --git a/crates/router/src/utils/verify_connector.rs b/crates/router/src/utils/verify_connector.rs
new file mode 100644
index 000000000000..6ad683d63ba1
--- /dev/null
+++ b/crates/router/src/utils/verify_connector.rs
@@ -0,0 +1,49 @@
+use api_models::enums::Connector;
+use error_stack::{IntoReport, ResultExt};
+
+use crate::{core::errors, types::api};
+
+pub fn generate_card_from_details(
+    card_number: String,
+    card_exp_year: String,
+    card_exp_month: String,
+    card_cvv: String,
+) -> errors::RouterResult<api::Card> {
+    Ok(api::Card {
+        card_number: card_number
+            .parse()
+            .into_report()
+            .change_context(errors::ApiErrorResponse::InternalServerError)
+            .attach_printable("Error while parsing card number")?,
+        card_issuer: None,
+        card_cvc: masking::Secret::new(card_cvv),
+        card_network: None,
+        card_exp_year: masking::Secret::new(card_exp_year),
+        card_exp_month: masking::Secret::new(card_exp_month),
+        card_holder_name: masking::Secret::new("HyperSwitch".to_string()),
+        nick_name: None,
+        card_type: None,
+        card_issuing_country: None,
+        bank_code: None,
+    })
+}
+
+pub fn get_test_card_details(connector_name: Connector) -> errors::RouterResult<Option<api::Card>> {
+    match connector_name {
+        Connector::Stripe => Some(generate_card_from_details(
+            "4242424242424242".to_string(),
+            "2025".to_string(),
+            "12".to_string(),
+            "100".to_string(),
+        ))
+        .transpose(),
+        Connector::Paypal => Some(generate_card_from_details(
+            "4111111111111111".to_string(),
+            "2025".to_string(),
+            "02".to_string(),
+            "123".to_string(),
+        ))
+        .transpose(),
+        _ => Ok(None),
+    }
+}
diff --git a/crates/router/src/workflows/payment_sync.rs b/crates/router/src/workflows/payment_sync.rs
index f2760a00582d..43567ce27e23 100644
--- a/crates/router/src/workflows/payment_sync.rs
+++ b/crates/router/src/workflows/payment_sync.rs
@@ -124,7 +124,7 @@ impl ProcessTrackerWorkflow<AppState> for PaymentsSyncWorkflow {
                         .as_ref()
                         .is_none()
                 {
-                    let payment_intent_update = data_models::payments::payment_intent::PaymentIntentUpdate::PGStatusUpdate { status: api_models::enums::IntentStatus::Failed,updated_by: merchant_account.storage_scheme.to_string() };
+                    let payment_intent_update = data_models::payments::payment_intent::PaymentIntentUpdate::PGStatusUpdate { status: api_models::enums::IntentStatus::Failed,updated_by: merchant_account.storage_scheme.to_string(), incremental_authorization_allowed: Some(false) };
                     let payment_attempt_update =
                         data_models::payments::payment_attempt::PaymentAttemptUpdate::ErrorUpdate {
                             connector: None,
diff --git a/crates/router/tests/connectors/aci.rs b/crates/router/tests/connectors/aci.rs
index c9ee3a34f2ef..7ddc504956fb 100644
--- a/crates/router/tests/connectors/aci.rs
+++ b/crates/router/tests/connectors/aci.rs
@@ -69,6 +69,7 @@ fn construct_payment_router_data() -> types::PaymentsAuthorizeRouterData {
             complete_authorize_url: None,
             customer_id: None,
             surcharge_details: None,
+            request_incremental_authorization: false,
         },
         response: Err(types::ErrorResponse::default()),
         payment_method_id: None,
@@ -160,6 +161,7 @@ fn construct_refund_router_data<F>() -> types::RefundsRouterData<F> {
 async fn payments_create_success() {
     let conf = Settings::new().unwrap();
     let tx: oneshot::Sender<()> = oneshot::channel().0;
+
     let state = routes::AppState::with_storage(
         conf,
         StorageImpl::PostgresqlTest,
@@ -204,6 +206,7 @@ async fn payments_create_failure() {
         let conf = Settings::new().unwrap();
         static CV: aci::Aci = aci::Aci;
         let tx: oneshot::Sender<()> = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             conf,
             StorageImpl::PostgresqlTest,
@@ -265,6 +268,7 @@ async fn refund_for_successful_payments() {
         merchant_connector_id: None,
     };
     let tx: oneshot::Sender<()> = oneshot::channel().0;
+
     let state = routes::AppState::with_storage(
         conf,
         StorageImpl::PostgresqlTest,
@@ -333,6 +337,7 @@ async fn refunds_create_failure() {
         merchant_connector_id: None,
     };
     let tx: oneshot::Sender<()> = oneshot::channel().0;
+
     let state = routes::AppState::with_storage(
         conf,
         StorageImpl::PostgresqlTest,
diff --git a/crates/router/tests/connectors/adyen.rs b/crates/router/tests/connectors/adyen.rs
index 4b2cbcb7c4a9..714dc0d7d672 100644
--- a/crates/router/tests/connectors/adyen.rs
+++ b/crates/router/tests/connectors/adyen.rs
@@ -157,6 +157,7 @@ impl AdyenTest {
             complete_authorize_url: None,
             customer_id: None,
             surcharge_details: None,
+            request_incremental_authorization: false,
         })
     }
 }
diff --git a/crates/router/tests/connectors/bitpay.rs b/crates/router/tests/connectors/bitpay.rs
index 755427140c4f..3c9f08bf1b69 100644
--- a/crates/router/tests/connectors/bitpay.rs
+++ b/crates/router/tests/connectors/bitpay.rs
@@ -92,6 +92,7 @@ fn payment_method_details() -> Option<types::PaymentsAuthorizeData> {
         capture_method: None,
         customer_id: None,
         surcharge_details: None,
+        request_incremental_authorization: false,
     })
 }
 
diff --git a/crates/router/tests/connectors/cashtocode.rs b/crates/router/tests/connectors/cashtocode.rs
index 871677bb692a..a7c95936fbe8 100644
--- a/crates/router/tests/connectors/cashtocode.rs
+++ b/crates/router/tests/connectors/cashtocode.rs
@@ -67,6 +67,7 @@ impl CashtocodeTest {
             complete_authorize_url: None,
             customer_id: Some("John Doe".to_owned()),
             surcharge_details: None,
+            request_incremental_authorization: false,
         })
     }
 
diff --git a/crates/router/tests/connectors/coinbase.rs b/crates/router/tests/connectors/coinbase.rs
index 512e03a5c94d..2ddb5464d4df 100644
--- a/crates/router/tests/connectors/coinbase.rs
+++ b/crates/router/tests/connectors/coinbase.rs
@@ -94,6 +94,7 @@ fn payment_method_details() -> Option<types::PaymentsAuthorizeData> {
         capture_method: None,
         customer_id: None,
         surcharge_details: None,
+        request_incremental_authorization: false,
     })
 }
 
diff --git a/crates/router/tests/connectors/cryptopay.rs b/crates/router/tests/connectors/cryptopay.rs
index e9c43cee3af6..11e556215c35 100644
--- a/crates/router/tests/connectors/cryptopay.rs
+++ b/crates/router/tests/connectors/cryptopay.rs
@@ -92,6 +92,7 @@ fn payment_method_details() -> Option<types::PaymentsAuthorizeData> {
         capture_method: None,
         customer_id: None,
         surcharge_details: None,
+        request_incremental_authorization: false,
     })
 }
 
diff --git a/crates/router/tests/connectors/opennode.rs b/crates/router/tests/connectors/opennode.rs
index 248bbb02e520..707192e01c3b 100644
--- a/crates/router/tests/connectors/opennode.rs
+++ b/crates/router/tests/connectors/opennode.rs
@@ -93,6 +93,7 @@ fn payment_method_details() -> Option<types::PaymentsAuthorizeData> {
         capture_method: None,
         customer_id: None,
         surcharge_details: None,
+        request_incremental_authorization: false,
     })
 }
 
diff --git a/crates/router/tests/connectors/utils.rs b/crates/router/tests/connectors/utils.rs
index 67a0625968fb..823b3eae497d 100644
--- a/crates/router/tests/connectors/utils.rs
+++ b/crates/router/tests/connectors/utils.rs
@@ -96,6 +96,7 @@ pub trait ConnectorActions: Connector {
             payment_info,
         );
         let tx: oneshot::Sender<()> = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             Settings::new().unwrap(),
             StorageImpl::PostgresqlTest,
@@ -120,6 +121,7 @@ pub trait ConnectorActions: Connector {
             payment_info,
         );
         let tx: oneshot::Sender<()> = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             Settings::new().unwrap(),
             StorageImpl::PostgresqlTest,
@@ -148,6 +150,7 @@ pub trait ConnectorActions: Connector {
             payment_info,
         );
         let tx: oneshot::Sender<()> = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             Settings::new().unwrap(),
             StorageImpl::PostgresqlTest,
@@ -561,6 +564,7 @@ pub trait ConnectorActions: Connector {
             .get_connector_integration();
         let mut request = self.get_payout_request(None, payout_type, payment_info);
         let tx: oneshot::Sender<()> = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             Settings::new().unwrap(),
             StorageImpl::PostgresqlTest,
@@ -601,6 +605,7 @@ pub trait ConnectorActions: Connector {
             .get_connector_integration();
         let mut request = self.get_payout_request(connector_payout_id, payout_type, payment_info);
         let tx: oneshot::Sender<()> = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             Settings::new().unwrap(),
             StorageImpl::PostgresqlTest,
@@ -642,6 +647,7 @@ pub trait ConnectorActions: Connector {
         let mut request = self.get_payout_request(None, payout_type, payment_info);
         request.connector_customer = connector_customer;
         let tx: oneshot::Sender<()> = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             Settings::new().unwrap(),
             StorageImpl::PostgresqlTest,
@@ -683,6 +689,7 @@ pub trait ConnectorActions: Connector {
         let mut request =
             self.get_payout_request(Some(connector_payout_id), payout_type, payment_info);
         let tx: oneshot::Sender<()> = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             Settings::new().unwrap(),
             StorageImpl::PostgresqlTest,
@@ -770,6 +777,7 @@ pub trait ConnectorActions: Connector {
             .get_connector_integration();
         let mut request = self.get_payout_request(None, payout_type, payment_info);
         let tx = oneshot::channel().0;
+
         let state = routes::AppState::with_storage(
             Settings::new().unwrap(),
             StorageImpl::PostgresqlTest,
@@ -802,6 +810,7 @@ async fn call_connector<
 ) -> Result<RouterData<T, Req, Resp>, Report<ConnectorError>> {
     let conf = Settings::new().unwrap();
     let tx: oneshot::Sender<()> = oneshot::channel().0;
+
     let state = routes::AppState::with_storage(
         conf,
         StorageImpl::PostgresqlTest,
@@ -899,6 +908,7 @@ impl Default for PaymentAuthorizeType {
             webhook_url: None,
             customer_id: None,
             surcharge_details: None,
+            request_incremental_authorization: false,
         };
         Self(data)
     }
@@ -1034,6 +1044,7 @@ pub fn get_connector_metadata(
             connector_metadata,
             network_txn_id: _,
             connector_response_reference_id: _,
+            incremental_authorization_allowed: _,
         }) => connector_metadata,
         _ => None,
     }
diff --git a/crates/router/tests/connectors/worldline.rs b/crates/router/tests/connectors/worldline.rs
index 6163949c6c58..fd697f95b754 100644
--- a/crates/router/tests/connectors/worldline.rs
+++ b/crates/router/tests/connectors/worldline.rs
@@ -102,6 +102,7 @@ impl WorldlineTest {
             complete_authorize_url: None,
             customer_id: None,
             surcharge_details: None,
+            request_incremental_authorization: false,
         })
     }
 }
diff --git a/crates/router/tests/payments2.rs b/crates/router/tests/payments2.rs
index 5d4ca844061f..42e5524a15d5 100644
--- a/crates/router/tests/payments2.rs
+++ b/crates/router/tests/payments2.rs
@@ -217,6 +217,7 @@ async fn payments_create_core_adyen_no_redirect() {
     use router::configs::settings::Settings;
     let conf = Settings::new().expect("invalid settings");
     let tx: oneshot::Sender<()> = oneshot::channel().0;
+
     let state = routes::AppState::with_storage(
         conf,
         StorageImpl::PostgresqlTest,
diff --git a/crates/router/tests/utils.rs b/crates/router/tests/utils.rs
index 6cddbc043662..339eca6fa0fb 100644
--- a/crates/router/tests/utils.rs
+++ b/crates/router/tests/utils.rs
@@ -48,6 +48,7 @@ pub async fn mk_service(
         conf.connectors.stripe.base_url = url;
     }
     let tx: oneshot::Sender<()> = oneshot::channel().0;
+
     let app_state = AppState::with_storage(
         conf,
         router::db::StorageImpl::Mock,
diff --git a/crates/router_env/src/lib.rs b/crates/router_env/src/lib.rs
index e75606aa1531..3c7ba8b93df7 100644
--- a/crates/router_env/src/lib.rs
+++ b/crates/router_env/src/lib.rs
@@ -39,10 +39,19 @@ use crate::types::FlowMetric;
 #[derive(Debug, Display, Clone, PartialEq, Eq)]
 pub enum AnalyticsFlow {
     GetInfo,
+    GetPaymentMetrics,
+    GetRefundsMetrics,
+    GetSdkMetrics,
     GetPaymentFilters,
     GetRefundFilters,
-    GetRefundsMetrics,
-    GetPaymentMetrics,
+    GetSdkEventFilters,
+    GetApiEvents,
+    GetSdkEvents,
+    GeneratePaymentReport,
+    GenerateDisputeReport,
+    GenerateRefundReport,
+    GetApiEventMetrics,
+    GetApiEventFilters,
 }
 
 impl FlowMetric for AnalyticsFlow {}
diff --git a/crates/router_env/src/logger/types.rs b/crates/router_env/src/logger/types.rs
index 7978e98e52c0..7b87d2703640 100644
--- a/crates/router_env/src/logger/types.rs
+++ b/crates/router_env/src/logger/types.rs
@@ -163,6 +163,8 @@ pub enum Flow {
     RefundsUpdate,
     /// Refunds list flow.
     RefundsList,
+    // Retrieve forex flow.
+    RetrieveForexFlow,
     /// Routing create flow,
     RoutingCreateConfig,
     /// Routing link config
@@ -257,6 +259,12 @@ pub enum Flow {
     DecisionManagerRetrieveConfig,
     /// Change password flow
     ChangePassword,
+    /// Set Dashboard Metadata flow
+    SetDashboardMetadata,
+    /// Get Multiple Dashboard Metadata flow
+    GetMutltipleDashboardMetadata,
+    /// Payment Connector Verify
+    VerifyPaymentConnector,
 }
 
 ///
diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml
index e0b68c709e8d..5e8674ab3814 100644
--- a/crates/scheduler/Cargo.toml
+++ b/crates/scheduler/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [features]
 default = ["kv_store", "olap"]
-olap = []
+olap = ["storage_impl/olap"]
 kv_store = []
 
 [dependencies]
diff --git a/crates/storage_impl/src/config.rs b/crates/storage_impl/src/config.rs
index ceed3da81b39..fd95a6d315d6 100644
--- a/crates/storage_impl/src/config.rs
+++ b/crates/storage_impl/src/config.rs
@@ -1,6 +1,6 @@
 use masking::Secret;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Deserialize)]
 pub struct Database {
     pub username: String,
     pub password: Secret<String>,
@@ -9,5 +9,41 @@ pub struct Database {
     pub dbname: String,
     pub pool_size: u32,
     pub connection_timeout: u64,
-    pub queue_strategy: bb8::QueueStrategy,
+    pub queue_strategy: QueueStrategy,
+    pub min_idle: Option<u32>,
+    pub max_lifetime: Option<u64>,
+}
+
+#[derive(Debug, serde::Deserialize, Clone, Copy, Default)]
+#[serde(rename_all = "PascalCase")]
+pub enum QueueStrategy {
+    #[default]
+    Fifo,
+    Lifo,
+}
+
+impl From<QueueStrategy> for bb8::QueueStrategy {
+    fn from(value: QueueStrategy) -> Self {
+        match value {
+            QueueStrategy::Fifo => Self::Fifo,
+            QueueStrategy::Lifo => Self::Lifo,
+        }
+    }
+}
+
+impl Default for Database {
+    fn default() -> Self {
+        Self {
+            username: String::new(),
+            password: Secret::<String>::default(),
+            host: "localhost".into(),
+            port: 5432,
+            dbname: String::new(),
+            pool_size: 5,
+            connection_timeout: 10,
+            queue_strategy: QueueStrategy::default(),
+            min_idle: None,
+            max_lifetime: None,
+        }
+    }
 }
diff --git a/crates/storage_impl/src/database/store.rs b/crates/storage_impl/src/database/store.rs
index a09f1b752561..75c34af14ac1 100644
--- a/crates/storage_impl/src/database/store.rs
+++ b/crates/storage_impl/src/database/store.rs
@@ -88,8 +88,10 @@ pub async fn diesel_make_pg_pool(
     let manager = async_bb8_diesel::ConnectionManager::<PgConnection>::new(database_url);
     let mut pool = bb8::Pool::builder()
         .max_size(database.pool_size)
-        .queue_strategy(database.queue_strategy)
-        .connection_timeout(std::time::Duration::from_secs(database.connection_timeout));
+        .min_idle(database.min_idle)
+        .queue_strategy(database.queue_strategy.into())
+        .connection_timeout(std::time::Duration::from_secs(database.connection_timeout))
+        .max_lifetime(database.max_lifetime.map(std::time::Duration::from_secs));
 
     if test_transaction {
         pool = pool.connection_customizer(Box::new(TestTransaction));
diff --git a/crates/storage_impl/src/mock_db.rs b/crates/storage_impl/src/mock_db.rs
index 4cdf8e2456bb..e22d39ce70c8 100644
--- a/crates/storage_impl/src/mock_db.rs
+++ b/crates/storage_impl/src/mock_db.rs
@@ -43,6 +43,7 @@ pub struct MockDb {
     pub organizations: Arc<Mutex<Vec<store::organization::Organization>>>,
     pub users: Arc<Mutex<Vec<store::user::User>>>,
     pub user_roles: Arc<Mutex<Vec<store::user_role::UserRole>>>,
+    pub dashboard_metadata: Arc<Mutex<Vec<store::user::dashboard_metadata::DashboardMetadata>>>,
 }
 
 impl MockDb {
@@ -78,6 +79,7 @@ impl MockDb {
             organizations: Default::default(),
             users: Default::default(),
             user_roles: Default::default(),
+            dashboard_metadata: Default::default(),
         })
     }
 }
diff --git a/crates/storage_impl/src/mock_db/payment_attempt.rs b/crates/storage_impl/src/mock_db/payment_attempt.rs
index fe244b10325f..6137b444f963 100644
--- a/crates/storage_impl/src/mock_db/payment_attempt.rs
+++ b/crates/storage_impl/src/mock_db/payment_attempt.rs
@@ -205,4 +205,24 @@ impl PaymentAttemptInterface for MockDb {
             .cloned()
             .unwrap())
     }
+    #[allow(clippy::unwrap_used)]
+    async fn find_payment_attempt_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        _storage_scheme: storage_enums::MerchantStorageScheme,
+    ) -> CustomResult<PaymentAttempt, StorageError> {
+        let payment_attempts = self.payment_attempts.lock().await;
+
+        Ok(payment_attempts
+            .iter()
+            .find(|payment_attempt| {
+                payment_attempt.payment_id == payment_id
+                    && payment_attempt.merchant_id == merchant_id
+                    && (payment_attempt.status == storage_enums::AttemptStatus::PartialCharged
+                        || payment_attempt.status == storage_enums::AttemptStatus::Charged)
+            })
+            .cloned()
+            .unwrap())
+    }
 }
diff --git a/crates/storage_impl/src/mock_db/payment_intent.rs b/crates/storage_impl/src/mock_db/payment_intent.rs
index 08a4a2aabeaa..a3e82c1d1044 100644
--- a/crates/storage_impl/src/mock_db/payment_intent.rs
+++ b/crates/storage_impl/src/mock_db/payment_intent.rs
@@ -106,6 +106,8 @@ impl PaymentIntentInterface for MockDb {
             payment_confirm_source: new.payment_confirm_source,
             updated_by: storage_scheme.to_string(),
             surcharge_applicable: new.surcharge_applicable,
+            request_incremental_authorization: new.request_incremental_authorization,
+            incremental_authorization_allowed: new.incremental_authorization_allowed,
         };
         payment_intents.push(payment_intent.clone());
         Ok(payment_intent)
diff --git a/crates/storage_impl/src/payments/payment_attempt.rs b/crates/storage_impl/src/payments/payment_attempt.rs
index 06aacccc769d..e86119e41af6 100644
--- a/crates/storage_impl/src/payments/payment_attempt.rs
+++ b/crates/storage_impl/src/payments/payment_attempt.rs
@@ -115,6 +115,27 @@ impl<T: DatabaseStore> PaymentAttemptInterface for RouterStore<T> {
         .map(PaymentAttempt::from_storage_model)
     }
 
+    #[instrument(skip_all)]
+    async fn find_payment_attempt_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        _storage_scheme: MerchantStorageScheme,
+    ) -> CustomResult<PaymentAttempt, errors::StorageError> {
+        let conn = pg_connection_read(self).await?;
+        DieselPaymentAttempt::find_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+            &conn,
+            payment_id,
+            merchant_id,
+        )
+        .await
+        .map_err(|er| {
+            let new_err = diesel_error_to_data_error(er.current_context());
+            er.change_context(new_err)
+        })
+        .map(PaymentAttempt::from_storage_model)
+    }
+
     async fn find_payment_attempt_by_merchant_id_connector_txn_id(
         &self,
         merchant_id: &str,
@@ -618,6 +639,57 @@ impl<T: DatabaseStore> PaymentAttemptInterface for KVRouterStore<T> {
         }
     }
 
+    async fn find_payment_attempt_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+        &self,
+        payment_id: &str,
+        merchant_id: &str,
+        storage_scheme: MerchantStorageScheme,
+    ) -> error_stack::Result<PaymentAttempt, errors::StorageError> {
+        let database_call = || {
+            self.router_store
+                .find_payment_attempt_last_successful_or_partially_captured_attempt_by_payment_id_merchant_id(
+                    payment_id,
+                    merchant_id,
+                    storage_scheme,
+                )
+        };
+        match storage_scheme {
+            MerchantStorageScheme::PostgresOnly => database_call().await,
+            MerchantStorageScheme::RedisKv => {
+                let key = format!("mid_{merchant_id}_pid_{payment_id}");
+                let pattern = "pa_*";
+
+                let redis_fut = async {
+                    let kv_result = kv_wrapper::<PaymentAttempt, _, _>(
+                        self,
+                        KvOperation::<DieselPaymentAttempt>::Scan(pattern),
+                        key,
+                    )
+                    .await?
+                    .try_into_scan();
+                    kv_result.and_then(|mut payment_attempts| {
+                        payment_attempts.sort_by(|a, b| b.modified_at.cmp(&a.modified_at));
+                        payment_attempts
+                            .iter()
+                            .find(|&pa| {
+                                pa.status == api_models::enums::AttemptStatus::Charged
+                                    || pa.status == api_models::enums::AttemptStatus::PartialCharged
+                            })
+                            .cloned()
+                            .ok_or(error_stack::report!(
+                                redis_interface::errors::RedisError::NotFound
+                            ))
+                    })
+                };
+                Box::pin(try_redis_get_else_try_database_get(
+                    redis_fut,
+                    database_call,
+                ))
+                .await
+            }
+        }
+    }
+
     async fn find_payment_attempt_by_merchant_id_connector_txn_id(
         &self,
         merchant_id: &str,
diff --git a/crates/storage_impl/src/payments/payment_intent.rs b/crates/storage_impl/src/payments/payment_intent.rs
index c3b3d22ffe35..fdf9875bc1ff 100644
--- a/crates/storage_impl/src/payments/payment_intent.rs
+++ b/crates/storage_impl/src/payments/payment_intent.rs
@@ -97,6 +97,8 @@ impl<T: DatabaseStore> PaymentIntentInterface for KVRouterStore<T> {
                     payment_confirm_source: new.payment_confirm_source,
                     updated_by: storage_scheme.to_string(),
                     surcharge_applicable: new.surcharge_applicable,
+                    request_incremental_authorization: new.request_incremental_authorization,
+                    incremental_authorization_allowed: new.incremental_authorization_allowed,
                 };
                 let redis_entry = kv::TypedSql {
                     op: kv::DBOperation::Insert {
@@ -758,6 +760,8 @@ impl DataModelExt for PaymentIntentNew {
             payment_confirm_source: self.payment_confirm_source,
             updated_by: self.updated_by,
             surcharge_applicable: self.surcharge_applicable,
+            request_incremental_authorization: self.request_incremental_authorization,
+            incremental_authorization_allowed: self.incremental_authorization_allowed,
         }
     }
 
@@ -798,6 +802,8 @@ impl DataModelExt for PaymentIntentNew {
             payment_confirm_source: storage_model.payment_confirm_source,
             updated_by: storage_model.updated_by,
             surcharge_applicable: storage_model.surcharge_applicable,
+            request_incremental_authorization: storage_model.request_incremental_authorization,
+            incremental_authorization_allowed: storage_model.incremental_authorization_allowed,
         }
     }
 }
@@ -843,6 +849,8 @@ impl DataModelExt for PaymentIntent {
             payment_confirm_source: self.payment_confirm_source,
             updated_by: self.updated_by,
             surcharge_applicable: self.surcharge_applicable,
+            request_incremental_authorization: self.request_incremental_authorization,
+            incremental_authorization_allowed: self.incremental_authorization_allowed,
         }
     }
 
@@ -884,6 +892,8 @@ impl DataModelExt for PaymentIntent {
             payment_confirm_source: storage_model.payment_confirm_source,
             updated_by: storage_model.updated_by,
             surcharge_applicable: storage_model.surcharge_applicable,
+            request_incremental_authorization: storage_model.request_incremental_authorization,
+            incremental_authorization_allowed: storage_model.incremental_authorization_allowed,
         }
     }
 }
@@ -898,11 +908,13 @@ impl DataModelExt for PaymentIntentUpdate {
                 amount_captured,
                 return_url,
                 updated_by,
+                incremental_authorization_allowed,
             } => DieselPaymentIntentUpdate::ResponseUpdate {
                 status,
                 amount_captured,
                 return_url,
                 updated_by,
+                incremental_authorization_allowed,
             },
             Self::MetadataUpdate {
                 metadata,
@@ -937,9 +949,15 @@ impl DataModelExt for PaymentIntentUpdate {
                 billing_address_id,
                 updated_by,
             },
-            Self::PGStatusUpdate { status, updated_by } => {
-                DieselPaymentIntentUpdate::PGStatusUpdate { status, updated_by }
-            }
+            Self::PGStatusUpdate {
+                status,
+                updated_by,
+                incremental_authorization_allowed,
+            } => DieselPaymentIntentUpdate::PGStatusUpdate {
+                status,
+                updated_by,
+                incremental_authorization_allowed,
+            },
             Self::Update {
                 amount,
                 currency,
diff --git a/docker-compose-development.yml b/docker-compose-development.yml
new file mode 100644
index 000000000000..500f397cfa30
--- /dev/null
+++ b/docker-compose-development.yml
@@ -0,0 +1,301 @@
+version: "3.8"
+
+volumes:
+  cargo_cache:
+  pg_data:
+  router_build_cache:
+  scheduler_build_cache:
+  drainer_build_cache:
+  redisinsight_store:
+
+networks:
+  router_net:
+
+services:
+  ### Dependencies
+  pg:
+    image: postgres:latest
+    ports:
+      - "5432:5432"
+    networks:
+      - router_net
+    volumes:
+      - pg_data:/VAR/LIB/POSTGRESQL/DATA
+    environment:
+      - POSTGRES_USER=db_user
+      - POSTGRES_PASSWORD=db_pass
+      - POSTGRES_DB=hyperswitch_db
+
+  redis-standalone:
+    image: redis:7
+    labels:
+      - redis
+    networks:
+      - router_net
+    ports:
+      - "6379"
+
+  migration_runner:
+    image: rust:latest
+    command: "bash -c 'cargo install diesel_cli --no-default-features --features postgres && diesel migration --database-url postgres://$${DATABASE_USER}:$${DATABASE_PASSWORD}@$${DATABASE_HOST}:$${DATABASE_PORT}/$${DATABASE_NAME} run'"
+    working_dir: /app
+    networks:
+      - router_net
+    volumes:
+      - ./:/app
+    environment:
+      - DATABASE_USER=db_user
+      - DATABASE_PASSWORD=db_pass
+      - DATABASE_HOST=pg
+      - DATABASE_PORT=5432
+      - DATABASE_NAME=hyperswitch_db
+
+  ### Application services
+  hyperswitch-server:
+    image: rust:latest
+    command: cargo run --bin router -- -f ./config/docker_compose.toml
+    working_dir: /app
+    ports:
+      - "8080:8080"
+    networks:
+      - router_net
+    volumes:
+      - ./:/app
+      - cargo_cache:/cargo_cache
+      - router_build_cache:/cargo_build_cache
+    environment:
+      - CARGO_HOME=/cargo_cache
+      - CARGO_TARGET_DIR=/cargo_build_cache
+    labels:
+      logs: "promtail"
+    healthcheck:
+      test: curl --fail http://localhost:8080/health || exit 1
+      interval: 120s
+      retries: 4
+      start_period: 20s
+      timeout: 10s
+
+  hyperswitch-producer:
+    image: rust:latest
+    command: cargo run --bin scheduler -- -f ./config/docker_compose.toml
+    working_dir: /app
+    networks:
+      - router_net
+    profiles:
+      - scheduler
+    volumes:
+      - ./:/app
+      - cargo_cache:/cargo_cache
+      - scheduler_build_cache:/cargo_build_cache
+    environment:
+      - CARGO_HOME=/cargo_cache
+      - CARGO_TARGET_DIR=/cargo_build_cache
+      - SCHEDULER_FLOW=producer
+    depends_on:
+      hyperswitch-consumer:
+        condition: service_healthy
+    labels:
+      logs: "promtail"
+
+  hyperswitch-consumer:
+    image: rust:latest
+    command: cargo run --bin scheduler -- -f ./config/docker_compose.toml
+    working_dir: /app
+    networks:
+      - router_net
+    profiles:
+      - scheduler
+    volumes:
+      - ./:/app
+      - cargo_cache:/cargo_cache
+      - scheduler_build_cache:/cargo_build_cache
+    environment:
+      - CARGO_HOME=/cargo_cache
+      - CARGO_TARGET_DIR=/cargo_build_cache
+      - SCHEDULER_FLOW=consumer
+    depends_on:
+      hyperswitch-server:
+        condition: service_started
+    labels:
+      logs: "promtail"
+    healthcheck:
+      test: (ps -e | grep scheduler) || exit 1
+      interval: 120s
+      retries: 4
+      start_period: 30s
+      timeout: 10s
+
+  hyperswitch-drainer:
+    image: rust:latest
+    command: cargo run --bin drainer -- -f ./config/docker_compose.toml
+    working_dir: /app
+    deploy:
+      replicas: ${DRAINER_INSTANCE_COUNT:-1}
+    networks:
+      - router_net
+    profiles:
+      - full_kv
+    volumes:
+      - ./:/app
+      - cargo_cache:/cargo_cache
+      - drainer_build_cache:/cargo_build_cache
+    environment:
+      - CARGO_HOME=/cargo_cache
+      - CARGO_TARGET_DIR=/cargo_build_cache
+    restart: unless-stopped
+    depends_on:
+      hyperswitch-server:
+        condition: service_started
+    labels:
+      logs: "promtail"
+
+  ### Clustered Redis setup
+  redis-cluster:
+    image: redis:7
+    deploy:
+      replicas: ${REDIS_CLUSTER_COUNT:-3}
+    command: redis-server /usr/local/etc/redis/redis.conf
+    profiles:
+      - clustered_redis
+    volumes:
+      - ./config/redis.conf:/usr/local/etc/redis/redis.conf
+    labels:
+      - redis
+    networks:
+      - router_net
+    ports:
+      - "6379"
+      - "16379"
+
+  redis-init:
+    image: redis:7
+    profiles:
+      - clustered_redis
+    depends_on:
+      - redis-cluster
+    networks:
+      - router_net
+    command: "bash -c 'export COUNT=${REDIS_CLUSTER_COUNT:-3}
+
+      \ if [ $$COUNT -lt 3 ]
+
+      \ then
+
+      \ echo \"Minimum 3 nodes are needed for redis cluster\"
+
+      \ exit 1
+
+      \ fi
+
+      \ HOSTS=\"\"
+
+      \ for ((c=1; c<=$$COUNT;c++))
+
+      \ do
+
+      \ NODE=$COMPOSE_PROJECT_NAME-redis-cluster-$$c:6379
+
+      \ echo $$NODE
+
+      \ HOSTS=\"$$HOSTS $$NODE\"
+
+      \ done
+
+      \ echo Creating a cluster with $$HOSTS
+
+      \ redis-cli --cluster create $$HOSTS --cluster-yes
+
+      \ '"
+
+  ### Monitoring
+  grafana:
+    image: grafana/grafana:latest
+    ports:
+      - "3000:3000"
+    networks:
+      - router_net
+    profiles:
+      - monitoring
+    restart: unless-stopped
+    environment:
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_BASIC_ENABLED=false
+    volumes:
+      - ./config/grafana.ini:/etc/grafana/grafana.ini
+      - ./config/grafana-datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yml
+
+  promtail:
+    image: grafana/promtail:latest
+    volumes:
+      - ./logs:/var/log/router
+      - ./config:/etc/promtail
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: -config.file=/etc/promtail/promtail.yaml
+    profiles:
+      - monitoring
+    networks:
+      - router_net
+
+  loki:
+    image: grafana/loki:latest
+    ports:
+      - "3100"
+    command: -config.file=/etc/loki/loki.yaml
+    networks:
+      - router_net
+    profiles:
+      - monitoring
+    volumes:
+      - ./config:/etc/loki
+
+  otel-collector:
+    image: otel/opentelemetry-collector-contrib:latest
+    command: --config=/etc/otel-collector.yaml
+    networks:
+      - router_net
+    profiles:
+      - monitoring
+    volumes:
+      - ./config/otel-collector.yaml:/etc/otel-collector.yaml
+    ports:
+      - "4317"
+      - "8888"
+      - "8889"
+
+  prometheus:
+    image: prom/prometheus:latest
+    networks:
+      - router_net
+    profiles:
+      - monitoring
+    volumes:
+      - ./config/prometheus.yaml:/etc/prometheus/prometheus.yml
+    ports:
+      - "9090"
+    restart: unless-stopped
+
+  tempo:
+    image: grafana/tempo:latest
+    command: -config.file=/etc/tempo.yaml
+    volumes:
+      - ./config/tempo.yaml:/etc/tempo.yaml
+    networks:
+      - router_net
+    profiles:
+      - monitoring
+    ports:
+      - "3200" # tempo
+      - "4317" # otlp grpc
+    restart: unless-stopped
+
+  redis-insight:
+    image: redislabs/redisinsight:latest
+    networks:
+      - router_net
+    profiles:
+      - full_kv
+    ports:
+      - "8001:8001"
+    volumes:
+      - redisinsight_store:/db
diff --git a/docker-compose.yml b/docker-compose.yml
index f4dce575132e..f51a47aee940 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,76 +1,16 @@
-version: "3.7"
+version: "3.8"
 
 volumes:
-  cargo_cache:
   pg_data:
-  cargo_build_cache:
-  p_cargo_build_cache:
-  c_cargo_build_cache:
   redisinsight_store:
 
-
 networks:
   router_net:
 
-
 services:
-  promtail:
-    image: grafana/promtail:latest
-    volumes:
-      - ./logs:/var/log/router
-      - ./config:/etc/promtail
-      - /var/run/docker.sock:/var/run/docker.sock
-    command: -config.file=/etc/promtail/promtail.yaml
-    profiles:
-      - monitoring
-    networks:
-      - router_net
-
-  loki:
-    image: grafana/loki:latest
-    ports:
-      - "3100"
-    command: -config.file=/etc/loki/loki.yaml
-    networks:
-      - router_net
-    profiles:
-      - monitoring
-    volumes:
-      - ./config:/etc/loki
-
-  otel-collector:
-    image: otel/opentelemetry-collector-contrib:latest
-    command: --config=/etc/otel-collector.yaml
-    networks:
-      - router_net
-    profiles:
-      - monitoring
-    volumes:
-      - ./config/otel-collector.yaml:/etc/otel-collector.yaml
-    ports:
-      - "4317"
-      - "8888"
-      - "8889"
-
-  grafana:
-    image: grafana/grafana:latest
-    ports:
-      - "3000:3000"
-    networks:
-      - router_net
-    profiles:
-      - monitoring
-    restart: unless-stopped
-    environment:
-      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
-      - GF_AUTH_ANONYMOUS_ENABLED=true
-      - GF_AUTH_BASIC_ENABLED=false
-    volumes:
-      - ./config/grafana.ini:/etc/grafana/grafana.ini
-      - ./config/grafana-datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yml
-
+  ### Dependencies
   pg:
-    image: postgres:14.5
+    image: postgres:latest
     ports:
       - "5432:5432"
     networks:
@@ -82,52 +22,59 @@ services:
       - POSTGRES_PASSWORD=db_pass
       - POSTGRES_DB=hyperswitch_db
 
+  redis-standalone:
+    image: redis:7
+    labels:
+      - redis
+    networks:
+      - router_net
+    ports:
+      - "6379"
+
   migration_runner:
-    image: rust:1.70
-    command: "bash -c 'cargo install diesel_cli --no-default-features --features \"postgres\" && diesel migration --database-url postgres://db_user:db_pass@pg:5432/hyperswitch_db run'"
+    image: rust:latest
+    command: "bash -c 'cargo install diesel_cli --no-default-features --features postgres && diesel migration --database-url postgres://$${DATABASE_USER}:$${DATABASE_PASSWORD}@$${DATABASE_HOST}:$${DATABASE_PORT}/$${DATABASE_NAME} run'"
     working_dir: /app
     networks:
       - router_net
     volumes:
       - ./:/app
+    environment:
+      - DATABASE_USER=db_user
+      - DATABASE_PASSWORD=db_pass
+      - DATABASE_HOST=pg
+      - DATABASE_PORT=5432
+      - DATABASE_NAME=hyperswitch_db
 
+  ### Application services
   hyperswitch-server:
-    image: rust:1.70
-    command: cargo run -- -f ./config/docker_compose.toml
-    working_dir: /app
+    image: juspaydotin/hyperswitch-router:standalone
+    command: /local/bin/router -f /local/config/docker_compose.toml
     ports:
       - "8080:8080"
     networks:
       - router_net
     volumes:
-      - ./:/app
-      - cargo_cache:/cargo_cache
-      - cargo_build_cache:/cargo_build_cache
-    environment:
-      - CARGO_TARGET_DIR=/cargo_build_cache
+      - ./config:/local/config
     labels:
       logs: "promtail"
     healthcheck:
       test: curl --fail http://localhost:8080/health || exit 1
-      interval: 100s
+      interval: 10s
       retries: 3
-      start_period: 20s
+      start_period: 5s
       timeout: 10s
 
   hyperswitch-producer:
-    image: rust:1.70
-    command: cargo run --bin scheduler -- -f ./config/docker_compose.toml
-    working_dir: /app
+    image: juspaydotin/hyperswitch-producer:standalone
+    command: /local/bin/scheduler -f /local/config/docker_compose.toml
     networks:
       - router_net
     profiles:
       - scheduler
     volumes:
-      - ./:/app
-      - cargo_cache:/cargo_cache
-      - p_cargo_build_cache:/cargo_build_cache
+      - ./config:/local/config
     environment:
-      - CARGO_TARGET_DIR=/cargo_build_cache
       - SCHEDULER_FLOW=producer
     depends_on:
       hyperswitch-consumer:
@@ -136,39 +83,54 @@ services:
       logs: "promtail"
 
   hyperswitch-consumer:
-    image: rust:1.70
-    command: cargo run --bin scheduler -- -f ./config/docker_compose.toml
-    working_dir: /app
+    image: juspaydotin/hyperswitch-consumer:standalone
+    command: /local/bin/scheduler -f /local/config/docker_compose.toml
     networks:
       - router_net
     profiles:
       - scheduler
     volumes:
-      - ./:/app
-      - cargo_cache:/cargo_cache
-      - c_cargo_build_cache:/cargo_build_cache
+      - ./config:/local/config
     environment:
-      - CARGO_TARGET_DIR=/cargo_build_cache
       - SCHEDULER_FLOW=consumer
     depends_on:
       hyperswitch-server:
         condition: service_started
-
     labels:
       logs: "promtail"
-
     healthcheck:
       test: (ps -e | grep scheduler) || exit 1
-      interval: 120s
+      interval: 10s
       retries: 3
-      start_period: 30s
+      start_period: 5s
       timeout: 10s
 
+  hyperswitch-drainer:
+    image: juspaydotin/hyperswitch-drainer:standalone
+    command: /local/bin/drainer -f /local/config/docker_compose.toml
+    deploy:
+      replicas: ${DRAINER_INSTANCE_COUNT:-1}
+    networks:
+      - router_net
+    profiles:
+      - full_kv
+    volumes:
+      - ./config:/local/config
+    restart: unless-stopped
+    depends_on:
+      hyperswitch-server:
+        condition: service_started
+    labels:
+      logs: "promtail"
+
+  ### Clustered Redis setup
   redis-cluster:
     image: redis:7
     deploy:
       replicas: ${REDIS_CLUSTER_COUNT:-3}
     command: redis-server /usr/local/etc/redis/redis.conf
+    profiles:
+      - clustered_redis
     volumes:
       - ./config/redis.conf:/usr/local/etc/redis/redis.conf
     labels:
@@ -179,17 +141,10 @@ services:
       - "6379"
       - "16379"
 
-  redis-standalone:
-    image: redis:7
-    labels:
-      - redis
-    networks:
-      - router_net
-    ports:
-      - "6379"
-
   redis-init:
     image: redis:7
+    profiles:
+      - clustered_redis
     depends_on:
       - redis-cluster
     networks:
@@ -226,16 +181,62 @@ services:
 
       \ '"
 
-  redis-insight:
-    image: redislabs/redisinsight:latest
+  ### Monitoring
+  grafana:
+    image: grafana/grafana:latest
+    ports:
+      - "3000:3000"
     networks:
       - router_net
     profiles:
-      - full_kv
+      - monitoring
+    restart: unless-stopped
+    environment:
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_BASIC_ENABLED=false
+    volumes:
+      - ./config/grafana.ini:/etc/grafana/grafana.ini
+      - ./config/grafana-datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yml
+
+  promtail:
+    image: grafana/promtail:latest
+    volumes:
+      - ./logs:/var/log/router
+      - ./config:/etc/promtail
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: -config.file=/etc/promtail/promtail.yaml
+    profiles:
+      - monitoring
+    networks:
+      - router_net
+
+  loki:
+    image: grafana/loki:latest
     ports:
-      - "8001:8001"
+      - "3100"
+    command: -config.file=/etc/loki/loki.yaml
+    networks:
+      - router_net
+    profiles:
+      - monitoring
     volumes:
-      - redisinsight_store:/db
+      - ./config:/etc/loki
+
+  otel-collector:
+    image: otel/opentelemetry-collector-contrib:latest
+    command: --config=/etc/otel-collector.yaml
+    networks:
+      - router_net
+    profiles:
+      - monitoring
+    volumes:
+      - ./config/otel-collector.yaml:/etc/otel-collector.yaml
+    ports:
+      - "4317"
+      - "8888"
+      - "8889"
+
   prometheus:
     image: prom/prometheus:latest
     networks:
@@ -261,25 +262,77 @@ services:
       - "3200" # tempo
       - "4317" # otlp grpc
     restart: unless-stopped
-  hyperswitch-drainer:
-    image: rust:1.70
-    command: cargo run --bin drainer -- -f ./config/docker_compose.toml
-    working_dir: /app
-    deploy:
-      replicas: ${DRAINER_INSTANCE_COUNT:-1}
+
+  redis-insight:
+    image: redislabs/redisinsight:latest
     networks:
       - router_net
     profiles:
       - full_kv
+    ports:
+      - "8001:8001"
     volumes:
-      - ./:/app
-      - cargo_cache:/cargo_cache
-      - cargo_build_cache:/cargo_build_cache
+      - redisinsight_store:/db
+
+  kafka0:
+    image: confluentinc/cp-kafka:7.0.5
+    hostname: kafka0
+    networks:
+      - router_net
+    ports:
+      - 9092:9092
+      - 9093
+      - 9997
+      - 29092
     environment:
-      - CARGO_TARGET_DIR=/cargo_build_cache
-    restart: unless-stopped
+      KAFKA_BROKER_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+      JMX_PORT: 9997
+      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
+    profiles:
+      - analytics
+    volumes:
+      - ./monitoring/kafka-script.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+
+  # Kafka UI for debugging kafka queues
+  kafka-ui:
+    image: provectuslabs/kafka-ui:latest
+    ports:
+      - 8090:8080
+    networks:
+      - router_net
     depends_on:
-      hyperswitch-server:
-        condition: service_started
-    labels:
-      logs: "promtail"
+      - kafka0
+    profiles:
+      - analytics
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
+      KAFKA_CLUSTERS_0_JMXPORT: 9997
+
+  clickhouse-server:
+    image: clickhouse/clickhouse-server:23.5
+    networks:
+      - router_net
+    ports:
+      - "9000"
+      - "8123:8123"
+    profiles:
+      - analytics
+    ulimits:
+      nofile:
+        soft: 262144
+        hard: 262144
\ No newline at end of file
diff --git a/docs/try_local_system.md b/docs/try_local_system.md
index 59df43f24810..a9cd080f26d5 100644
--- a/docs/try_local_system.md
+++ b/docs/try_local_system.md
@@ -1,23 +1,20 @@
 # Try out hyperswitch on your system
 
-**NOTE:**
-This guide is aimed at users and developers who wish to set up hyperswitch on
-their local systems and requires quite some time and effort.
-If you'd prefer trying out hyperswitch quickly without the hassle of setting up
-all dependencies, you can [try out hyperswitch sandbox environment][try-sandbox].
-
-There are two options to set up hyperswitch on your system:
-
-1. Use Docker Compose
-2. Set up a Rust environment and other dependencies on your system
+The simplest way to run hyperswitch locally is
+[with Docker Compose](#run-hyperswitch-using-docker-compose) by pulling the
+latest images from Docker Hub.
+However, if you're willing to modify the code and run it, or are a developer
+contributing to hyperswitch, then you can either
+[set up a development environment using Docker Compose](#set-up-a-development-environment-using-docker-compose),
+or [set up a Rust environment on your system](#set-up-a-rust-environment-and-other-dependencies).
 
 Check the Table Of Contents to jump to the relevant section.
 
-[try-sandbox]: ./try_sandbox.md
-
 **Table Of Contents:**
 
-- [Set up hyperswitch using Docker Compose](#set-up-hyperswitch-using-docker-compose)
+- [Run hyperswitch using Docker Compose](#run-hyperswitch-using-docker-compose)
+  - [Run the scheduler and monitoring services](#run-the-scheduler-and-monitoring-services)
+- [Set up a development environment using Docker Compose](#set-up-a-development-environment-using-docker-compose)
 - [Set up a Rust environment and other dependencies](#set-up-a-rust-environment-and-other-dependencies)
   - [Set up dependencies on Ubuntu-based systems](#set-up-dependencies-on-ubuntu-based-systems)
   - [Set up dependencies on Windows (Ubuntu on WSL2)](#set-up-dependencies-on-windows-ubuntu-on-wsl2)
@@ -33,7 +30,7 @@ Check the Table Of Contents to jump to the relevant section.
   - [Create a Payment](#create-a-payment)
   - [Create a Refund](#create-a-refund)
 
-## Set up hyperswitch using Docker Compose
+## Run hyperswitch using Docker Compose
 
 1. Install [Docker Compose][docker-compose-install].
 2. Clone the repository and switch to the project directory:
@@ -54,15 +51,15 @@ Check the Table Of Contents to jump to the relevant section.
    docker compose up -d
    ```
 
-5. Run database migrations:
-
-   ```shell
-   docker compose run hyperswitch-server bash -c \
-      "cargo install diesel_cli && \
-      diesel migration --database-url postgres://db_user:db_pass@pg:5432/hyperswitch_db run"
-   ```
+   This should run the hyperswitch payments router, the primary component within
+   hyperswitch.
+   Wait for the `migration_runner` container to finish installing `diesel_cli`
+   and running migrations (approximately 2 minutes) before proceeding further.
+   You can also choose to
+   [run the scheduler and monitoring services](#run-the-scheduler-and-monitoring-services)
+   in addition to the payments router.
 
-6. Verify that the server is up and running by hitting the health endpoint:
+5. Verify that the server is up and running by hitting the health endpoint:
 
    ```shell
    curl --head --request GET 'http://localhost:8080/health'
@@ -71,9 +68,86 @@ Check the Table Of Contents to jump to the relevant section.
    If the command returned a `200 OK` status code, proceed with
    [trying out our APIs](#try-out-our-apis).
 
+### Run the scheduler and monitoring services
+
+You can run the scheduler and monitoring services by specifying suitable profile
+names to the above Docker Compose command.
+To understand more about the hyperswitch architecture and the components
+involved, check out the [architecture document][architecture].
+
+- To run the scheduler components (consumer and producer), you can specify
+  `--profile scheduler`:
+
+  ```shell
+  docker compose --profile scheduler up -d
+  ```
+
+- To run the monitoring services (Grafana, Promtail, Loki, Prometheus and Tempo),
+  you can specify `--profile monitoring`:
+
+  ```shell
+  docker compose --profile monitoring up -d
+  ```
+
+  You can then access Grafana at `http://localhost:3000` and view application
+  logs using the "Explore" tab, select Loki as the data source, and select the
+  container to query logs from.
+
+- You can also specify multiple profile names by specifying the `--profile` flag
+  multiple times.
+  To run both the scheduler components and monitoring services, the Docker
+  Compose command would be:
+
+  ```shell
+  docker compose --profile scheduler --profile monitoring up -d
+  ```
+
+Once the services have been confirmed to be up and running, you can proceed with
+[trying out our APIs](#try-out-our-apis)
+
 [docker-compose-install]: https://docs.docker.com/compose/install/
 [docker-compose-config]: /config/docker_compose.toml
 [docker-compose-yml]: /docker-compose.yml
+[architecture]: /docs/architecture.md
+
+## Set up a development environment using Docker Compose
+
+1. Install [Docker Compose][docker-compose-install].
+2. Clone the repository and switch to the project directory:
+
+   ```shell
+   git clone https://github.com/juspay/hyperswitch
+   cd hyperswitch
+   ```
+
+3. (Optional) Configure the application using the
+   [`config/docker_compose.toml`][docker-compose-config] file.
+   The provided configuration should work as is.
+   If you do update the `docker_compose.toml` file, ensure to also update the
+   corresponding values in the [`docker-compose.yml`][docker-compose-yml] file.
+4. Start all the services using Docker Compose:
+
+   ```shell
+   docker compose --file docker-compose-development.yml up -d
+   ```
+
+   This will compile the payments router, the primary component within
+   hyperswitch and then start it.
+   Depending on the specifications of your machine, compilation can take
+   around 15 minutes.
+
+5. (Optional) You can also choose to
+   [start the scheduler and/or monitoring services](#run-the-scheduler-and-monitoring-services)
+   in addition to the payments router.
+
+6. Verify that the server is up and running by hitting the health endpoint:
+
+   ```shell
+   curl --head --request GET 'http://localhost:8080/health'
+   ```
+
+   If the command returned a `200 OK` status code, proceed with
+   [trying out our APIs](#try-out-our-apis).
 
 ## Set up a Rust environment and other dependencies
 
@@ -134,7 +208,7 @@ for your distribution and follow along.
 4. Install `diesel_cli` using `cargo`:
 
    ```shell
-   cargo install diesel_cli --no-default-features --features "postgres"
+   cargo install diesel_cli --no-default-features --features postgres
    ```
 
 5. Make sure your system has the `pkg-config` package and OpenSSL installed:
@@ -224,7 +298,7 @@ packages for your distribution and follow along.
 6. Install `diesel_cli` using `cargo`:
 
    ```shell
-   cargo install diesel_cli --no-default-features --features "postgres"
+   cargo install diesel_cli --no-default-features --features postgres
    ```
 
 7. Make sure your system has the `pkg-config` package and OpenSSL installed:
@@ -260,7 +334,7 @@ You can opt to use your favorite package manager instead.
 4. Install `diesel_cli` using `cargo`:
 
    ```shell
-   cargo install diesel_cli --no-default-features --features "postgres"
+   cargo install diesel_cli --no-default-features --features postgres
    ```
 
 5. Install OpenSSL with `winget`:
@@ -322,7 +396,7 @@ You can opt to use your favorite package manager instead.
 4. Install `diesel_cli` using `cargo`:
 
    ```shell
-   cargo install diesel_cli --no-default-features --features "postgres"
+   cargo install diesel_cli --no-default-features --features postgres
    ```
 
    If linking `diesel_cli` fails due to missing `libpq` (if the error message is
@@ -333,7 +407,7 @@ You can opt to use your favorite package manager instead.
    brew install libpq
    export PQ_LIB_DIR="$(brew --prefix libpq)/lib"
 
-   cargo install diesel_cli --no-default-features --features "postgres"
+   cargo install diesel_cli --no-default-features --features postgres
    ```
 
    You may also choose to persist the value of `PQ_LIB_DIR` in your shell
diff --git a/loadtest/config/development.toml b/loadtest/config/development.toml
index 2fb729fb7b90..bec1074b99d0 100644
--- a/loadtest/config/development.toml
+++ b/loadtest/config/development.toml
@@ -34,6 +34,15 @@ host_rs = ""
 mock_locker = true
 basilisk_host = ""
 
+[forex_api]
+call_delay = 21600
+local_fetch_retry_count = 5
+local_fetch_retry_delay = 1000
+api_timeout = 20000
+api_key = "YOUR API KEY HERE"
+fallback_api_key = "YOUR API KEY HERE"
+redis_lock_timeout = 26000
+
 [eph_key]
 validity = 1
 
diff --git a/migrations/2023-11-23-100644_create_dashboard_metadata_table/down.sql b/migrations/2023-11-23-100644_create_dashboard_metadata_table/down.sql
new file mode 100644
index 000000000000..746fb42109e9
--- /dev/null
+++ b/migrations/2023-11-23-100644_create_dashboard_metadata_table/down.sql
@@ -0,0 +1,3 @@
+-- This file should undo anything in `up.sql`
+DROP INDEX IF EXISTS dashboard_metadata_index;
+DROP TABLE IF EXISTS dashboard_metadata;
\ No newline at end of file
diff --git a/migrations/2023-11-23-100644_create_dashboard_metadata_table/up.sql b/migrations/2023-11-23-100644_create_dashboard_metadata_table/up.sql
new file mode 100644
index 000000000000..8296f755f543
--- /dev/null
+++ b/migrations/2023-11-23-100644_create_dashboard_metadata_table/up.sql
@@ -0,0 +1,15 @@
+-- Your SQL goes here
+CREATE TABLE IF NOT EXISTS dashboard_metadata (
+    id SERIAL PRIMARY KEY,
+    user_id VARCHAR(64),
+    merchant_id VARCHAR(64) NOT NULL,
+    org_id VARCHAR(64) NOT NULL,
+    data_key VARCHAR(64) NOT NULL,
+    data_value JSON NOT NULL,
+    created_by VARCHAR(64) NOT NULL,
+	created_at TIMESTAMP NOT NULL DEFAULT now(),
+	last_modified_by VARCHAR(64) NOT NULL,
+	last_modified_at TIMESTAMP NOT NULL DEFAULT now()
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS dashboard_metadata_index ON dashboard_metadata (COALESCE(user_id,'0'), merchant_id, org_id, data_key);
\ No newline at end of file
diff --git a/migrations/2023-11-28-081058_add-request_incremental_authorization-in-payment-intent/down.sql b/migrations/2023-11-28-081058_add-request_incremental_authorization-in-payment-intent/down.sql
new file mode 100644
index 000000000000..5ee12132dee6
--- /dev/null
+++ b/migrations/2023-11-28-081058_add-request_incremental_authorization-in-payment-intent/down.sql
@@ -0,0 +1,3 @@
+-- This file should undo anything in `up.sql`
+ALTER TABLE payment_intent DROP COLUMN IF EXISTS request_incremental_authorization;
+DROP TYPE "RequestIncrementalAuthorization";
diff --git a/migrations/2023-11-28-081058_add-request_incremental_authorization-in-payment-intent/up.sql b/migrations/2023-11-28-081058_add-request_incremental_authorization-in-payment-intent/up.sql
new file mode 100644
index 000000000000..2c4d68593588
--- /dev/null
+++ b/migrations/2023-11-28-081058_add-request_incremental_authorization-in-payment-intent/up.sql
@@ -0,0 +1,3 @@
+-- Your SQL goes here
+CREATE TYPE "RequestIncrementalAuthorization" AS ENUM ('true', 'false', 'default');
+ALTER TABLE payment_intent ADD COLUMN IF NOT EXISTS request_incremental_authorization "RequestIncrementalAuthorization" NOT NULL DEFAULT 'false'::"RequestIncrementalAuthorization";
diff --git a/migrations/2023-11-29-063030_add-incremental_authorization_allowed-in-payment-intent/down.sql b/migrations/2023-11-29-063030_add-incremental_authorization_allowed-in-payment-intent/down.sql
new file mode 100644
index 000000000000..f08165481889
--- /dev/null
+++ b/migrations/2023-11-29-063030_add-incremental_authorization_allowed-in-payment-intent/down.sql
@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+ALTER TABLE payment_intent DROP COLUMN IF EXISTS incremental_authorization_allowed;
\ No newline at end of file
diff --git a/migrations/2023-11-29-063030_add-incremental_authorization_allowed-in-payment-intent/up.sql b/migrations/2023-11-29-063030_add-incremental_authorization_allowed-in-payment-intent/up.sql
new file mode 100644
index 000000000000..73fe22dd52df
--- /dev/null
+++ b/migrations/2023-11-29-063030_add-incremental_authorization_allowed-in-payment-intent/up.sql
@@ -0,0 +1,2 @@
+-- Your SQL goes here
+ALTER TABLE payment_intent ADD COLUMN IF NOT EXISTS incremental_authorization_allowed BOOLEAN;
\ No newline at end of file
diff --git a/openapi/openapi_spec.json b/openapi/openapi_spec.json
index 4a8037ea20d1..430c13355500 100644
--- a/openapi/openapi_spec.json
+++ b/openapi/openapi_spec.json
@@ -129,6 +129,259 @@
         ]
       }
     },
+    "/accounts/{account_id}/connectors": {
+      "get": {
+        "tags": [
+          "Merchant Connector Account"
+        ],
+        "summary": "Merchant Connector - List",
+        "description": "Merchant Connector - List\n\nList Merchant Connector Details for the merchant",
+        "operationId": "List all Merchant Connectors",
+        "parameters": [
+          {
+            "name": "account_id",
+            "in": "path",
+            "description": "The unique identifier for the merchant account",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Merchant Connector list retrieved successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/MerchantConnectorResponse"
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized request"
+          },
+          "404": {
+            "description": "Merchant Connector does not exist in records"
+          }
+        },
+        "security": [
+          {
+            "admin_api_key": []
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "Merchant Connector Account"
+        ],
+        "summary": "Merchant Connector - Create",
+        "description": "Merchant Connector - Create\n\nCreate a new Merchant Connector for the merchant account. The connector could be a payment processor / facilitator / acquirer or specialized services like Fraud / Accounting etc.\"",
+        "operationId": "Create a Merchant Connector",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MerchantConnectorCreate"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Merchant Connector Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MerchantConnectorResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Missing Mandatory fields"
+          }
+        },
+        "security": [
+          {
+            "admin_api_key": []
+          }
+        ]
+      }
+    },
+    "/accounts/{account_id}/connectors/{connector_id}": {
+      "get": {
+        "tags": [
+          "Merchant Connector Account"
+        ],
+        "summary": "Merchant Connector - Retrieve",
+        "description": "Merchant Connector - Retrieve\n\nRetrieve Merchant Connector Details",
+        "operationId": "Retrieve a Merchant Connector",
+        "parameters": [
+          {
+            "name": "account_id",
+            "in": "path",
+            "description": "The unique identifier for the merchant account",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "connector_id",
+            "in": "path",
+            "description": "The unique identifier for the Merchant Connector",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Merchant Connector retrieved successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MerchantConnectorResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized request"
+          },
+          "404": {
+            "description": "Merchant Connector does not exist in records"
+          }
+        },
+        "security": [
+          {
+            "admin_api_key": []
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "Merchant Connector Account"
+        ],
+        "summary": "Merchant Connector - Update",
+        "description": "Merchant Connector - Update\n\nTo update an existing Merchant Connector. Helpful in enabling / disabling different payment methods and other settings for the connector etc.",
+        "operationId": "Update a Merchant Connector",
+        "parameters": [
+          {
+            "name": "account_id",
+            "in": "path",
+            "description": "The unique identifier for the merchant account",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "connector_id",
+            "in": "path",
+            "description": "The unique identifier for the Merchant Connector",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MerchantConnectorUpdate"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Merchant Connector Updated",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MerchantConnectorResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized request"
+          },
+          "404": {
+            "description": "Merchant Connector does not exist in records"
+          }
+        },
+        "security": [
+          {
+            "admin_api_key": []
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "Merchant Connector Account"
+        ],
+        "summary": "Merchant Connector - Delete",
+        "description": "Merchant Connector - Delete\n\nDelete or Detach a Merchant Connector from Merchant Account",
+        "operationId": "Delete a Merchant Connector",
+        "parameters": [
+          {
+            "name": "account_id",
+            "in": "path",
+            "description": "The unique identifier for the merchant account",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "connector_id",
+            "in": "path",
+            "description": "The unique identifier for the Merchant Connector",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Merchant Connector Deleted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MerchantConnectorDeleteResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized request"
+          },
+          "404": {
+            "description": "Merchant Connector does not exist in records"
+          }
+        },
+        "security": [
+          {
+            "admin_api_key": []
+          }
+        ]
+      }
+    },
     "/customers": {
       "post": {
         "tags": [
@@ -4074,6 +4327,19 @@
           }
         ]
       },
+      "CardToken": {
+        "type": "object",
+        "required": [
+          "card_holder_name"
+        ],
+        "properties": {
+          "card_holder_name": {
+            "type": "string",
+            "description": "The card holder's name",
+            "example": "John Test"
+          }
+        }
+      },
       "CashappQr": {
         "type": "object"
       },
@@ -8647,6 +8913,17 @@
                 "$ref": "#/components/schemas/GiftCardData"
               }
             }
+          },
+          {
+            "type": "object",
+            "required": [
+              "card_token"
+            ],
+            "properties": {
+              "card_token": {
+                "$ref": "#/components/schemas/CardToken"
+              }
+            }
           }
         ]
       },
@@ -9437,6 +9714,11 @@
               }
             ],
             "nullable": true
+          },
+          "request_incremental_authorization": {
+            "type": "boolean",
+            "description": "Request for an incremental authorization",
+            "nullable": true
           }
         }
       },
@@ -9806,6 +10088,11 @@
               }
             ],
             "nullable": true
+          },
+          "request_incremental_authorization": {
+            "type": "boolean",
+            "description": "Request for an incremental authorization",
+            "nullable": true
           }
         }
       },
@@ -10239,6 +10526,11 @@
             "type": "string",
             "description": "Identifier of the connector ( merchant connector account ) which was chosen to make the payment",
             "nullable": true
+          },
+          "incremental_authorization_allowed": {
+            "type": "boolean",
+            "description": "If true incremental authorization can be performed on this payment",
+            "nullable": true
           }
         }
       },
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/.meta.json b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/.meta.json
new file mode 100644
index 000000000000..69b505c6d863
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/.meta.json	
@@ -0,0 +1,3 @@
+{
+  "childrenOrder": ["Payments - Create", "Payments - Retrieve"]
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/.event.meta.json b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/.event.meta.json
new file mode 100644
index 000000000000..0731450e6b25
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/.event.meta.json	
@@ -0,0 +1,3 @@
+{
+  "eventOrder": ["event.test.js"]
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/event.test.js b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/event.test.js
new file mode 100644
index 000000000000..c48d8e2d054e
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/event.test.js	
@@ -0,0 +1,71 @@
+// Validate status 2xx
+pm.test("[POST]::/payments - Status code is 2xx", function () {
+  pm.response.to.be.success;
+});
+
+// Validate if response header has matching content-type
+pm.test("[POST]::/payments - Content-Type is application/json", function () {
+  pm.expect(pm.response.headers.get("Content-Type")).to.include(
+    "application/json",
+  );
+});
+
+// Validate if response has JSON Body
+pm.test("[POST]::/payments - Response has JSON Body", function () {
+  pm.response.to.have.jsonBody();
+});
+
+// Set response object as internal variable
+let jsonData = {};
+try {
+  jsonData = pm.response.json();
+} catch (e) {}
+
+// pm.collectionVariables - Set payment_id as variable for jsonData.payment_id
+if (jsonData?.payment_id) {
+  pm.collectionVariables.set("payment_id", jsonData.payment_id);
+  console.log(
+    "- use {{payment_id}} as collection variable for value",
+    jsonData.payment_id,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{payment_id}}, as jsonData.payment_id is undefined.",
+  );
+}
+
+// pm.collectionVariables - Set mandate_id as variable for jsonData.mandate_id
+if (jsonData?.mandate_id) {
+  pm.collectionVariables.set("mandate_id", jsonData.mandate_id);
+  console.log(
+    "- use {{mandate_id}} as collection variable for value",
+    jsonData.mandate_id,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{mandate_id}}, as jsonData.mandate_id is undefined.",
+  );
+}
+
+// pm.collectionVariables - Set client_secret as variable for jsonData.client_secret
+if (jsonData?.client_secret) {
+  pm.collectionVariables.set("client_secret", jsonData.client_secret);
+  console.log(
+    "- use {{client_secret}} as collection variable for value",
+    jsonData.client_secret,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{client_secret}}, as jsonData.client_secret is undefined.",
+  );
+}
+
+// Response body should have value "succeeded" for "status"
+if (jsonData?.status) {
+  pm.test(
+    "[POST]::/payments - Content check if value for 'status' matches 'succeeded'",
+    function () {
+      pm.expect(jsonData.status).to.eql("succeeded");
+    },
+  );
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/request.json b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/request.json
new file mode 100644
index 000000000000..0915e9894bb6
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/request.json	
@@ -0,0 +1,88 @@
+{
+  "method": "POST",
+  "header": [
+    {
+      "key": "Content-Type",
+      "value": "application/json"
+    },
+    {
+      "key": "Accept",
+      "value": "application/json"
+    }
+  ],
+  "body": {
+    "mode": "raw",
+    "options": {
+      "raw": {
+        "language": "json"
+      }
+    },
+    "raw_json_formatted": {
+      "amount": 1100,
+      "currency": "EUR",
+      "confirm": true,
+      "capture_method": "automatic",
+      "capture_on": "2022-09-10T10:11:12Z",
+      "amount_to_capture": 1100,
+      "customer_id": "StripeCustomer",
+      "email": "guest@example.com",
+      "name": "John Doe",
+      "phone": "999999999",
+      "phone_country_code": "+65",
+      "description": "Its my first payment request",
+      "authentication_type": "no_three_ds",
+      "return_url": "https://duck.com",
+      "payment_method": "gift_card",
+      "payment_method_type": "givex",
+      "payment_method_data": {
+          "gift_card": {
+              "givex": {
+                  "number": "6364530000000000",
+                  "cvc": "122222"
+              }
+          }
+      },
+      "routing": {
+        "type": "single",
+        "data": "adyen"
+      },
+      "billing": {
+        "address": {
+          "line1": "1467",
+          "line2": "Harrison Street",
+          "line3": "Harrison Street",
+          "city": "San Fransico",
+          "state": "California",
+          "zip": "94122",
+          "country": "US",
+          "first_name": "PiX"
+        }
+      },
+      "shipping": {
+        "address": {
+          "line1": "1467",
+          "line2": "Harrison Street",
+          "line3": "Harrison Street",
+          "city": "San Fransico",
+          "state": "California",
+          "zip": "94122",
+          "country": "US",
+          "first_name": "PiX"
+        }
+      },
+      "statement_descriptor_name": "joseph",
+      "statement_descriptor_suffix": "JS",
+      "metadata": {
+        "udf1": "value1",
+        "new_customer": "true",
+        "login_date": "2019-09-10T10:11:12Z"
+      }
+    }
+  },
+  "url": {
+    "raw": "{{baseUrl}}/payments",
+    "host": ["{{baseUrl}}"],
+    "path": ["payments"]
+  },
+  "description": "To process a payment you will have to create a payment, attach a payment method and confirm. Depending on the user journey you wish to achieve, you may opt to all the steps in a single request or in a sequence of API request using following APIs: (i) Payments - Update, (ii) Payments - Confirm, and (iii) Payments - Capture"
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/response.json b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/response.json
new file mode 100644
index 000000000000..fe51488c7066
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Create/response.json	
@@ -0,0 +1 @@
+[]
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/.event.meta.json b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/.event.meta.json
new file mode 100644
index 000000000000..0731450e6b25
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/.event.meta.json	
@@ -0,0 +1,3 @@
+{
+  "eventOrder": ["event.test.js"]
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/event.test.js b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/event.test.js
new file mode 100644
index 000000000000..0652a2d92fd4
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/event.test.js	
@@ -0,0 +1,71 @@
+// Validate status 2xx
+pm.test("[GET]::/payments/:id - Status code is 2xx", function () {
+  pm.response.to.be.success;
+});
+
+// Validate if response header has matching content-type
+pm.test("[GET]::/payments/:id - Content-Type is application/json", function () {
+  pm.expect(pm.response.headers.get("Content-Type")).to.include(
+    "application/json",
+  );
+});
+
+// Validate if response has JSON Body
+pm.test("[GET]::/payments/:id - Response has JSON Body", function () {
+  pm.response.to.have.jsonBody();
+});
+
+// Set response object as internal variable
+let jsonData = {};
+try {
+  jsonData = pm.response.json();
+} catch (e) {}
+
+// pm.collectionVariables - Set payment_id as variable for jsonData.payment_id
+if (jsonData?.payment_id) {
+  pm.collectionVariables.set("payment_id", jsonData.payment_id);
+  console.log(
+    "- use {{payment_id}} as collection variable for value",
+    jsonData.payment_id,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{payment_id}}, as jsonData.payment_id is undefined.",
+  );
+}
+
+// pm.collectionVariables - Set mandate_id as variable for jsonData.mandate_id
+if (jsonData?.mandate_id) {
+  pm.collectionVariables.set("mandate_id", jsonData.mandate_id);
+  console.log(
+    "- use {{mandate_id}} as collection variable for value",
+    jsonData.mandate_id,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{mandate_id}}, as jsonData.mandate_id is undefined.",
+  );
+}
+
+// pm.collectionVariables - Set client_secret as variable for jsonData.client_secret
+if (jsonData?.client_secret) {
+  pm.collectionVariables.set("client_secret", jsonData.client_secret);
+  console.log(
+    "- use {{client_secret}} as collection variable for value",
+    jsonData.client_secret,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{client_secret}}, as jsonData.client_secret is undefined.",
+  );
+}
+
+// Response body should have value "Succeeded" for "status"
+if (jsonData?.status) {
+  pm.test(
+    "[POST]::/payments/:id - Content check if value for 'status' matches 'succeeded'",
+    function () {
+      pm.expect(jsonData.status).to.eql("succeeded");
+    },
+  );
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/request.json b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/request.json
new file mode 100644
index 000000000000..6cd4b7d96c52
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/request.json	
@@ -0,0 +1,28 @@
+{
+  "method": "GET",
+  "header": [
+    {
+      "key": "Accept",
+      "value": "application/json"
+    }
+  ],
+  "url": {
+    "raw": "{{baseUrl}}/payments/:id?force_sync=true",
+    "host": ["{{baseUrl}}"],
+    "path": ["payments", ":id"],
+    "query": [
+      {
+        "key": "force_sync",
+        "value": "true"
+      }
+    ],
+    "variable": [
+      {
+        "key": "id",
+        "value": "{{payment_id}}",
+        "description": "(Required) unique payment id"
+      }
+    ]
+  },
+  "description": "To retrieve the properties of a Payment. This may be used to get the status of a previously initiated payment or next action for an ongoing payment"
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/response.json b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/response.json
new file mode 100644
index 000000000000..fe51488c7066
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Happy Cases/Scenario22-Create Gift Card payment/Payments - Retrieve/response.json	
@@ -0,0 +1 @@
+[]
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/QuickStart/Payment Connector - Create/request.json b/postman/collection-dir/adyen_uk/Flow Testcases/QuickStart/Payment Connector - Create/request.json
index 592cff807510..fe25f6f5e682 100644
--- a/postman/collection-dir/adyen_uk/Flow Testcases/QuickStart/Payment Connector - Create/request.json	
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/QuickStart/Payment Connector - Create/request.json	
@@ -190,6 +190,18 @@
             }
           ]
         },
+        {
+          "payment_method": "gift_card",
+          "payment_method_types": [
+              {
+                  "payment_method_type": "givex",
+                  "minimum_amount": 1,
+                  "maximum_amount": 68607706,
+                  "recurring_enabled": true,
+                  "installment_payment_enabled": true
+              }
+          ]
+      },
         {
           "payment_method": "bank_redirect",
           "payment_method_types": [
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/QuickStart/Payments - Create/request.json b/postman/collection-dir/adyen_uk/Flow Testcases/QuickStart/Payments - Create/request.json
index 8ac3ed14b0a7..ed9dbeaa9c49 100644
--- a/postman/collection-dir/adyen_uk/Flow Testcases/QuickStart/Payments - Create/request.json	
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/QuickStart/Payments - Create/request.json	
@@ -43,6 +43,10 @@
           "card_cvc": "7373"
         }
       },
+      "routing": {
+        "type": "single",
+        "data": "adyen"
+      },
       "billing": {
         "address": {
           "line1": "1467",
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/.meta.json b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/.meta.json
new file mode 100644
index 000000000000..69b505c6d863
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/.meta.json	
@@ -0,0 +1,3 @@
+{
+  "childrenOrder": ["Payments - Create", "Payments - Retrieve"]
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/.event.meta.json b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/.event.meta.json
new file mode 100644
index 000000000000..0731450e6b25
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/.event.meta.json	
@@ -0,0 +1,3 @@
+{
+  "eventOrder": ["event.test.js"]
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/event.test.js b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/event.test.js
new file mode 100644
index 000000000000..601f4f8fa7f5
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/event.test.js	
@@ -0,0 +1,81 @@
+// Validate status 2xx
+pm.test("[POST]::/payments - Status code is 2xx", function () {
+  pm.response.to.be.success;
+});
+
+// Validate if response header has matching content-type
+pm.test("[POST]::/payments - Content-Type is application/json", function () {
+  pm.expect(pm.response.headers.get("Content-Type")).to.include(
+    "application/json",
+  );
+});
+
+// Validate if response has JSON Body
+pm.test("[POST]::/payments - Response has JSON Body", function () {
+  pm.response.to.have.jsonBody();
+});
+
+// Set response object as internal variable
+let jsonData = {};
+try {
+  jsonData = pm.response.json();
+} catch (e) {}
+
+// pm.collectionVariables - Set payment_id as variable for jsonData.payment_id
+if (jsonData?.payment_id) {
+  pm.collectionVariables.set("payment_id", jsonData.payment_id);
+  console.log(
+    "- use {{payment_id}} as collection variable for value",
+    jsonData.payment_id,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{payment_id}}, as jsonData.payment_id is undefined.",
+  );
+}
+
+// pm.collectionVariables - Set mandate_id as variable for jsonData.mandate_id
+if (jsonData?.mandate_id) {
+  pm.collectionVariables.set("mandate_id", jsonData.mandate_id);
+  console.log(
+    "- use {{mandate_id}} as collection variable for value",
+    jsonData.mandate_id,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{mandate_id}}, as jsonData.mandate_id is undefined.",
+  );
+}
+
+// pm.collectionVariables - Set client_secret as variable for jsonData.client_secret
+if (jsonData?.client_secret) {
+  pm.collectionVariables.set("client_secret", jsonData.client_secret);
+  console.log(
+    "- use {{client_secret}} as collection variable for value",
+    jsonData.client_secret,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{client_secret}}, as jsonData.client_secret is undefined.",
+  );
+}
+
+// Response body should have value "failed" for "status"
+if (jsonData?.status) {
+  pm.test(
+    "[POST]::/payments - Content check if value for 'status' matches 'failed'",
+    function () {
+      pm.expect(jsonData.status).to.eql("failed");
+    },
+  );
+}
+
+// Response body should have error message as "Insufficient balance in the payment method"
+if (jsonData?.error_message) {
+  pm.test(
+    "[POST]::/payments - Content check if value for 'error_message' matches 'Insufficient balance in the payment method'",
+    function () {
+      pm.expect(jsonData.error_message).to.eql("Insufficient balance in the payment method");
+    },
+  );
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/request.json b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/request.json
new file mode 100644
index 000000000000..11437ff57659
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/request.json	
@@ -0,0 +1,88 @@
+{
+  "method": "POST",
+  "header": [
+    {
+      "key": "Content-Type",
+      "value": "application/json"
+    },
+    {
+      "key": "Accept",
+      "value": "application/json"
+    }
+  ],
+  "body": {
+    "mode": "raw",
+    "options": {
+      "raw": {
+        "language": "json"
+      }
+    },
+    "raw_json_formatted": {
+      "amount": 14100,
+      "currency": "EUR",
+      "confirm": true,
+      "capture_method": "automatic",
+      "capture_on": "2022-09-10T10:11:12Z",
+      "amount_to_capture": 14100,
+      "customer_id": "StripeCustomer",
+      "email": "guest@example.com",
+      "name": "John Doe",
+      "phone": "999999999",
+      "phone_country_code": "+65",
+      "description": "Its my first payment request",
+      "authentication_type": "no_three_ds",
+      "return_url": "https://duck.com",
+      "payment_method": "gift_card",
+      "payment_method_type": "givex",
+      "payment_method_data": {
+          "gift_card": {
+              "givex": {
+                  "number": "6364530000000000",
+                  "cvc": "122222"
+              }
+          }
+      },
+      "routing": {
+        "type": "single",
+        "data": "adyen"
+      },
+      "billing": {
+        "address": {
+          "line1": "1467",
+          "line2": "Harrison Street",
+          "line3": "Harrison Street",
+          "city": "San Fransico",
+          "state": "California",
+          "zip": "94122",
+          "country": "US",
+          "first_name": "PiX"
+        }
+      },
+      "shipping": {
+        "address": {
+          "line1": "1467",
+          "line2": "Harrison Street",
+          "line3": "Harrison Street",
+          "city": "San Fransico",
+          "state": "California",
+          "zip": "94122",
+          "country": "US",
+          "first_name": "PiX"
+        }
+      },
+      "statement_descriptor_name": "joseph",
+      "statement_descriptor_suffix": "JS",
+      "metadata": {
+        "udf1": "value1",
+        "new_customer": "true",
+        "login_date": "2019-09-10T10:11:12Z"
+      }
+    }
+  },
+  "url": {
+    "raw": "{{baseUrl}}/payments",
+    "host": ["{{baseUrl}}"],
+    "path": ["payments"]
+  },
+  "description": "To process a payment you will have to create a payment, attach a payment method and confirm. Depending on the user journey you wish to achieve, you may opt to all the steps in a single request or in a sequence of API request using following APIs: (i) Payments - Update, (ii) Payments - Confirm, and (iii) Payments - Capture"
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/response.json b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/response.json
new file mode 100644
index 000000000000..fe51488c7066
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Create/response.json	
@@ -0,0 +1 @@
+[]
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/.event.meta.json b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/.event.meta.json
new file mode 100644
index 000000000000..0731450e6b25
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/.event.meta.json	
@@ -0,0 +1,3 @@
+{
+  "eventOrder": ["event.test.js"]
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/event.test.js b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/event.test.js
new file mode 100644
index 000000000000..ff2099305d7a
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/event.test.js	
@@ -0,0 +1,71 @@
+// Validate status 2xx
+pm.test("[GET]::/payments/:id - Status code is 2xx", function () {
+  pm.response.to.be.success;
+});
+
+// Validate if response header has matching content-type
+pm.test("[GET]::/payments/:id - Content-Type is application/json", function () {
+  pm.expect(pm.response.headers.get("Content-Type")).to.include(
+    "application/json",
+  );
+});
+
+// Validate if response has JSON Body
+pm.test("[GET]::/payments/:id - Response has JSON Body", function () {
+  pm.response.to.have.jsonBody();
+});
+
+// Set response object as internal variable
+let jsonData = {};
+try {
+  jsonData = pm.response.json();
+} catch (e) {}
+
+// pm.collectionVariables - Set payment_id as variable for jsonData.payment_id
+if (jsonData?.payment_id) {
+  pm.collectionVariables.set("payment_id", jsonData.payment_id);
+  console.log(
+    "- use {{payment_id}} as collection variable for value",
+    jsonData.payment_id,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{payment_id}}, as jsonData.payment_id is undefined.",
+  );
+}
+
+// pm.collectionVariables - Set mandate_id as variable for jsonData.mandate_id
+if (jsonData?.mandate_id) {
+  pm.collectionVariables.set("mandate_id", jsonData.mandate_id);
+  console.log(
+    "- use {{mandate_id}} as collection variable for value",
+    jsonData.mandate_id,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{mandate_id}}, as jsonData.mandate_id is undefined.",
+  );
+}
+
+// pm.collectionVariables - Set client_secret as variable for jsonData.client_secret
+if (jsonData?.client_secret) {
+  pm.collectionVariables.set("client_secret", jsonData.client_secret);
+  console.log(
+    "- use {{client_secret}} as collection variable for value",
+    jsonData.client_secret,
+  );
+} else {
+  console.log(
+    "INFO - Unable to assign variable {{client_secret}}, as jsonData.client_secret is undefined.",
+  );
+}
+
+// Response body should have value "Failed" for "status"
+if (jsonData?.status) {
+  pm.test(
+    "[POST]::/payments/:id - Content check if value for 'status' matches 'failed'",
+    function () {
+      pm.expect(jsonData.status).to.eql("failed");
+    },
+  );
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/request.json b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/request.json
new file mode 100644
index 000000000000..6cd4b7d96c52
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/request.json	
@@ -0,0 +1,28 @@
+{
+  "method": "GET",
+  "header": [
+    {
+      "key": "Accept",
+      "value": "application/json"
+    }
+  ],
+  "url": {
+    "raw": "{{baseUrl}}/payments/:id?force_sync=true",
+    "host": ["{{baseUrl}}"],
+    "path": ["payments", ":id"],
+    "query": [
+      {
+        "key": "force_sync",
+        "value": "true"
+      }
+    ],
+    "variable": [
+      {
+        "key": "id",
+        "value": "{{payment_id}}",
+        "description": "(Required) unique payment id"
+      }
+    ]
+  },
+  "description": "To retrieve the properties of a Payment. This may be used to get the status of a previously initiated payment or next action for an ongoing payment"
+}
diff --git a/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/response.json b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/response.json
new file mode 100644
index 000000000000..fe51488c7066
--- /dev/null
+++ b/postman/collection-dir/adyen_uk/Flow Testcases/Variation Cases/Scenario10-Create Gift Card payment where it fails due to insufficient balance/Payments - Retrieve/response.json	
@@ -0,0 +1 @@
+[]
diff --git a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario1-Create payment with confirm true/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario1-Create payment with confirm true/Payments - Create/request.json
index a63210df7f42..03aea095ff35 100644
--- a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario1-Create payment with confirm true/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario1-Create payment with confirm true/Payments - Create/request.json	
@@ -79,7 +79,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario2-Create payment with confirm false/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario2-Create payment with confirm false/Payments - Create/request.json
index 99392fc0f916..5a651cc0f119 100644
--- a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario2-Create payment with confirm false/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario2-Create payment with confirm false/Payments - Create/request.json	
@@ -79,7 +79,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario3-Create payment without PMD/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario3-Create payment without PMD/Payments - Create/request.json
index 90982e5acd38..54cf1b15e3db 100644
--- a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario3-Create payment without PMD/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario3-Create payment without PMD/Payments - Create/request.json	
@@ -69,7 +69,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario4-Create payment with Manual capture/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario4-Create payment with Manual capture/Payments - Create/request.json
index 0fc567f8bea0..f0915480e13e 100644
--- a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario4-Create payment with Manual capture/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario4-Create payment with Manual capture/Payments - Create/request.json	
@@ -79,7 +79,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario5-Refund full payment/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario5-Refund full payment/Payments - Create/request.json
index 625ae3a9d286..00b12f40997f 100644
--- a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario5-Refund full payment/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario5-Refund full payment/Payments - Create/request.json	
@@ -78,7 +78,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario7-Void the payment/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario7-Void the payment/Payments - Create/request.json
index 99392fc0f916..5a651cc0f119 100644
--- a/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario7-Void the payment/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Happy Cases/Scenario7-Void the payment/Payments - Create/request.json	
@@ -79,7 +79,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/QuickStart/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/QuickStart/Payments - Create/request.json
index a99d3db4fa53..72c62f360b8d 100644
--- a/postman/collection-dir/payme/Flow Testcases/QuickStart/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/QuickStart/Payments - Create/request.json	
@@ -79,7 +79,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario3-Capture greater amount/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario3-Capture greater amount/Payments - Create/request.json
index 0fc567f8bea0..f0915480e13e 100644
--- a/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario3-Capture greater amount/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario3-Capture greater amount/Payments - Create/request.json	
@@ -79,7 +79,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario4-Capture the succeeded payment/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario4-Capture the succeeded payment/Payments - Create/request.json
index a63210df7f42..03aea095ff35 100644
--- a/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario4-Capture the succeeded payment/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario4-Capture the succeeded payment/Payments - Create/request.json	
@@ -79,7 +79,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario5-Void the success_slash_failure payment/Payments - Create/request.json b/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario5-Void the success_slash_failure payment/Payments - Create/request.json
index a63210df7f42..03aea095ff35 100644
--- a/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario5-Void the success_slash_failure payment/Payments - Create/request.json	
+++ b/postman/collection-dir/payme/Flow Testcases/Variation Cases/Scenario5-Void the success_slash_failure payment/Payments - Create/request.json	
@@ -79,7 +79,7 @@
         {
           "product_name": "Apple iphone 15",
           "quantity": 1,
-          "amount": 5500,
+          "amount": 6540,
           "account_name": "transaction_processing"
         }
       ]
diff --git a/postman/collection-json/adyen_uk.postman_collection.json b/postman/collection-json/adyen_uk.postman_collection.json
index 33aadeb6f970..400f04241c27 100644
--- a/postman/collection-json/adyen_uk.postman_collection.json
+++ b/postman/collection-json/adyen_uk.postman_collection.json
@@ -472,7 +472,7 @@
                       "language": "json"
                     }
                   },
-                  "raw": "{\"connector_type\":\"fiz_operations\",\"connector_name\":\"adyen\",\"connector_account_details\":{\"auth_type\":\"BodyKey\",\"api_key\":\"{{connector_api_key}}\",\"key1\":\"{{connector_key1}}\",\"api_secret\":\"{{connector_api_secret}}\"},\"test_mode\":false,\"disabled\":false,\"business_country\":\"US\",\"business_label\":\"default\",\"payment_methods_enabled\":[{\"payment_method\":\"card\",\"payment_method_types\":[{\"payment_method_type\":\"credit\",\"card_networks\":[\"Visa\",\"Mastercard\"],\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"debit\",\"card_networks\":[\"Visa\",\"Mastercard\"],\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"pay_later\",\"payment_method_types\":[{\"payment_method_type\":\"klarna\",\"payment_experience\":\"redirect_to_url\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"affirm\",\"payment_experience\":\"redirect_to_url\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"afterpay_clearpay\",\"payment_experience\":\"redirect_to_url\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"pay_bright\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"walley\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"wallet\",\"payment_method_types\":[{\"payment_method_type\":\"paypal\",\"payment_experience\":\"redirect_to_url\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"google_pay\",\"payment_experience\":\"invoke_sdk_client\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"apple_pay\",\"payment_experience\":\"invoke_sdk_client\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"mobile_pay\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"ali_pay\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"we_chat_pay\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"mb_way\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"bank_redirect\",\"payment_method_types\":[{\"payment_method_type\":\"giropay\",\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"eps\",\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"sofort\",\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"blik\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"trustly\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"online_banking_czech_republic\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"online_banking_finland\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"online_banking_poland\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"online_banking_slovakia\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"bancontact_card\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"bank_debit\",\"payment_method_types\":[{\"payment_method_type\":\"ach\",\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"bacs\",\"recurring_enabled\":true,\"installment_payment_enabled\":true}]}],\"metadata\":{\"google_pay\":{\"allowed_payment_methods\":[{\"type\":\"CARD\",\"parameters\":{\"allowed_auth_methods\":[\"PAN_ONLY\",\"CRYPTOGRAM_3DS\"],\"allowed_card_networks\":[\"AMEX\",\"DISCOVER\",\"INTERAC\",\"JCB\",\"MASTERCARD\",\"VISA\"]},\"tokenization_specification\":{\"type\":\"PAYMENT_GATEWAY\"}}],\"merchant_info\":{\"merchant_name\":\"Narayan Bhat\"}},\"apple_pay\":{\"session_token_data\":{\"initiative\":\"web\",\"certificate\":\"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUdKakNDQlE2Z0F3SUJBZ0lRRENzRmFrVkNLU01uc2JacTc1YTI0ekFOQmdrcWhraUc5dzBCQVFzRkFEQjEKTVVRd1FnWURWUVFERER0QmNIQnNaU0JYYjNKc1pIZHBaR1VnUkdWMlpXeHZjR1Z5SUZKbGJHRjBhVzl1Y3lCRApaWEowYVdacFkyRjBhVzl1SUVGMWRHaHZjbWwwZVRFTE1Ba0dBMVVFQ3d3Q1J6TXhFekFSQmdOVkJBb01Da0Z3CmNHeGxJRWx1WXk0eEN6QUpCZ05WQkFZVEFsVlRNQjRYRFRJeU1USXdPREE1TVRJeE1Wb1hEVEkxTURFd05qQTUKTVRJeE1Gb3dnYWd4SmpBa0Jnb0praWFKay9Jc1pBRUJEQlp0WlhKamFHRnVkQzVqYjIwdVlXUjVaVzR1YzJGdQpNVHN3T1FZRFZRUUREREpCY0hCc1pTQlFZWGtnVFdWeVkyaGhiblFnU1dSbGJuUnBkSGs2YldWeVkyaGhiblF1ClkyOXRMbUZrZVdWdUxuTmhiakVUTUJFR0ExVUVDd3dLV1UwNVZUY3pXakpLVFRFc01Db0dBMVVFQ2d3alNsVlQKVUVGWklGUkZRMGhPVDB4UFIwbEZVeUJRVWtsV1FWUkZJRXhKVFVsVVJVUXdnZ0VpTUEwR0NTcUdTSWIzRFFFQgpBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRRDhIUy81ZmJZNVJLaElYU3pySEpoeTVrNmY0YUdMaEltYklLaXFYRUlUCnVSQ2RHcGcyMExZM1VhTlBlYXZXTVRIUTBpK3d1RzlZWFVhYzV5eGE0cHg5eHlmQlVIejhzeU9pMjdYNVZaVG8KTlFhd2F6dGM5aGpZc1B2K0s2UW9oaWRTQWZ3cDhMdThkQ0lVZlhQWHBjdjFqVVRyRCtlc1RJTFZUb1FUTmhDcwplQlJtUS9nK05WdTB5c3BqeUYxU2l6VG9BK1BML3NrMlJEYWNaWC9vWTB1R040VWd4c0JYWHdZM0dKbTFSQ3B1CjM0Y2d0UC9kaHNBM1Ixb1VOb0gyQkZBSm9xK3pyUnl3U1RCSEhNMGpEQ2lncVU1RktwL1pBbHdzYmg1WVZOU00KWksrQ0pTK1BPTzlVNGVkeHJmTGlBVkhnQTgzRG43Z2U4K29nV1Y0Z0hUNmhBZ01CQUFHamdnSjhNSUlDZURBTQpCZ05WSFJNQkFmOEVBakFBTUI4R0ExVWRJd1FZTUJhQUZBbit3QldRK2E5a0NwSVN1U1lvWXd5WDdLZXlNSEFHCkNDc0dBUVVGQndFQkJHUXdZakF0QmdnckJnRUZCUWN3QW9ZaGFIUjBjRG92TDJObGNuUnpMbUZ3Y0d4bExtTnYKYlM5M2QyUnlaek11WkdWeU1ERUdDQ3NHQVFVRkJ6QUJoaVZvZEhSd09pOHZiMk56Y0M1aGNIQnNaUzVqYjIwdgpiMk56Y0RBekxYZDNaSEpuTXpBNU1JSUJMUVlEVlIwZ0JJSUJKRENDQVNBd2dnRWNCZ2txaGtpRzkyTmtCUUV3CmdnRU5NSUhSQmdnckJnRUZCUWNDQWpDQnhBeUJ3VkpsYkdsaGJtTmxJRzl1SUhSb2FYTWdRMlZ5ZEdsbWFXTmgKZEdVZ1lua2dZVzU1SUhCaGNuUjVJRzkwYUdWeUlIUm9ZVzRnUVhCd2JHVWdhWE1nY0hKdmFHbGlhWFJsWkM0ZwpVbVZtWlhJZ2RHOGdkR2hsSUdGd2NHeHBZMkZpYkdVZ2MzUmhibVJoY21RZ2RHVnliWE1nWVc1a0lHTnZibVJwCmRHbHZibk1nYjJZZ2RYTmxMQ0JqWlhKMGFXWnBZMkYwWlNCd2IyeHBZM2tnWVc1a0lHTmxjblJwWm1sallYUnAKYjI0Z2NISmhZM1JwWTJVZ2MzUmhkR1Z0Wlc1MGN5NHdOd1lJS3dZQkJRVUhBZ0VXSzJoMGRIQnpPaTh2ZDNkMwpMbUZ3Y0d4bExtTnZiUzlqWlhKMGFXWnBZMkYwWldGMWRHaHZjbWwwZVM4d0V3WURWUjBsQkF3d0NnWUlLd1lCCkJRVUhBd0l3SFFZRFZSME9CQllFRk5RSysxcUNHbDRTQ1p6SzFSUmpnb05nM0hmdk1BNEdBMVVkRHdFQi93UUUKQXdJSGdEQlBCZ2txaGtpRzkyTmtCaUFFUWd4QVFVUkNRemxDTmtGRE5USkVRems0TnpCRk5qYzJNVFpFUkRJdwpPVUkwTWtReE1UVXlSVVpFTURVeFFVRXhRekV6T0ROR00wUkROa1V5TkVNelFqRkVSVEFQQmdrcWhraUc5Mk5rCkJpNEVBZ1VBTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBSFR6NTU2RUs5VVp6R0RVd2cvcmFibmYrUXFSYkgKcllVS0ZNcWQwUDhFTHZGMmYrTzN0ZXlDWHNBckF4TmVMY2hRSGVTNUFJOHd2azdMQ0xLUmJCdWJQQy9NVmtBKwpCZ3h5STg2ejJOVUNDWml4QVM1d2JFQWJYOStVMFp2RHp5Y01BbUNrdVVHZjNwWXR5TDNDaEplSGRvOEwwdmdvCnJQWElUSzc4ZjQzenNzYjBTNE5xbTE0eS9LNCs1ZkUzcFUxdEJqME5tUmdKUVJLRnB6MENpV2RPd1BRTk5BYUMKYUNNU2NiYXdwUTBjWEhaZDJWVjNtem4xdUlITEVtaU5GTWVxeEprbjZhUXFFQnNndDUzaUFxcmZMNjEzWStScAppd0tENXVmeU0wYzBweTYyZmkvWEwwS2c4ajEwWU1VdWJpd2dHajAzZThQWTB6bWUvcGZCZ3p6VQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==\",\"display_name\":\"applepay\",\"certificate_keys\":\"LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRRDhIUy81ZmJZNVJLaEkKWFN6ckhKaHk1azZmNGFHTGhJbWJJS2lxWEVJVHVSQ2RHcGcyMExZM1VhTlBlYXZXTVRIUTBpK3d1RzlZWFVhYwo1eXhhNHB4OXh5ZkJVSHo4c3lPaTI3WDVWWlRvTlFhd2F6dGM5aGpZc1B2K0s2UW9oaWRTQWZ3cDhMdThkQ0lVCmZYUFhwY3YxalVUckQrZXNUSUxWVG9RVE5oQ3NlQlJtUS9nK05WdTB5c3BqeUYxU2l6VG9BK1BML3NrMlJEYWMKWlgvb1kwdUdONFVneHNCWFh3WTNHSm0xUkNwdTM0Y2d0UC9kaHNBM1Ixb1VOb0gyQkZBSm9xK3pyUnl3U1RCSApITTBqRENpZ3FVNUZLcC9aQWx3c2JoNVlWTlNNWksrQ0pTK1BPTzlVNGVkeHJmTGlBVkhnQTgzRG43Z2U4K29nCldWNGdIVDZoQWdNQkFBRUNnZ0VBZFNaRzVhTFJxdmpKVFo3bVFYWHZMT3p4dWY5SlpxQTJwUHZmQkJLTXJjZC8KL2RDZXpGSGRhZ1VvWXNUQjRXekluaVVjL2Z3bDJTUzJyREFMZjB2dnRjNTJIYkQ5OHhwMnc3VmVjTGFnMCtuWAo2dUJaSEZCS3FWNU1LZ1l6YUpVMTdqaDM2VEV3dTFnbmdlZnRqVlpBV1NERTFvbDBlSzZ3Mk5kOExjVWdxRkxUCjVHYUlBV01nd0NKL3pzQmwydUV1Y0Q4S21WL1Z2MkVCQVJLWGZtci92UU1NelZrNkhhalprVGZqbWY2cWFVQVMKQWlFblROcHBic2ZrdTk2VGdIa2owWm10VWc0SFkzSU9qWFlpaGJsSjJzQ1JjS3p6cXkxa3B3WlpHcHo1NXEzbgphSXEwenJ3RjlpTUZubEhCa04yK3FjSnhzcDNTalhRdFRLTTY4WHRrVlFLQmdRRC8wemtCVlExR2Q1U0Mzb2czCnM3QWRCZ243dnVMdUZHZFFZY3c0OUppRGw1a1BZRXlKdGQvTVpNOEpFdk1nbVVTeUZmczNZcGtmQ2VGbUp0S3QKMnNNNEdCRWxqTVBQNjI3Q0QrV3c4L3JpWmlOZEg3OUhPRjRneTRGbjBycDNqanlLSWF1OHJISDQwRUUvSkVyOQpxWFQ1SGdWMmJQOGhMcW5sSjFmSDhpY2Zkd0tCZ1FEOFNWQ3ZDV2txQkh2SzE5ZDVTNlArdm5hcXhnTWo0U0srCnJ6L1I1c3pTaW5lS045VEhyeVkxYUZJbVFJZjJYOUdaQXBocUhrckxtQ3BIcURHOWQ3WDVQdUxxQzhmc09kVTYKRzhWaFRXeXdaSVNjdGRSYkk5S2xKUFk2V2ZDQjk0ODNVaDJGbW1xV2JuNWcwZUJxZWZzamVVdEtHekNRaGJDYworR1dBREVRSXB3S0JnUURmaWYvN3pBZm5sVUh1QU9saVV0OEczV29IMGtxVTRydE1IOGpGMCtVWXgzVDFYSjVFCmp1blp2aFN5eHg0dlUvNFU1dVEzQnk3cFVrYmtiZlFWK2x3dlBjaHQyVXlZK0E0MkFKSWlSMjdvT1h1Wk9jNTQKT3liMDNSNWNUR1NuWjJBN0N5VDNubStRak5rV2hXNEpyUE1MWTFJK293dGtRVlF2YW10bnlZNnFEUUtCZ0ZYWgpLT0IzSmxjSzhZa0R5Nm5WeUhkZUhvbGNHaU55YjkxTlN6MUUrWHZIYklnWEdZdmRtUFhoaXRyRGFNQzR1RjBGCjJoRjZQMTlxWnpDOUZqZnY3WGRrSTlrYXF5eENQY0dwUTVBcHhZdDhtUGV1bEJWemFqR1NFMHVsNFVhSWxDNXgKL2VQQnVQVjVvZjJXVFhST0Q5eHhZT0pWd0QvZGprekw1ZFlkMW1UUEFvR0JBTWVwY3diVEphZ3BoZk5zOHY0WAprclNoWXplbVpxY2EwQzRFc2QwNGYwTUxHSlVNS3Zpck4zN0g1OUFjT2IvNWtZcTU5WFRwRmJPWjdmYlpHdDZnCkxnM2hWSHRacElOVGJ5Ni9GOTBUZ09Za3RxUnhNVmc3UFBxbjFqdEFiVU15eVpVZFdHcFNNMmI0bXQ5dGhlUDEKblhMR09NWUtnS2JYbjZXWWN5K2U5eW9ICi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0KCg==\",\"initiative_context\":\"hyperswitch-sdk-test.netlify.app\",\"merchant_identifier\":\"merchant.com.adyen.san\"},\"payment_request_data\":{\"label\":\"applepay pvt.ltd\",\"supported_networks\":[\"visa\",\"masterCard\",\"amex\",\"discover\"],\"merchant_capabilities\":[\"supports3DS\"]}}}}"
+                  "raw": "{\"connector_type\":\"fiz_operations\",\"connector_name\":\"adyen\",\"connector_account_details\":{\"auth_type\":\"BodyKey\",\"api_key\":\"{{connector_api_key}}\",\"key1\":\"{{connector_key1}}\",\"api_secret\":\"{{connector_api_secret}}\"},\"test_mode\":false,\"disabled\":false,\"business_country\":\"US\",\"business_label\":\"default\",\"payment_methods_enabled\":[{\"payment_method\":\"card\",\"payment_method_types\":[{\"payment_method_type\":\"credit\",\"card_networks\":[\"Visa\",\"Mastercard\"],\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"debit\",\"card_networks\":[\"Visa\",\"Mastercard\"],\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"pay_later\",\"payment_method_types\":[{\"payment_method_type\":\"klarna\",\"payment_experience\":\"redirect_to_url\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"affirm\",\"payment_experience\":\"redirect_to_url\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"afterpay_clearpay\",\"payment_experience\":\"redirect_to_url\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"pay_bright\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"walley\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"wallet\",\"payment_method_types\":[{\"payment_method_type\":\"paypal\",\"payment_experience\":\"redirect_to_url\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"google_pay\",\"payment_experience\":\"invoke_sdk_client\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"apple_pay\",\"payment_experience\":\"invoke_sdk_client\",\"card_networks\":null,\"accepted_currencies\":null,\"accepted_countries\":null,\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"mobile_pay\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"ali_pay\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"we_chat_pay\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"mb_way\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"gift_card\",\"payment_method_types\":[{\"payment_method_type\":\"givex\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"bank_redirect\",\"payment_method_types\":[{\"payment_method_type\":\"giropay\",\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"eps\",\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"sofort\",\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"blik\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"trustly\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"online_banking_czech_republic\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"online_banking_finland\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"online_banking_poland\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"online_banking_slovakia\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"bancontact_card\",\"minimum_amount\":1,\"maximum_amount\":68607706,\"recurring_enabled\":true,\"installment_payment_enabled\":true}]},{\"payment_method\":\"bank_debit\",\"payment_method_types\":[{\"payment_method_type\":\"ach\",\"recurring_enabled\":true,\"installment_payment_enabled\":true},{\"payment_method_type\":\"bacs\",\"recurring_enabled\":true,\"installment_payment_enabled\":true}]}],\"metadata\":{\"google_pay\":{\"allowed_payment_methods\":[{\"type\":\"CARD\",\"parameters\":{\"allowed_auth_methods\":[\"PAN_ONLY\",\"CRYPTOGRAM_3DS\"],\"allowed_card_networks\":[\"AMEX\",\"DISCOVER\",\"INTERAC\",\"JCB\",\"MASTERCARD\",\"VISA\"]},\"tokenization_specification\":{\"type\":\"PAYMENT_GATEWAY\"}}],\"merchant_info\":{\"merchant_name\":\"Narayan Bhat\"}},\"apple_pay\":{\"session_token_data\":{\"initiative\":\"web\",\"certificate\":\"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUdKakNDQlE2Z0F3SUJBZ0lRRENzRmFrVkNLU01uc2JacTc1YTI0ekFOQmdrcWhraUc5dzBCQVFzRkFEQjEKTVVRd1FnWURWUVFERER0QmNIQnNaU0JYYjNKc1pIZHBaR1VnUkdWMlpXeHZjR1Z5SUZKbGJHRjBhVzl1Y3lCRApaWEowYVdacFkyRjBhVzl1SUVGMWRHaHZjbWwwZVRFTE1Ba0dBMVVFQ3d3Q1J6TXhFekFSQmdOVkJBb01Da0Z3CmNHeGxJRWx1WXk0eEN6QUpCZ05WQkFZVEFsVlRNQjRYRFRJeU1USXdPREE1TVRJeE1Wb1hEVEkxTURFd05qQTUKTVRJeE1Gb3dnYWd4SmpBa0Jnb0praWFKay9Jc1pBRUJEQlp0WlhKamFHRnVkQzVqYjIwdVlXUjVaVzR1YzJGdQpNVHN3T1FZRFZRUUREREpCY0hCc1pTQlFZWGtnVFdWeVkyaGhiblFnU1dSbGJuUnBkSGs2YldWeVkyaGhiblF1ClkyOXRMbUZrZVdWdUxuTmhiakVUTUJFR0ExVUVDd3dLV1UwNVZUY3pXakpLVFRFc01Db0dBMVVFQ2d3alNsVlQKVUVGWklGUkZRMGhPVDB4UFIwbEZVeUJRVWtsV1FWUkZJRXhKVFVsVVJVUXdnZ0VpTUEwR0NTcUdTSWIzRFFFQgpBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRRDhIUy81ZmJZNVJLaElYU3pySEpoeTVrNmY0YUdMaEltYklLaXFYRUlUCnVSQ2RHcGcyMExZM1VhTlBlYXZXTVRIUTBpK3d1RzlZWFVhYzV5eGE0cHg5eHlmQlVIejhzeU9pMjdYNVZaVG8KTlFhd2F6dGM5aGpZc1B2K0s2UW9oaWRTQWZ3cDhMdThkQ0lVZlhQWHBjdjFqVVRyRCtlc1RJTFZUb1FUTmhDcwplQlJtUS9nK05WdTB5c3BqeUYxU2l6VG9BK1BML3NrMlJEYWNaWC9vWTB1R040VWd4c0JYWHdZM0dKbTFSQ3B1CjM0Y2d0UC9kaHNBM1Ixb1VOb0gyQkZBSm9xK3pyUnl3U1RCSEhNMGpEQ2lncVU1RktwL1pBbHdzYmg1WVZOU00KWksrQ0pTK1BPTzlVNGVkeHJmTGlBVkhnQTgzRG43Z2U4K29nV1Y0Z0hUNmhBZ01CQUFHamdnSjhNSUlDZURBTQpCZ05WSFJNQkFmOEVBakFBTUI4R0ExVWRJd1FZTUJhQUZBbit3QldRK2E5a0NwSVN1U1lvWXd5WDdLZXlNSEFHCkNDc0dBUVVGQndFQkJHUXdZakF0QmdnckJnRUZCUWN3QW9ZaGFIUjBjRG92TDJObGNuUnpMbUZ3Y0d4bExtTnYKYlM5M2QyUnlaek11WkdWeU1ERUdDQ3NHQVFVRkJ6QUJoaVZvZEhSd09pOHZiMk56Y0M1aGNIQnNaUzVqYjIwdgpiMk56Y0RBekxYZDNaSEpuTXpBNU1JSUJMUVlEVlIwZ0JJSUJKRENDQVNBd2dnRWNCZ2txaGtpRzkyTmtCUUV3CmdnRU5NSUhSQmdnckJnRUZCUWNDQWpDQnhBeUJ3VkpsYkdsaGJtTmxJRzl1SUhSb2FYTWdRMlZ5ZEdsbWFXTmgKZEdVZ1lua2dZVzU1SUhCaGNuUjVJRzkwYUdWeUlIUm9ZVzRnUVhCd2JHVWdhWE1nY0hKdmFHbGlhWFJsWkM0ZwpVbVZtWlhJZ2RHOGdkR2hsSUdGd2NHeHBZMkZpYkdVZ2MzUmhibVJoY21RZ2RHVnliWE1nWVc1a0lHTnZibVJwCmRHbHZibk1nYjJZZ2RYTmxMQ0JqWlhKMGFXWnBZMkYwWlNCd2IyeHBZM2tnWVc1a0lHTmxjblJwWm1sallYUnAKYjI0Z2NISmhZM1JwWTJVZ2MzUmhkR1Z0Wlc1MGN5NHdOd1lJS3dZQkJRVUhBZ0VXSzJoMGRIQnpPaTh2ZDNkMwpMbUZ3Y0d4bExtTnZiUzlqWlhKMGFXWnBZMkYwWldGMWRHaHZjbWwwZVM4d0V3WURWUjBsQkF3d0NnWUlLd1lCCkJRVUhBd0l3SFFZRFZSME9CQllFRk5RSysxcUNHbDRTQ1p6SzFSUmpnb05nM0hmdk1BNEdBMVVkRHdFQi93UUUKQXdJSGdEQlBCZ2txaGtpRzkyTmtCaUFFUWd4QVFVUkNRemxDTmtGRE5USkVRems0TnpCRk5qYzJNVFpFUkRJdwpPVUkwTWtReE1UVXlSVVpFTURVeFFVRXhRekV6T0ROR00wUkROa1V5TkVNelFqRkVSVEFQQmdrcWhraUc5Mk5rCkJpNEVBZ1VBTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBSFR6NTU2RUs5VVp6R0RVd2cvcmFibmYrUXFSYkgKcllVS0ZNcWQwUDhFTHZGMmYrTzN0ZXlDWHNBckF4TmVMY2hRSGVTNUFJOHd2azdMQ0xLUmJCdWJQQy9NVmtBKwpCZ3h5STg2ejJOVUNDWml4QVM1d2JFQWJYOStVMFp2RHp5Y01BbUNrdVVHZjNwWXR5TDNDaEplSGRvOEwwdmdvCnJQWElUSzc4ZjQzenNzYjBTNE5xbTE0eS9LNCs1ZkUzcFUxdEJqME5tUmdKUVJLRnB6MENpV2RPd1BRTk5BYUMKYUNNU2NiYXdwUTBjWEhaZDJWVjNtem4xdUlITEVtaU5GTWVxeEprbjZhUXFFQnNndDUzaUFxcmZMNjEzWStScAppd0tENXVmeU0wYzBweTYyZmkvWEwwS2c4ajEwWU1VdWJpd2dHajAzZThQWTB6bWUvcGZCZ3p6VQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==\",\"display_name\":\"applepay\",\"certificate_keys\":\"LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRRDhIUy81ZmJZNVJLaEkKWFN6ckhKaHk1azZmNGFHTGhJbWJJS2lxWEVJVHVSQ2RHcGcyMExZM1VhTlBlYXZXTVRIUTBpK3d1RzlZWFVhYwo1eXhhNHB4OXh5ZkJVSHo4c3lPaTI3WDVWWlRvTlFhd2F6dGM5aGpZc1B2K0s2UW9oaWRTQWZ3cDhMdThkQ0lVCmZYUFhwY3YxalVUckQrZXNUSUxWVG9RVE5oQ3NlQlJtUS9nK05WdTB5c3BqeUYxU2l6VG9BK1BML3NrMlJEYWMKWlgvb1kwdUdONFVneHNCWFh3WTNHSm0xUkNwdTM0Y2d0UC9kaHNBM1Ixb1VOb0gyQkZBSm9xK3pyUnl3U1RCSApITTBqRENpZ3FVNUZLcC9aQWx3c2JoNVlWTlNNWksrQ0pTK1BPTzlVNGVkeHJmTGlBVkhnQTgzRG43Z2U4K29nCldWNGdIVDZoQWdNQkFBRUNnZ0VBZFNaRzVhTFJxdmpKVFo3bVFYWHZMT3p4dWY5SlpxQTJwUHZmQkJLTXJjZC8KL2RDZXpGSGRhZ1VvWXNUQjRXekluaVVjL2Z3bDJTUzJyREFMZjB2dnRjNTJIYkQ5OHhwMnc3VmVjTGFnMCtuWAo2dUJaSEZCS3FWNU1LZ1l6YUpVMTdqaDM2VEV3dTFnbmdlZnRqVlpBV1NERTFvbDBlSzZ3Mk5kOExjVWdxRkxUCjVHYUlBV01nd0NKL3pzQmwydUV1Y0Q4S21WL1Z2MkVCQVJLWGZtci92UU1NelZrNkhhalprVGZqbWY2cWFVQVMKQWlFblROcHBic2ZrdTk2VGdIa2owWm10VWc0SFkzSU9qWFlpaGJsSjJzQ1JjS3p6cXkxa3B3WlpHcHo1NXEzbgphSXEwenJ3RjlpTUZubEhCa04yK3FjSnhzcDNTalhRdFRLTTY4WHRrVlFLQmdRRC8wemtCVlExR2Q1U0Mzb2czCnM3QWRCZ243dnVMdUZHZFFZY3c0OUppRGw1a1BZRXlKdGQvTVpNOEpFdk1nbVVTeUZmczNZcGtmQ2VGbUp0S3QKMnNNNEdCRWxqTVBQNjI3Q0QrV3c4L3JpWmlOZEg3OUhPRjRneTRGbjBycDNqanlLSWF1OHJISDQwRUUvSkVyOQpxWFQ1SGdWMmJQOGhMcW5sSjFmSDhpY2Zkd0tCZ1FEOFNWQ3ZDV2txQkh2SzE5ZDVTNlArdm5hcXhnTWo0U0srCnJ6L1I1c3pTaW5lS045VEhyeVkxYUZJbVFJZjJYOUdaQXBocUhrckxtQ3BIcURHOWQ3WDVQdUxxQzhmc09kVTYKRzhWaFRXeXdaSVNjdGRSYkk5S2xKUFk2V2ZDQjk0ODNVaDJGbW1xV2JuNWcwZUJxZWZzamVVdEtHekNRaGJDYworR1dBREVRSXB3S0JnUURmaWYvN3pBZm5sVUh1QU9saVV0OEczV29IMGtxVTRydE1IOGpGMCtVWXgzVDFYSjVFCmp1blp2aFN5eHg0dlUvNFU1dVEzQnk3cFVrYmtiZlFWK2x3dlBjaHQyVXlZK0E0MkFKSWlSMjdvT1h1Wk9jNTQKT3liMDNSNWNUR1NuWjJBN0N5VDNubStRak5rV2hXNEpyUE1MWTFJK293dGtRVlF2YW10bnlZNnFEUUtCZ0ZYWgpLT0IzSmxjSzhZa0R5Nm5WeUhkZUhvbGNHaU55YjkxTlN6MUUrWHZIYklnWEdZdmRtUFhoaXRyRGFNQzR1RjBGCjJoRjZQMTlxWnpDOUZqZnY3WGRrSTlrYXF5eENQY0dwUTVBcHhZdDhtUGV1bEJWemFqR1NFMHVsNFVhSWxDNXgKL2VQQnVQVjVvZjJXVFhST0Q5eHhZT0pWd0QvZGprekw1ZFlkMW1UUEFvR0JBTWVwY3diVEphZ3BoZk5zOHY0WAprclNoWXplbVpxY2EwQzRFc2QwNGYwTUxHSlVNS3Zpck4zN0g1OUFjT2IvNWtZcTU5WFRwRmJPWjdmYlpHdDZnCkxnM2hWSHRacElOVGJ5Ni9GOTBUZ09Za3RxUnhNVmc3UFBxbjFqdEFiVU15eVpVZFdHcFNNMmI0bXQ5dGhlUDEKblhMR09NWUtnS2JYbjZXWWN5K2U5eW9ICi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0KCg==\",\"initiative_context\":\"hyperswitch-sdk-test.netlify.app\",\"merchant_identifier\":\"merchant.com.adyen.san\"},\"payment_request_data\":{\"label\":\"applepay pvt.ltd\",\"supported_networks\":[\"visa\",\"masterCard\",\"amex\",\"discover\"],\"merchant_capabilities\":[\"supports3DS\"]}}}}"
                 },
                 "url": {
                   "raw": "{{baseUrl}}/account/:account_id/connectors",
@@ -735,7 +735,7 @@
                       "language": "json"
                     }
                   },
-                  "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+1\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_type\":\"credit\",\"payment_method_data\":{\"card\":{\"card_number\":\"371449635398431\",\"card_exp_month\":\"03\",\"card_exp_year\":\"2030\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"7373\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"}}"
+                  "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+1\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_type\":\"credit\",\"payment_method_data\":{\"card\":{\"card_number\":\"371449635398431\",\"card_exp_month\":\"03\",\"card_exp_year\":\"2030\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"7373\"}},\"routing\":{\"type\":\"single\",\"data\":\"adyen\"},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"}}"
                 },
                 "url": {
                   "raw": "{{baseUrl}}/payments",
@@ -1214,6 +1214,248 @@
         {
           "name": "Happy Cases",
           "item": [
+            {
+              "name": "Scenario22-Create Gift Card payment",
+              "item": [
+                {
+                  "name": "Payments - Create",
+                  "event": [
+                    {
+                      "listen": "test",
+                      "script": {
+                        "exec": [
+                          "// Validate status 2xx",
+                          "pm.test(\"[POST]::/payments - Status code is 2xx\", function () {",
+                          "  pm.response.to.be.success;",
+                          "});",
+                          "",
+                          "// Validate if response header has matching content-type",
+                          "pm.test(\"[POST]::/payments - Content-Type is application/json\", function () {",
+                          "  pm.expect(pm.response.headers.get(\"Content-Type\")).to.include(",
+                          "    \"application/json\",",
+                          "  );",
+                          "});",
+                          "",
+                          "// Validate if response has JSON Body",
+                          "pm.test(\"[POST]::/payments - Response has JSON Body\", function () {",
+                          "  pm.response.to.have.jsonBody();",
+                          "});",
+                          "",
+                          "// Set response object as internal variable",
+                          "let jsonData = {};",
+                          "try {",
+                          "  jsonData = pm.response.json();",
+                          "} catch (e) {}",
+                          "",
+                          "// pm.collectionVariables - Set payment_id as variable for jsonData.payment_id",
+                          "if (jsonData?.payment_id) {",
+                          "  pm.collectionVariables.set(\"payment_id\", jsonData.payment_id);",
+                          "  console.log(",
+                          "    \"- use {{payment_id}} as collection variable for value\",",
+                          "    jsonData.payment_id,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{payment_id}}, as jsonData.payment_id is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// pm.collectionVariables - Set mandate_id as variable for jsonData.mandate_id",
+                          "if (jsonData?.mandate_id) {",
+                          "  pm.collectionVariables.set(\"mandate_id\", jsonData.mandate_id);",
+                          "  console.log(",
+                          "    \"- use {{mandate_id}} as collection variable for value\",",
+                          "    jsonData.mandate_id,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{mandate_id}}, as jsonData.mandate_id is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// pm.collectionVariables - Set client_secret as variable for jsonData.client_secret",
+                          "if (jsonData?.client_secret) {",
+                          "  pm.collectionVariables.set(\"client_secret\", jsonData.client_secret);",
+                          "  console.log(",
+                          "    \"- use {{client_secret}} as collection variable for value\",",
+                          "    jsonData.client_secret,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{client_secret}}, as jsonData.client_secret is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// Response body should have value \"succeeded\" for \"status\"",
+                          "if (jsonData?.status) {",
+                          "  pm.test(",
+                          "    \"[POST]::/payments - Content check if value for 'status' matches 'succeeded'\",",
+                          "    function () {",
+                          "      pm.expect(jsonData.status).to.eql(\"succeeded\");",
+                          "    },",
+                          "  );",
+                          "}",
+                          ""
+                        ],
+                        "type": "text/javascript"
+                      }
+                    }
+                  ],
+                  "request": {
+                    "method": "POST",
+                    "header": [
+                      {
+                        "key": "Content-Type",
+                        "value": "application/json"
+                      },
+                      {
+                        "key": "Accept",
+                        "value": "application/json"
+                      }
+                    ],
+                    "body": {
+                      "mode": "raw",
+                      "options": {
+                        "raw": {
+                          "language": "json"
+                        }
+                      },
+                      "raw": "{\"amount\":1100,\"currency\":\"EUR\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":1100,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"gift_card\",\"payment_method_type\":\"givex\",\"payment_method_data\":{\"gift_card\":{\"givex\":{\"number\":\"6364530000000000\",\"cvc\":\"122222\"}}},\"routing\":{\"type\":\"single\",\"data\":\"adyen\"},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"}}"
+                    },
+                    "url": {
+                      "raw": "{{baseUrl}}/payments",
+                      "host": [
+                        "{{baseUrl}}"
+                      ],
+                      "path": [
+                        "payments"
+                      ]
+                    },
+                    "description": "To process a payment you will have to create a payment, attach a payment method and confirm. Depending on the user journey you wish to achieve, you may opt to all the steps in a single request or in a sequence of API request using following APIs: (i) Payments - Update, (ii) Payments - Confirm, and (iii) Payments - Capture"
+                  },
+                  "response": []
+                },
+                {
+                  "name": "Payments - Retrieve",
+                  "event": [
+                    {
+                      "listen": "test",
+                      "script": {
+                        "exec": [
+                          "// Validate status 2xx",
+                          "pm.test(\"[GET]::/payments/:id - Status code is 2xx\", function () {",
+                          "  pm.response.to.be.success;",
+                          "});",
+                          "",
+                          "// Validate if response header has matching content-type",
+                          "pm.test(\"[GET]::/payments/:id - Content-Type is application/json\", function () {",
+                          "  pm.expect(pm.response.headers.get(\"Content-Type\")).to.include(",
+                          "    \"application/json\",",
+                          "  );",
+                          "});",
+                          "",
+                          "// Validate if response has JSON Body",
+                          "pm.test(\"[GET]::/payments/:id - Response has JSON Body\", function () {",
+                          "  pm.response.to.have.jsonBody();",
+                          "});",
+                          "",
+                          "// Set response object as internal variable",
+                          "let jsonData = {};",
+                          "try {",
+                          "  jsonData = pm.response.json();",
+                          "} catch (e) {}",
+                          "",
+                          "// pm.collectionVariables - Set payment_id as variable for jsonData.payment_id",
+                          "if (jsonData?.payment_id) {",
+                          "  pm.collectionVariables.set(\"payment_id\", jsonData.payment_id);",
+                          "  console.log(",
+                          "    \"- use {{payment_id}} as collection variable for value\",",
+                          "    jsonData.payment_id,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{payment_id}}, as jsonData.payment_id is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// pm.collectionVariables - Set mandate_id as variable for jsonData.mandate_id",
+                          "if (jsonData?.mandate_id) {",
+                          "  pm.collectionVariables.set(\"mandate_id\", jsonData.mandate_id);",
+                          "  console.log(",
+                          "    \"- use {{mandate_id}} as collection variable for value\",",
+                          "    jsonData.mandate_id,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{mandate_id}}, as jsonData.mandate_id is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// pm.collectionVariables - Set client_secret as variable for jsonData.client_secret",
+                          "if (jsonData?.client_secret) {",
+                          "  pm.collectionVariables.set(\"client_secret\", jsonData.client_secret);",
+                          "  console.log(",
+                          "    \"- use {{client_secret}} as collection variable for value\",",
+                          "    jsonData.client_secret,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{client_secret}}, as jsonData.client_secret is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// Response body should have value \"Succeeded\" for \"status\"",
+                          "if (jsonData?.status) {",
+                          "  pm.test(",
+                          "    \"[POST]::/payments/:id - Content check if value for 'status' matches 'succeeded'\",",
+                          "    function () {",
+                          "      pm.expect(jsonData.status).to.eql(\"succeeded\");",
+                          "    },",
+                          "  );",
+                          "}",
+                          ""
+                        ],
+                        "type": "text/javascript"
+                      }
+                    }
+                  ],
+                  "request": {
+                    "method": "GET",
+                    "header": [
+                      {
+                        "key": "Accept",
+                        "value": "application/json"
+                      }
+                    ],
+                    "url": {
+                      "raw": "{{baseUrl}}/payments/:id?force_sync=true",
+                      "host": [
+                        "{{baseUrl}}"
+                      ],
+                      "path": [
+                        "payments",
+                        ":id"
+                      ],
+                      "query": [
+                        {
+                          "key": "force_sync",
+                          "value": "true"
+                        }
+                      ],
+                      "variable": [
+                        {
+                          "key": "id",
+                          "value": "{{payment_id}}",
+                          "description": "(Required) unique payment id"
+                        }
+                      ]
+                    },
+                    "description": "To retrieve the properties of a Payment. This may be used to get the status of a previously initiated payment or next action for an ongoing payment"
+                  },
+                  "response": []
+                }
+              ]
+            },
             {
               "name": "Scenario1-Create payment with confirm true",
               "item": [
@@ -10722,6 +10964,258 @@
         {
           "name": "Variation Cases",
           "item": [
+            {
+              "name": "Scenario10-Create Gift Card payment where it fails due to insufficient balance",
+              "item": [
+                {
+                  "name": "Payments - Create",
+                  "event": [
+                    {
+                      "listen": "test",
+                      "script": {
+                        "exec": [
+                          "// Validate status 2xx",
+                          "pm.test(\"[POST]::/payments - Status code is 2xx\", function () {",
+                          "  pm.response.to.be.success;",
+                          "});",
+                          "",
+                          "// Validate if response header has matching content-type",
+                          "pm.test(\"[POST]::/payments - Content-Type is application/json\", function () {",
+                          "  pm.expect(pm.response.headers.get(\"Content-Type\")).to.include(",
+                          "    \"application/json\",",
+                          "  );",
+                          "});",
+                          "",
+                          "// Validate if response has JSON Body",
+                          "pm.test(\"[POST]::/payments - Response has JSON Body\", function () {",
+                          "  pm.response.to.have.jsonBody();",
+                          "});",
+                          "",
+                          "// Set response object as internal variable",
+                          "let jsonData = {};",
+                          "try {",
+                          "  jsonData = pm.response.json();",
+                          "} catch (e) {}",
+                          "",
+                          "// pm.collectionVariables - Set payment_id as variable for jsonData.payment_id",
+                          "if (jsonData?.payment_id) {",
+                          "  pm.collectionVariables.set(\"payment_id\", jsonData.payment_id);",
+                          "  console.log(",
+                          "    \"- use {{payment_id}} as collection variable for value\",",
+                          "    jsonData.payment_id,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{payment_id}}, as jsonData.payment_id is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// pm.collectionVariables - Set mandate_id as variable for jsonData.mandate_id",
+                          "if (jsonData?.mandate_id) {",
+                          "  pm.collectionVariables.set(\"mandate_id\", jsonData.mandate_id);",
+                          "  console.log(",
+                          "    \"- use {{mandate_id}} as collection variable for value\",",
+                          "    jsonData.mandate_id,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{mandate_id}}, as jsonData.mandate_id is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// pm.collectionVariables - Set client_secret as variable for jsonData.client_secret",
+                          "if (jsonData?.client_secret) {",
+                          "  pm.collectionVariables.set(\"client_secret\", jsonData.client_secret);",
+                          "  console.log(",
+                          "    \"- use {{client_secret}} as collection variable for value\",",
+                          "    jsonData.client_secret,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{client_secret}}, as jsonData.client_secret is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// Response body should have value \"failed\" for \"status\"",
+                          "if (jsonData?.status) {",
+                          "  pm.test(",
+                          "    \"[POST]::/payments - Content check if value for 'status' matches 'failed'\",",
+                          "    function () {",
+                          "      pm.expect(jsonData.status).to.eql(\"failed\");",
+                          "    },",
+                          "  );",
+                          "}",
+                          "",
+                          "// Response body should have error message as \"Insufficient balance in the payment method\"",
+                          "if (jsonData?.error_message) {",
+                          "  pm.test(",
+                          "    \"[POST]::/payments - Content check if value for 'error_message' matches 'Insufficient balance in the payment method'\",",
+                          "    function () {",
+                          "      pm.expect(jsonData.error_message).to.eql(\"Insufficient balance in the payment method\");",
+                          "    },",
+                          "  );",
+                          "}",
+                          ""
+                        ],
+                        "type": "text/javascript"
+                      }
+                    }
+                  ],
+                  "request": {
+                    "method": "POST",
+                    "header": [
+                      {
+                        "key": "Content-Type",
+                        "value": "application/json"
+                      },
+                      {
+                        "key": "Accept",
+                        "value": "application/json"
+                      }
+                    ],
+                    "body": {
+                      "mode": "raw",
+                      "options": {
+                        "raw": {
+                          "language": "json"
+                        }
+                      },
+                      "raw": "{\"amount\":14100,\"currency\":\"EUR\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":14100,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"gift_card\",\"payment_method_type\":\"givex\",\"payment_method_data\":{\"gift_card\":{\"givex\":{\"number\":\"6364530000000000\",\"cvc\":\"122222\"}}},\"routing\":{\"type\":\"single\",\"data\":\"adyen\"},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"}}"
+                    },
+                    "url": {
+                      "raw": "{{baseUrl}}/payments",
+                      "host": [
+                        "{{baseUrl}}"
+                      ],
+                      "path": [
+                        "payments"
+                      ]
+                    },
+                    "description": "To process a payment you will have to create a payment, attach a payment method and confirm. Depending on the user journey you wish to achieve, you may opt to all the steps in a single request or in a sequence of API request using following APIs: (i) Payments - Update, (ii) Payments - Confirm, and (iii) Payments - Capture"
+                  },
+                  "response": []
+                },
+                {
+                  "name": "Payments - Retrieve",
+                  "event": [
+                    {
+                      "listen": "test",
+                      "script": {
+                        "exec": [
+                          "// Validate status 2xx",
+                          "pm.test(\"[GET]::/payments/:id - Status code is 2xx\", function () {",
+                          "  pm.response.to.be.success;",
+                          "});",
+                          "",
+                          "// Validate if response header has matching content-type",
+                          "pm.test(\"[GET]::/payments/:id - Content-Type is application/json\", function () {",
+                          "  pm.expect(pm.response.headers.get(\"Content-Type\")).to.include(",
+                          "    \"application/json\",",
+                          "  );",
+                          "});",
+                          "",
+                          "// Validate if response has JSON Body",
+                          "pm.test(\"[GET]::/payments/:id - Response has JSON Body\", function () {",
+                          "  pm.response.to.have.jsonBody();",
+                          "});",
+                          "",
+                          "// Set response object as internal variable",
+                          "let jsonData = {};",
+                          "try {",
+                          "  jsonData = pm.response.json();",
+                          "} catch (e) {}",
+                          "",
+                          "// pm.collectionVariables - Set payment_id as variable for jsonData.payment_id",
+                          "if (jsonData?.payment_id) {",
+                          "  pm.collectionVariables.set(\"payment_id\", jsonData.payment_id);",
+                          "  console.log(",
+                          "    \"- use {{payment_id}} as collection variable for value\",",
+                          "    jsonData.payment_id,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{payment_id}}, as jsonData.payment_id is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// pm.collectionVariables - Set mandate_id as variable for jsonData.mandate_id",
+                          "if (jsonData?.mandate_id) {",
+                          "  pm.collectionVariables.set(\"mandate_id\", jsonData.mandate_id);",
+                          "  console.log(",
+                          "    \"- use {{mandate_id}} as collection variable for value\",",
+                          "    jsonData.mandate_id,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{mandate_id}}, as jsonData.mandate_id is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// pm.collectionVariables - Set client_secret as variable for jsonData.client_secret",
+                          "if (jsonData?.client_secret) {",
+                          "  pm.collectionVariables.set(\"client_secret\", jsonData.client_secret);",
+                          "  console.log(",
+                          "    \"- use {{client_secret}} as collection variable for value\",",
+                          "    jsonData.client_secret,",
+                          "  );",
+                          "} else {",
+                          "  console.log(",
+                          "    \"INFO - Unable to assign variable {{client_secret}}, as jsonData.client_secret is undefined.\",",
+                          "  );",
+                          "}",
+                          "",
+                          "// Response body should have value \"Failed\" for \"status\"",
+                          "if (jsonData?.status) {",
+                          "  pm.test(",
+                          "    \"[POST]::/payments/:id - Content check if value for 'status' matches 'failed'\",",
+                          "    function () {",
+                          "      pm.expect(jsonData.status).to.eql(\"failed\");",
+                          "    },",
+                          "  );",
+                          "}",
+                          ""
+                        ],
+                        "type": "text/javascript"
+                      }
+                    }
+                  ],
+                  "request": {
+                    "method": "GET",
+                    "header": [
+                      {
+                        "key": "Accept",
+                        "value": "application/json"
+                      }
+                    ],
+                    "url": {
+                      "raw": "{{baseUrl}}/payments/:id?force_sync=true",
+                      "host": [
+                        "{{baseUrl}}"
+                      ],
+                      "path": [
+                        "payments",
+                        ":id"
+                      ],
+                      "query": [
+                        {
+                          "key": "force_sync",
+                          "value": "true"
+                        }
+                      ],
+                      "variable": [
+                        {
+                          "key": "id",
+                          "value": "{{payment_id}}",
+                          "description": "(Required) unique payment id"
+                        }
+                      ]
+                    },
+                    "description": "To retrieve the properties of a Payment. This may be used to get the status of a previously initiated payment or next action for an ongoing payment"
+                  },
+                  "response": []
+                }
+              ]
+            },
             {
               "name": "Scenario1-Create payment with Invalid card details",
               "item": [
diff --git a/postman/collection-json/payme.postman_collection.json b/postman/collection-json/payme.postman_collection.json
index 4bca668a6af6..280a131386e5 100644
--- a/postman/collection-json/payme.postman_collection.json
+++ b/postman/collection-json/payme.postman_collection.json
@@ -532,7 +532,7 @@
                       "language": "json"
                     }
                   },
-                  "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+1\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                  "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+1\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                 },
                 "url": {
                   "raw": "{{baseUrl}}/payments",
@@ -761,7 +761,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -1003,7 +1003,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":false,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":false,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -1395,7 +1395,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":false,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":false,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -1787,7 +1787,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"manual\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"manual\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -2189,7 +2189,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -3364,7 +3364,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":false,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":false,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -4506,7 +4506,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"manual\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"manual\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -4886,7 +4886,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -5147,7 +5147,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":5500,\"account_name\":\"transaction_processing\"}]}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":true,\"capture_method\":\"automatic\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"amount_to_capture\":6540,\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+65\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4242424242424242\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\",\"last_name\":\"gnana\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"order_details\":[{\"product_name\":\"Apple iphone 15\",\"quantity\":1,\"amount\":6540,\"account_name\":\"transaction_processing\"}]}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
diff --git a/postman/collection-json/paypal.postman_collection.json b/postman/collection-json/paypal.postman_collection.json
index d9deae47f9af..a6ee545a9497 100644
--- a/postman/collection-json/paypal.postman_collection.json
+++ b/postman/collection-json/paypal.postman_collection.json
@@ -808,7 +808,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":false,\"capture_method\":\"manual\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+1\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"routing\":{\"type\":\"single\",\"data\":\"paypal\"}}"
+                      "raw": "{\"amount\":6540,\"currency\":\"USD\",\"confirm\":false,\"capture_method\":\"manual\",\"capture_on\":\"2022-09-10T10:11:12Z\",\"customer_id\":\"StripeCustomer\",\"email\":\"guest@example.com\",\"name\":\"John Doe\",\"phone\":\"999999999\",\"phone_country_code\":\"+1\",\"description\":\"Its my first payment request\",\"authentication_type\":\"no_three_ds\",\"return_url\":\"https://duck.com\",\"surcharge_details\":{\"surcharge_amount\":5,\"tax_amount\":5},\"billing\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"shipping\":{\"address\":{\"line1\":\"1467\",\"line2\":\"Harrison Street\",\"line3\":\"Harrison Street\",\"city\":\"San Fransico\",\"state\":\"California\",\"zip\":\"94122\",\"country\":\"US\",\"first_name\":\"PiX\"}},\"statement_descriptor_name\":\"joseph\",\"statement_descriptor_suffix\":\"JS\",\"metadata\":{\"udf1\":\"value1\",\"new_customer\":\"true\",\"login_date\":\"2019-09-10T10:11:12Z\"},\"routing\":{\"type\":\"single\",\"data\":\"paypal\"}}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments",
@@ -990,7 +990,7 @@
                           "language": "json"
                         }
                       },
-                      "raw": "{\"client_secret\":\"{{client_secret}}\",\"surcharge_details\":{\"surcharge_amount\":5,\"tax_amount\":5},\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4012000033330026\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}}}"
+                      "raw": "{\"client_secret\":\"{{client_secret}}\",\"payment_method\":\"card\",\"payment_method_data\":{\"card\":{\"card_number\":\"4012000033330026\",\"card_exp_month\":\"10\",\"card_exp_year\":\"25\",\"card_holder_name\":\"joseph Doe\",\"card_cvc\":\"123\"}}}"
                     },
                     "url": {
                       "raw": "{{baseUrl}}/payments/:id/confirm",
diff --git a/scripts/add_connector.sh b/scripts/add_connector.sh
index 9fdc57bf3c81..7ed5e65151e1 100755
--- a/scripts/add_connector.sh
+++ b/scripts/add_connector.sh
@@ -45,7 +45,7 @@ cd $SCRIPT/..
 
 # Remove template files if already created for this connector
 rm -rf $conn/$payment_gateway $conn/$payment_gateway.rs
-git checkout $conn.rs $src/types/api.rs $src/configs/settings.rs config/development.toml config/docker_compose.toml config/config.example.toml loadtest/config/development.toml crates/api_models/src/enums.rs $src/core/payments/flows.rs
+git checkout $conn.rs $src/types/api.rs $src/configs/settings.rs config/development.toml config/docker_compose.toml config/config.example.toml loadtest/config/development.toml crates/api_models/src/enums.rs crates/euclid/src/enums.rs crates/api_models/src/routing.rs $src/core/payments/flows.rs crates/common_enums/src/enums.rs $src/types/transformers.rs $src/core/admin.rs
 
 # Add enum for this connector in required places
 previous_connector=''
@@ -54,15 +54,19 @@ previous_connector_camelcase="$(tr '[:lower:]' '[:upper:]' <<< ${previous_connec
 sed -i'' -e "s|pub mod $previous_connector;|pub mod $previous_connector;\npub mod ${payment_gateway};|" $conn.rs
 sed -i'' -e "s/};/${payment_gateway}::${payment_gateway_camelcase},\n};/" $conn.rs
 sed -i'' -e "s|$previous_connector_camelcase \(.*\)|$previous_connector_camelcase \1\n\t\t\tenums::Connector::${payment_gateway_camelcase} => Ok(Box::new(\&connector::${payment_gateway_camelcase})),|" $src/types/api.rs
+sed -i'' -e "s|$previous_connector_camelcase \(.*\)|$previous_connector_camelcase \1\n\t\t\tRoutableConnectors::${payment_gateway_camelcase} => euclid_enums::Connector::${payment_gateway_camelcase},|" crates/api_models/src/routing.rs
 sed -i'' -e "s/pub $previous_connector: \(.*\)/pub $previous_connector: \1\n\tpub ${payment_gateway}: ConnectorParams,/" $src/configs/settings.rs
 sed -i'' -e "s|$previous_connector.base_url \(.*\)|$previous_connector.base_url \1\n${payment_gateway}.base_url = \"$base_url\"|" config/development.toml config/docker_compose.toml config/config.example.toml loadtest/config/development.toml
 sed  -r -i'' -e "s/\"$previous_connector\",/\"$previous_connector\",\n    \"${payment_gateway}\",/" config/development.toml config/docker_compose.toml config/config.example.toml loadtest/config/development.toml
 sed -i '' -e "s/\(pub enum Connector {\)/\1\n\t${payment_gateway_camelcase},/" crates/api_models/src/enums.rs
-sed -i'' -e "s/\(pub enum RoutableConnectors {\)/\1\n\t${payment_gateway_camelcase},/" crates/api_models/src/enums.rs
+sed -i '' -e "s/\(pub enum Connector {\)/\1\n\t${payment_gateway_camelcase},/" crates/euclid/src/enums.rs
+sed -i '' -e "s/\(match connector_name {\)/\1\n\t\tapi_enums::Connector::${payment_gateway_camelcase} => {${payment_gateway}::transformers::${payment_gateway_camelcase}AuthType::try_from(val)?;Ok(())}/" $src/core/admin.rs
+sed -i'' -e "s/\(pub enum RoutableConnectors {\)/\1\n\t${payment_gateway_camelcase},/" crates/common_enums/src/enums.rs
+sed -i'' -e "s|$previous_connector_camelcase \(.*\)|$previous_connector_camelcase \1\n\t\t\tapi_enums::Connector::${payment_gateway_camelcase} => Self::${payment_gateway_camelcase},|" $src/types/transformers.rs
 sed -i'' -e "s/^default_imp_for_\(.*\)/default_imp_for_\1\n\tconnector::${payment_gateway_camelcase},/" $src/core/payments/flows.rs
 
 # Remove temporary files created in above step
-rm $conn.rs-e $src/types/api.rs-e $src/configs/settings.rs-e config/development.toml-e config/docker_compose.toml-e config/config.example.toml-e loadtest/config/development.toml-e crates/api_models/src/enums.rs-e $src/core/payments/flows.rs-e
+rm $conn.rs-e $src/types/api.rs-e $src/configs/settings.rs-e config/development.toml-e config/docker_compose.toml-e config/config.example.toml-e loadtest/config/development.toml-e crates/api_models/src/enums.rs-e crates/euclid/src/enums.rs-e crates/api_models/src/routing.rs-e $src/core/payments/flows.rs-e crates/common_enums/src/enums.rs-e $src/types/transformers.rs-e $src/core/admin.rs-e
 cd $conn/
 
 # Generate template files for the connector