diff --git a/.github/workflows/all.publish.yml b/.github/workflows/all.publish.yml
index f0e263d1b..13b9b0225 100644
--- a/.github/workflows/all.publish.yml
+++ b/.github/workflows/all.publish.yml
@@ -1,9 +1,10 @@
 name: Publishing
 
+
 on:
   release:
-    types:
-      - published
+    types: [published]
+
 
 permissions:
   contents: read
@@ -12,6 +13,8 @@ jobs:
   publish:
     name: Publish NPM Packages
     runs-on: ubuntu-latest
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
     steps:
       - name: Harden Runner
@@ -27,32 +30,19 @@ jobs:
         with:
           node-version: 20.x
 
-      - name: Create file .npmrc
-        run: |
-          touch .npmrc
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
-          cp .npmrc ./packages/ats/contracts/.npmrc
-          cp .npmrc ./packages/ats/sdk/.npmrc
-
       - name: Install dependencies
         run: npm ci
 
       # --- ATS publishing ---
       - name: Publish ats/contracts
         if: contains(github.ref_name, 'ats')
-        run: npm run ats:contracts:publish --access=public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm run ats:contracts:publish
 
       - name: Publish ats/sdk
         if: contains(github.ref_name, 'ats')
-        run: npm run ats:sdk:publish --access=public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm run ats:sdk:publish
 
       # --- Mass Payout publishing ---
       - name: Publish mass-payout
         if: contains(github.ref_name, 'mp')
-        run: npm run mass-payout:publish --access=public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm run mass-payout:publish
diff --git a/.gitignore b/.gitignore
index 85fb6c4b4..561e1422f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,6 +117,7 @@ dist
 
 # Stores VSCode versions used for testing VSCode extensions
 .vscode-test
+.github/
 
 # Mac files
 .DS_Store
diff --git a/apps/ats/web/package.json b/apps/ats/web/package.json
index 3e2bd1a08..48590352e 100644
--- a/apps/ats/web/package.json
+++ b/apps/ats/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/asset-tokenization-dapp",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "license": "Apache-2.0",
   "scripts": {
     "build": "tsc && vite build",
diff --git a/apps/ats/web/src/i18n/en/security/coupons.ts b/apps/ats/web/src/i18n/en/security/coupons.ts
index 2a0e88d34..e733b165b 100644
--- a/apps/ats/web/src/i18n/en/security/coupons.ts
+++ b/apps/ats/web/src/i18n/en/security/coupons.ts
@@ -216,6 +216,7 @@ export default {
       recordDate: 'Record Date',
       executionDate: 'Execution Date',
       rate: 'Coupon Rate',
+      period: 'Period',
       snapshotId: 'Snapshot',
     },
     emptyTable: 'No coupons found',
@@ -239,6 +240,19 @@ export default {
         placeholder: '0,123%',
         tooltip: 'Interest rate for the coupon.',
       },
+      period: {
+        label: 'Coupon period',
+        placeholder: 'Select coupon period',
+        tooltip:
+          'The period between coupon payments. This field is required for all coupon operations.',
+        options: {
+          day: '1 Day',
+          week: '1 Week',
+          month: '1 Month',
+          quarter: '3 Months',
+          year: '1 Year',
+        },
+      },
     },
   },
   see: {
@@ -261,6 +275,7 @@ export default {
     details: {
       title: 'Detail',
       paymentDay: 'Payment day',
+      period: 'Period',
       amount: 'Amount',
     },
   },
diff --git a/apps/ats/web/src/utils/constants.ts b/apps/ats/web/src/utils/constants.ts
index 9503ec475..cbf53cb6b 100644
--- a/apps/ats/web/src/utils/constants.ts
+++ b/apps/ats/web/src/utils/constants.ts
@@ -224,5 +224,28 @@ export const NOMINAL_VALUE_FACTOR = 100;
 
 export const DATE_TIME_FORMAT = 'dd/MM/yyyy HH:mm:ss';
 
+// * Time periods (in seconds and milliseconds)
+export const TIME_PERIODS_S = {
+  SECOND: 1,
+  MINUTE: 60,
+  HOUR: 60 * 60,
+  DAY: 24 * 60 * 60,
+  WEEK: 7 * 24 * 60 * 60,
+  MONTH: 30 * 24 * 60 * 60,
+  QUARTER: 90 * 24 * 60 * 60,
+  YEAR: 365 * 24 * 60 * 60,
+};
+
+export const TIME_PERIODS_MS = {
+  SECOND: TIME_PERIODS_S.SECOND * 1000,
+  MINUTE: TIME_PERIODS_S.MINUTE * 1000,
+  HOUR: TIME_PERIODS_S.HOUR * 1000,
+  DAY: TIME_PERIODS_S.DAY * 1000,
+  WEEK: TIME_PERIODS_S.WEEK * 1000,
+  MONTH: TIME_PERIODS_S.MONTH * 1000,
+  QUARTER: TIME_PERIODS_S.QUARTER * 1000,
+  YEAR: TIME_PERIODS_S.YEAR * 1000,
+};
+
 export const DEFAULT_PARTITION =
   '0x0000000000000000000000000000000000000000000000000000000000000001';
diff --git a/apps/ats/web/src/utils/format.ts b/apps/ats/web/src/utils/format.ts
index a5387f068..6ed22b358 100644
--- a/apps/ats/web/src/utils/format.ts
+++ b/apps/ats/web/src/utils/format.ts
@@ -292,6 +292,59 @@ export const formatPeriod = ({
   return `${amount} ${unit}`;
 };
 
+/**
+ * Formats a period in seconds to human-readable format
+ */
+export const formatCouponPeriod = (periodInSeconds: number): string => {
+  const { TIME_PERIODS_S } = require('./constants');
+
+  if (periodInSeconds >= TIME_PERIODS_S.YEAR) {
+    const years = Math.floor(periodInSeconds / TIME_PERIODS_S.YEAR);
+    return `${years} ${years === 1 ? 'Year' : 'Years'}`;
+  }
+  if (periodInSeconds >= TIME_PERIODS_S.QUARTER) {
+    const quarters = Math.floor(periodInSeconds / TIME_PERIODS_S.QUARTER);
+    return `${quarters} ${quarters === 1 ? 'Quarter' : 'Quarters'}`;
+  }
+  if (periodInSeconds >= TIME_PERIODS_S.MONTH) {
+    const months = Math.floor(periodInSeconds / TIME_PERIODS_S.MONTH);
+    return `${months} ${months === 1 ? 'Month' : 'Months'}`;
+  }
+  if (periodInSeconds >= TIME_PERIODS_S.WEEK) {
+    const weeks = Math.floor(periodInSeconds / TIME_PERIODS_S.WEEK);
+    return `${weeks} ${weeks === 1 ? 'Week' : 'Weeks'}`;
+  }
+  if (periodInSeconds >= TIME_PERIODS_S.DAY) {
+    const days = Math.floor(periodInSeconds / TIME_PERIODS_S.DAY);
+    return `${days} ${days === 1 ? 'Day' : 'Days'}`;
+  }
+  return `${periodInSeconds} Seconds`;
+};
+
+/**
+ * Validates if a period is within acceptable bounds
+ * Period is REQUIRED for all coupon operations
+ */
+export const validateCouponPeriod = (
+  periodInSeconds: number,
+  maturityDate?: Date,
+): string | true => {
+  // Period is required - cannot be null or undefined
+  if (!periodInSeconds || periodInSeconds < 0) {
+    return 'Coupon period is required and must be greater or equal to 0';
+  }
+
+  if (maturityDate) {
+    const timeToMaturity = Math.floor(
+      (maturityDate.getTime() - Date.now()) / 1000,
+    );
+    if (periodInSeconds > timeToMaturity) {
+      return 'Period cannot exceed bond maturity date';
+    }
+  }
+  return true;
+};
+
 //TODO: remove?
 export const formatNumber = (
   value: number | string | null,
diff --git a/apps/ats/web/src/utils/rules.ts b/apps/ats/web/src/utils/rules.ts
index a7782ffa0..dc282f5ce 100644
--- a/apps/ats/web/src/utils/rules.ts
+++ b/apps/ats/web/src/utils/rules.ts
@@ -210,8 +210,8 @@ import isEqual from 'date-fns/isEqual';
 import i18n from '../i18n';
 import { formatDate, toDate } from './format';
 
-const t = (key: string, options?: object) => {
-  return i18n.t(`rules:${key}`, options || {});
+const t = (key: string, options?: Record<string, unknown>) => {
+  return i18n.t(`rules:${key}`, options);
 };
 
 export const maxLength = (value: number) => ({
@@ -321,3 +321,23 @@ export const isValidHederaId = (val: string) => {
   const maskRegex = /^[0-9]\.[0-9]\.[0-9]{1,7}$/;
   return maskRegex.test(val) || t('isValidHederaId');
 };
+
+export const isValidCouponPeriod = (val: string) => {
+  try {
+    // Period is required - cannot be empty or null
+    if (!val || val.trim() === '') {
+      return 'Coupon period is required';
+    }
+
+    const periodValue = parseInt(val);
+    if (isNaN(periodValue) || periodValue <= 0) {
+      return 'Coupon period must be a valid positive number';
+    }
+
+    const { validateCouponPeriod } = require('./format');
+    const validation = validateCouponPeriod(periodValue);
+    return validation === true || validation;
+  } catch (error) {
+    return 'Invalid coupon period';
+  }
+};
diff --git a/apps/ats/web/src/views/CreateBond/Components/StepCoupon.tsx b/apps/ats/web/src/views/CreateBond/Components/StepCoupon.tsx
index d4437cc8c..a30ec15b5 100644
--- a/apps/ats/web/src/views/CreateBond/Components/StepCoupon.tsx
+++ b/apps/ats/web/src/views/CreateBond/Components/StepCoupon.tsx
@@ -309,6 +309,7 @@ export const StepCoupon = () => {
           options={CouponTypeOptions}
         />
       </Stack>
+
       {couponType === 1 && (
         <>
           <Stack w="full">
diff --git a/apps/ats/web/src/views/CreateBond/Components/StepReview.tsx b/apps/ats/web/src/views/CreateBond/Components/StepReview.tsx
index 7a6b59505..af5c12069 100644
--- a/apps/ats/web/src/views/CreateBond/Components/StepReview.tsx
+++ b/apps/ats/web/src/views/CreateBond/Components/StepReview.tsx
@@ -344,15 +344,15 @@ export const StepReview = () => {
       configVersion: parseInt(process.env.REACT_APP_BOND_CONFIG_VERSION ?? '0'),
       ...(externalPausesList &&
         externalPausesList.length > 0 && {
-          externalPauses: externalPausesList,
+          externalPausesIds: externalPausesList,
         }),
       ...(externalControlList &&
         externalControlList.length > 0 && {
-          externalControlLists: externalControlList,
+          externalControlListsIds: externalControlList,
         }),
       ...(externalKYCList &&
         externalKYCList.length > 0 && {
-          externalKycLists: externalKYCList,
+          externalKycListsIds: externalKYCList,
         }),
       internalKycActivated,
       ...(complianceId && {
diff --git a/apps/ats/web/src/views/CreateEquity/Components/StepReview.tsx b/apps/ats/web/src/views/CreateEquity/Components/StepReview.tsx
index ce577d717..5d01d3d17 100644
--- a/apps/ats/web/src/views/CreateEquity/Components/StepReview.tsx
+++ b/apps/ats/web/src/views/CreateEquity/Components/StepReview.tsx
@@ -336,15 +336,15 @@ export const StepReview = () => {
       ),
       ...(externalPausesList &&
         externalPausesList.length > 0 && {
-          externalPauses: externalPausesList,
+          externalPausesIds: externalPausesList,
         }),
       ...(externalControlList &&
         externalControlList.length > 0 && {
-          externalControlLists: externalControlList,
+          externalControlListsIds: externalControlList,
         }),
       ...(externalKYCList &&
         externalKYCList.length > 0 && {
-          externalKycLists: externalKYCList,
+          externalKycListsIds: externalKYCList,
         }),
       internalKycActivated,
       ...(complianceId && {
diff --git a/apps/ats/web/src/views/DigitalSecurityDetails/Components/ClearingOperations/ClearingOperationCreate.tsx b/apps/ats/web/src/views/DigitalSecurityDetails/Components/ClearingOperations/ClearingOperationCreate.tsx
index c1f1d77c3..f2d358638 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/ClearingOperations/ClearingOperationCreate.tsx
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/ClearingOperations/ClearingOperationCreate.tsx
@@ -132,7 +132,7 @@ export const ClearingOperationsCreate = () => {
         amount: amount.toString(),
         clearingExpirationDate: dateToUnixTimestamp(expirationDate),
         holdExpirationDate: dateToUnixTimestamp(holdExpirationDate),
-        escrow: escrowAccount,
+        escrowId: escrowAccount,
         // TODO: check with SDK: sourceId,
         targetId,
         partitionId: DEFAULT_PARTITION,
diff --git a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/CouponsList.tsx b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/CouponsList.tsx
index 2a88a69b3..db262837e 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/CouponsList.tsx
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/CouponsList.tsx
@@ -8,7 +8,7 @@ import { createColumnHelper } from '@tanstack/table-core';
 import { Table, Text } from 'io-bricks-ui';
 import { useTranslation } from 'react-i18next';
 import { COUPONS_FACTOR, DATE_TIME_FORMAT } from '../../../../utils/constants';
-import { formatDate } from '../../../../utils/format';
+import { formatDate, formatCouponPeriod } from '../../../../utils/format';
 
 export const CouponsList = () => {
   const { id } = useParams();
@@ -49,6 +49,11 @@ export const CouponsList = () => {
       cell: (row) => `${parseInt(row.getValue()) / COUPONS_FACTOR}%`,
       enableSorting: false,
     }),
+    columnHelper.accessor('period', {
+      header: t('columns.period'),
+      cell: (row) => formatCouponPeriod(row.getValue()),
+      enableSorting: false,
+    }),
     columnHelper.accessor('snapshotId', {
       header: t('columns.snapshotId'),
       cell: (row) => row.getValue() ?? '-',
diff --git a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/ProgramCoupon.tsx b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/ProgramCoupon.tsx
index dd1a26132..d71924707 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/ProgramCoupon.tsx
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/ProgramCoupon.tsx
@@ -208,6 +208,7 @@ import {
   CalendarInputController,
   InputNumberController,
   PhosphorIcon,
+  SelectController,
   Text,
   Tooltip,
 } from 'io-bricks-ui';
@@ -222,14 +223,22 @@ import {
 import { useParams } from 'react-router-dom';
 import { useCoupons } from '../../../../hooks/queries/useCoupons';
 import { useGetBondDetails } from '../../../../hooks/queries/useGetSecurityDetails';
-import { dateToUnixTimestamp } from '../../../../utils/format';
-import { COUPONS_FACTOR, DATE_TIME_FORMAT } from '../../../../utils/constants';
+import {
+  dateToUnixTimestamp,
+  validateCouponPeriod,
+} from '../../../../utils/format';
+import {
+  COUPONS_FACTOR,
+  DATE_TIME_FORMAT,
+  TIME_PERIODS_S,
+} from '../../../../utils/constants';
 import { isBeforeDate } from '../../../../utils/helpers';
 
 interface ProgramCouponFormValues {
   rate: number;
   recordTimestamp: string;
   executionTimestamp: string;
+  period: string;
 }
 
 export const ProgramCoupon = () => {
@@ -257,6 +266,7 @@ export const ProgramCoupon = () => {
       rate: (params.rate * COUPONS_FACTOR).toString(),
       recordTimestamp: dateToUnixTimestamp(params.recordTimestamp),
       executionTimestamp: dateToUnixTimestamp(params.executionTimestamp),
+      period: params.period,
     });
 
     createCoupon(request, {
@@ -345,6 +355,50 @@ export const ProgramCoupon = () => {
               decimalSeparator="."
             />
           </Stack>
+          <Stack w="full">
+            <HStack justifySelf="flex-start">
+              <Text textStyle="BodyTextRegularSM">
+                {tForm('period.label')}*
+              </Text>
+              <Tooltip label={tForm('period.tooltip')} placement="right">
+                <PhosphorIcon as={Info} />
+              </Tooltip>
+            </HStack>
+            <SelectController
+              control={control}
+              id="period"
+              rules={{
+                required,
+                validate: (value: string) => {
+                  const validation = validateCouponPeriod(parseInt(value));
+                  return validation === true || validation;
+                },
+              }}
+              placeholder={tForm('period.placeholder')}
+              options={[
+                {
+                  label: tForm('period.options.day'),
+                  value: TIME_PERIODS_S.DAY.toString(),
+                },
+                {
+                  label: tForm('period.options.week'),
+                  value: TIME_PERIODS_S.WEEK.toString(),
+                },
+                {
+                  label: tForm('period.options.month'),
+                  value: TIME_PERIODS_S.MONTH.toString(),
+                },
+                {
+                  label: tForm('period.options.quarter'),
+                  value: TIME_PERIODS_S.QUARTER.toString(),
+                },
+                {
+                  label: tForm('period.options.year'),
+                  value: TIME_PERIODS_S.YEAR.toString(),
+                },
+              ]}
+            />
+          </Stack>
           <Button
             data-testid="create-coupon-button"
             alignSelf="flex-end"
diff --git a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/SeeCoupon.tsx b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/SeeCoupon.tsx
index da8f1c9ac..9261320c2 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/SeeCoupon.tsx
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/SeeCoupon.tsx
@@ -227,7 +227,7 @@ import {
   useGetCoupons,
   useGetCouponsFor,
 } from '../../../../hooks/queries/useCoupons';
-import { formatDate } from '../../../../utils/format';
+import { formatDate, formatCouponPeriod } from '../../../../utils/format';
 import { DATE_TIME_FORMAT } from '../../../../utils/constants';
 
 interface SeeCouponFormValues {
@@ -405,6 +405,12 @@ export const SeeCoupon = () => {
                 canCopy: true,
                 valueToCopy: coupons.executionDate.toDateString(),
               },
+              {
+                title: tDetail('period'),
+                description: formatCouponPeriod(coupons.period),
+                canCopy: true,
+                valueToCopy: coupons.period.toString(),
+              },
               {
                 title: tDetail('amount'),
                 description: couponsFor.value,
diff --git a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/__tests__/__snapshots__/Coupons.test.tsx.snap b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/__tests__/__snapshots__/Coupons.test.tsx.snap
index fe3395674..864003792 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/__tests__/__snapshots__/Coupons.test.tsx.snap
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/__tests__/__snapshots__/Coupons.test.tsx.snap
@@ -161,6 +161,19 @@ exports[`Coupons should render correctly 1`] = `
                         </div>
                       </div>
                     </th>
+                    <th
+                      class="css-u4onf3"
+                    >
+                      <div
+                        class="css-1lekzkb"
+                      >
+                        <div
+                          class="css-zvlevn"
+                        >
+                          Period
+                        </div>
+                      </div>
+                    </th>
                     <th
                       class="css-u4onf3"
                     >
@@ -234,6 +247,17 @@ exports[`Coupons should render correctly 1`] = `
                         />
                       </div>
                     </td>
+                    <td
+                      class="css-1kbbn1r"
+                    >
+                      <div
+                        class="css-zvlevn"
+                      >
+                        <div
+                          class="chakra-skeleton css-yixgko"
+                        />
+                      </div>
+                    </td>
                   </tr>
                 </tbody>
               </table>
@@ -519,6 +543,127 @@ exports[`Coupons should render correctly 1`] = `
                   </label>
                 </div>
               </div>
+              <div
+                class="chakra-stack css-1h0sumw"
+              >
+                <div
+                  class="chakra-stack css-1nqqhpy"
+                >
+                  <p
+                    class="css-0"
+                  >
+                    Coupon period*
+                  </p>
+                  <div
+                    class="css-k008qs"
+                  >
+                    <svg
+                      class="chakra-icon css-kpbtv0"
+                      fill="currentColor"
+                      focusable="false"
+                      height="1em"
+                      viewBox="0 0 256 256"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Zm16-40a8,8,0,0,1-8,8,16,16,0,0,1-16-16V128a8,8,0,0,1,0-16,16,16,0,0,1,16,16v40A8,8,0,0,1,144,176ZM112,84a12,12,0,1,1,12,12A12,12,0,0,1,112,84Z"
+                      />
+                    </svg>
+                  </div>
+                </div>
+                <div
+                  class="chakra-form-control css-1kxonj9"
+                  role="group"
+                >
+                  <label
+                    class="chakra-form__label css-1egrqbi"
+                    for="period"
+                    id="field-:rg:-label"
+                  >
+                    <div
+                      class="css-kjafn5"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-2-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="css-13cymwt-control"
+                      >
+                        <div
+                          class="css-hlgwow"
+                        >
+                          <div
+                            class="css-1jqq78o-placeholder"
+                            id="react-select-2-placeholder"
+                          >
+                            Select coupon period
+                          </div>
+                          <div
+                            class="css-19bb58m"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-2-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class=""
+                              id="period"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="css-1wy0on6"
+                        >
+                          <div
+                            class="css-sppt3c"
+                          >
+                            <div
+                              class="css-amv3mm"
+                            >
+                              <svg
+                                class="chakra-icon css-1bnjyrz"
+                                fill="currentColor"
+                                focusable="false"
+                                height="1em"
+                                viewBox="0 0 256 256"
+                                width="1em"
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M213.66,101.66l-80,80a8,8,0,0,1-11.32,0l-80-80A8,8,0,0,1,53.66,90.34L128,164.69l74.34-74.35a8,8,0,0,1,11.32,11.32Z"
+                                />
+                              </svg>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <input
+                        name="period"
+                        type="hidden"
+                        value=""
+                      />
+                    </div>
+                  </label>
+                </div>
+              </div>
               <button
                 class="chakra-button css-1i50xze"
                 data-tesdtid="send-button"
@@ -592,7 +737,7 @@ exports[`Coupons should render correctly 1`] = `
                         <input
                           class="chakra-input css-ifstuv"
                           data-testid="couponId"
-                          id="field-:rg:"
+                          id="field-:rj:"
                           inputmode="numeric"
                           name="couponId"
                           placeholder="Add ID"
diff --git a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/__tests__/__snapshots__/ProgramCoupon.test.tsx.snap b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/__tests__/__snapshots__/ProgramCoupon.test.tsx.snap
index e96962dd8..2a2843e8b 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/__tests__/__snapshots__/ProgramCoupon.test.tsx.snap
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/__tests__/__snapshots__/ProgramCoupon.test.tsx.snap
@@ -273,6 +273,127 @@ exports[`ProgramCoupon should render correctly 1`] = `
           </label>
         </div>
       </div>
+      <div
+        class="chakra-stack css-1h0sumw"
+      >
+        <div
+          class="chakra-stack css-1nqqhpy"
+        >
+          <p
+            class="css-0"
+          >
+            Coupon period*
+          </p>
+          <div
+            class="css-k008qs"
+          >
+            <svg
+              class="chakra-icon css-kpbtv0"
+              fill="currentColor"
+              focusable="false"
+              height="1em"
+              viewBox="0 0 256 256"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Zm16-40a8,8,0,0,1-8,8,16,16,0,0,1-16-16V128a8,8,0,0,1,0-16,16,16,0,0,1,16,16v40A8,8,0,0,1,144,176ZM112,84a12,12,0,1,1,12,12A12,12,0,0,1,112,84Z"
+              />
+            </svg>
+          </div>
+        </div>
+        <div
+          class="chakra-form-control css-1kxonj9"
+          role="group"
+        >
+          <label
+            class="chakra-form__label css-1egrqbi"
+            for="period"
+            id="field-:rf:-label"
+          >
+            <div
+              class="css-kjafn5"
+            >
+              <span
+                class="css-1f43avz-a11yText-A11yText"
+                id="react-select-2-live-region"
+              />
+              <span
+                aria-atomic="false"
+                aria-live="polite"
+                aria-relevant="additions text"
+                class="css-1f43avz-a11yText-A11yText"
+              />
+              <div
+                class="css-13cymwt-control"
+              >
+                <div
+                  class="css-hlgwow"
+                >
+                  <div
+                    class="css-1jqq78o-placeholder"
+                    id="react-select-2-placeholder"
+                  >
+                    Select coupon period
+                  </div>
+                  <div
+                    class="css-19bb58m"
+                    data-value=""
+                  >
+                    <input
+                      aria-autocomplete="list"
+                      aria-describedby="react-select-2-placeholder"
+                      aria-expanded="false"
+                      aria-haspopup="true"
+                      autocapitalize="none"
+                      autocomplete="off"
+                      autocorrect="off"
+                      class=""
+                      id="period"
+                      role="combobox"
+                      spellcheck="false"
+                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                      tabindex="0"
+                      type="text"
+                      value=""
+                    />
+                  </div>
+                </div>
+                <div
+                  class="css-1wy0on6"
+                >
+                  <div
+                    class="css-sppt3c"
+                  >
+                    <div
+                      class="css-amv3mm"
+                    >
+                      <svg
+                        class="chakra-icon css-1bnjyrz"
+                        fill="currentColor"
+                        focusable="false"
+                        height="1em"
+                        viewBox="0 0 256 256"
+                        width="1em"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M213.66,101.66l-80,80a8,8,0,0,1-11.32,0l-80-80A8,8,0,0,1,53.66,90.34L128,164.69l74.34-74.35a8,8,0,0,1,11.32,11.32Z"
+                        />
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <input
+                name="period"
+                type="hidden"
+                value=""
+              />
+            </div>
+          </label>
+        </div>
+      </div>
       <button
         class="chakra-button css-1i50xze"
         data-tesdtid="send-button"
diff --git a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Hold/HoldCreate.tsx b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Hold/HoldCreate.tsx
index f33726cd3..fa2f2d046 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Hold/HoldCreate.tsx
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Hold/HoldCreate.tsx
@@ -88,7 +88,7 @@ export const HoldCreate = () => {
 
     const baseRequest = {
       amount: amount.toString(),
-      escrow: escrowAccount.toString(),
+      escrowId: escrowAccount.toString(),
       expirationDate: dateToUnixTimestamp(expirationDate),
       partitionId: DEFAULT_PARTITION,
       securityId,
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 5888a29d5..70b811e7a 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -37,7 +37,8 @@ export default [
       '**/commitlint.config.ts',
       '**/jest.config.js',
       '**/hardhat.config.ts',
-      '**/*.js',
+      '**/build/**/*.js',
+      '**/dist/**/*.js',
       '**/*d.ts',
       '**/tmp/**',
       '**/example/**',
diff --git a/package-lock.json b/package-lock.json
index 9f0c6127d..7b1ef9b4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
     },
     "apps/ats/web": {
       "name": "@hashgraph/asset-tokenization-dapp",
-      "version": "1.16.0",
+      "version": "1.16.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@chakra-ui/react": "2.6.1",
@@ -37377,7 +37377,7 @@
     },
     "packages/ats/contracts": {
       "name": "@hashgraph/asset-tokenization-contracts",
-      "version": "1.16.0",
+      "version": "1.16.1",
       "license": "Apache-2.0",
       "devDependencies": {
         "@hashgraph/sdk": "^2.62.0",
@@ -37717,7 +37717,7 @@
     },
     "packages/ats/sdk": {
       "name": "@hashgraph/asset-tokenization-sdk",
-      "version": "1.16.0",
+      "version": "1.16.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@ethersproject/contracts": "^5.7.0",
diff --git a/packages/ats/contracts/Configuration.ts b/packages/ats/contracts/Configuration.ts
index 83a0841e8..a9bcd1032 100644
--- a/packages/ats/contracts/Configuration.ts
+++ b/packages/ats/contracts/Configuration.ts
@@ -227,46 +227,47 @@ export const CONTRACT_NAMES = [
     'Factory',
     'BusinessLogicResolver',
     'AccessControlFacet',
-    'Cap',
-    'ControlList',
+    'CapFacet',
+    'ControlListFacet',
     'PauseFacet',
-    'ERC20',
-    'ERC20Permit',
-    'ERC20Votes',
+    'ERC20Facet',
+    'ERC20PermitFacet',
+    'ERC1410ScheduledTasksFacet',
+    'ERC20Votes', //TODO
     'ERC1410ReadFacet',
     'ERC1410ManagementFacet',
     'ERC1410TokenHolderFacet',
-    'ERC1594',
-    'ERC1643',
-    'ERC1644',
+    'ERC1594Facet',
+    'ERC1643Facet',
+    'ERC1644Facet',
     'DiamondFacet',
-    'EquityUSA',
-    'BondUSA',
-    'BondUSARead',
-    'ScheduledSnapshots',
-    'ScheduledBalanceAdjustments',
-    'ScheduledTasks',
-    'Snapshots',
-    'CorporateActions',
-    'TransferAndLock',
-    'Lock',
-    'AdjustBalances',
-    'ProtectedPartitions',
+    'EquityUSAFacet',
+    'BondUSAFacet',
+    'BondUSARead', //TODO
+    'ScheduledSnapshotsFacet',
+    'ScheduledBalanceAdjustmentsFacet',
+    'ScheduledTasksFacet',
+    'SnapshotsFacet',
+    'CorporateActionsFacet',
+    'TransferAndLockFacet',
+    'LockFacet',
+    'AdjustBalancesFacet',
+    'ProtectedPartitionsFacet',
     'HoldReadFacet',
     'HoldTokenHolderFacet',
     'HoldManagementFacet',
     'TimeTravel',
-    'Kyc',
-    'SsiManagement',
+    'KycFacet',
+    'SsiManagementFacet',
     'ClearingHoldCreationFacet',
     'ClearingRedeemFacet',
     'ClearingTransferFacet',
     'ClearingReadFacet',
     'ClearingActionsFacet',
-    'ExternalPauseManagement',
-    'ExternalControlListManagement',
-    'ExternalKycListManagement',
-    'ERC3643',
+    'ExternalPauseManagementFacet',
+    'ExternalControlListManagementFacet',
+    'ExternalKycListManagementFacet',
+    'ERC3643Facet',
     'FreezeFacet',
     'ERC3643ManagementFacet',
     'ERC3643ReadFacet',
diff --git a/packages/ats/contracts/README.md b/packages/ats/contracts/README.md
index 9fc891e2b..640406656 100644
--- a/packages/ats/contracts/README.md
+++ b/packages/ats/contracts/README.md
@@ -271,9 +271,9 @@ The Asset Tokenization Studio uses a modular diamond pattern architecture where
 - `ERC1410ManagementFacet`: Token partition management and administrative functions
 - `ERC1410ReadFacet`: Read-only token state queries
 - `ERC1410TokenHolderFacet`: Token holder operations (transfers, approvals)
-- `ERC20`: Basic ERC20 compatibility layer
-- `ERC1594`: Security token issuance and redemption
-- `ERC1644`: Controller operations for forced transfers
+- `ERC20Facet`: Basic ERC20 compatibility layer
+- `ERC1594Facet`: Security token issuance and redemption
+- `ERC1644Facet`: Controller operations for forced transfers
 
 **ERC3643 (T-REX) Compliance Facets:**
 
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/TREXFactory.sol b/packages/ats/contracts/contracts/factory/ERC3643/TREXFactory.sol
index c1b4fd44b..addb2ea0c 100644
--- a/packages/ats/contracts/contracts/factory/ERC3643/TREXFactory.sol
+++ b/packages/ats/contracts/contracts/factory/ERC3643/TREXFactory.sol
@@ -291,8 +291,8 @@ contract TREXFactoryAts is ITREXFactory, Ownable {
         ClaimDetails calldata _claimDetails,
         TRexIFactory.EquityData calldata _equityData,
         FactoryRegulationData calldata _factoryRegulationData
-    ) external {
-        TREXEquityDeploymentLib.deployTREXSuiteAtsEquity(
+    ) external returns (address equityAddress_) {
+        equityAddress_ = TREXEquityDeploymentLib.deployTREXSuiteAtsEquity(
             tokenDeployed,
             implementationAuthority,
             idFactory,
@@ -315,8 +315,8 @@ contract TREXFactoryAts is ITREXFactory, Ownable {
         ClaimDetails calldata _claimDetails,
         TRexIFactory.BondData calldata _bondData,
         FactoryRegulationData calldata _factoryRegulationData
-    ) external {
-        TREXBondDeploymentLib.deployTREXSuiteAtsBond(
+    ) external returns (address bondAddress_) {
+        bondAddress_ = TREXBondDeploymentLib.deployTREXSuiteAtsBond(
             tokenDeployed,
             implementationAuthority,
             idFactory,
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBondRead.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBondRead.sol
index 1b77397a0..c48f67a3e 100644
--- a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBondRead.sol
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBondRead.sol
@@ -224,6 +224,7 @@ interface TRexIBondRead {
         uint256 recordDate;
         uint256 executionDate;
         uint256 rate;
+        uint256 period;
     }
 
     struct RegisteredCoupon {
@@ -236,6 +237,7 @@ interface TRexIBondRead {
         uint256 rate;
         uint256 recordDate;
         uint256 executionDate;
+        uint256 period;
         uint8 decimals;
         bool recordDateReached;
     }
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/libraries/TREXBondDeploymentLib.sol b/packages/ats/contracts/contracts/factory/ERC3643/libraries/TREXBondDeploymentLib.sol
index 501914095..366515d22 100644
--- a/packages/ats/contracts/contracts/factory/ERC3643/libraries/TREXBondDeploymentLib.sol
+++ b/packages/ats/contracts/contracts/factory/ERC3643/libraries/TREXBondDeploymentLib.sol
@@ -226,7 +226,7 @@ library TREXBondDeploymentLib {
         ITREXFactory.ClaimDetails calldata _claimDetails,
         TRexIFactory.BondData calldata _bondData,
         FactoryRegulationData calldata _factoryRegulationData
-    ) external {
+    ) external returns (address) {
         IToken token = SecurityDeploymentLib.deployBond(
             _atsFactory,
             _tokenDetails.owner,
@@ -244,5 +244,6 @@ library TREXBondDeploymentLib {
             _bondData.security.identityRegistry,
             _bondData.security.compliance
         );
+        return (address(token));
     }
 }
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/libraries/TREXEquityDeploymentLib.sol b/packages/ats/contracts/contracts/factory/ERC3643/libraries/TREXEquityDeploymentLib.sol
index 60fcbd99d..29ea755cd 100644
--- a/packages/ats/contracts/contracts/factory/ERC3643/libraries/TREXEquityDeploymentLib.sol
+++ b/packages/ats/contracts/contracts/factory/ERC3643/libraries/TREXEquityDeploymentLib.sol
@@ -227,7 +227,7 @@ library TREXEquityDeploymentLib {
         ITREXFactory.ClaimDetails calldata _claimDetails,
         TRexIFactory.EquityData calldata _equityData,
         FactoryRegulationData calldata _factoryRegulationData
-    ) external {
+    ) external returns (address) {
         IToken token = SecurityDeploymentLib.deployEquity(
             _atsFactory,
             _tokenDetails.owner,
@@ -245,5 +245,6 @@ library TREXEquityDeploymentLib {
             _equityData.security.identityRegistry,
             _equityData.security.compliance
         );
+        return (address(token));
     }
 }
diff --git a/packages/ats/contracts/contracts/layer_0/bond/BondStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/bond/BondStorageWrapper.sol
index 3504840c5..6ae8e6194 100644
--- a/packages/ats/contracts/contracts/layer_0/bond/BondStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/bond/BondStorageWrapper.sol
@@ -346,6 +346,7 @@ abstract contract BondStorageWrapper is
         couponFor_.rate = registeredCoupon.coupon.rate;
         couponFor_.recordDate = registeredCoupon.coupon.recordDate;
         couponFor_.executionDate = registeredCoupon.coupon.executionDate;
+        couponFor_.period = registeredCoupon.coupon.period;
 
         if (registeredCoupon.coupon.recordDate < _blockTimestamp()) {
             couponFor_.recordDateReached = true;
@@ -443,6 +444,7 @@ abstract contract BondStorageWrapper is
             _newCoupon.recordDate = runDate;
             _newCoupon.executionDate = runDate;
             _newCoupon.rate = _rate;
+            _newCoupon.period = _couponFrequency;
 
             (success, , ) = _setCoupon(_newCoupon);
 
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594.sol
index 235a4cdb4..cf9e8ca60 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594.sol
@@ -206,17 +206,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_ERC1594_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
 import {_ISSUER_ROLE, _AGENT_ROLE} from '../../constants/roles.sol';
 import {IERC1594} from '../../interfaces/ERC1400/IERC1594.sol';
 import {Common} from '../../common/Common.sol';
 import {_DEFAULT_PARTITION} from '../../../layer_0/constants/values.sol';
-import {Common} from '../../common/Common.sol';
 
-contract ERC1594 is IERC1594, IStaticFunctionSelectors, Common {
+abstract contract ERC1594 is IERC1594, Common {
     // solhint-disable-next-line func-name-mixedcase
     function initialize_ERC1594()
         external
@@ -447,51 +442,4 @@ contract ERC1594 is IERC1594, IStaticFunctionSelectors, Common {
             );
         return (status, statusCode, reason);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _ERC1594_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        staticFunctionSelectors_ = new bytes4[](9);
-        uint256 selectorsIndex;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .initialize_ERC1594
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .transferWithData
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .transferFromWithData
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.isIssuable.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.issue.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.redeem.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.redeemFrom.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.canTransfer.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .canTransferFrom
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC1594).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Facet.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594Facet.sol
similarity index 92%
rename from packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Facet.sol
rename to packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594Facet.sol
index 24f6cbdd4..4f99d8826 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Facet.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594Facet.sol
@@ -206,21 +206,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {_ERC3643_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IERC3643Management} from '../interfaces/ERC3643/IERC3643Management.sol';
 import {
     IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {ERC3643Management} from './ERC3643Management.sol';
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_ERC1594_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
+import {IERC1594} from '../../interfaces/ERC1400/IERC1594.sol';
+import {ERC1594} from './ERC1594.sol';
 
-contract ERC3643ManagementFacet is IStaticFunctionSelectors, ERC3643Management {
+contract ERC1594Facet is ERC1594, IStaticFunctionSelectors {
     function getStaticResolverKey()
         external
         pure
         override
         returns (bytes32 staticResolverKey_)
     {
-        staticResolverKey_ = _ERC3643_MANAGEMENT_RESOLVER_KEY;
+        staticResolverKey_ = _ERC1594_RESOLVER_KEY;
     }
 
     function getStaticFunctionSelectors()
@@ -232,21 +232,21 @@ contract ERC3643ManagementFacet is IStaticFunctionSelectors, ERC3643Management {
         staticFunctionSelectors_ = new bytes4[](9);
         uint256 selectorsIndex;
         staticFunctionSelectors_[selectorsIndex++] = this
-            .initialize_ERC3643
+            .initialize_ERC1594
             .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.setName.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.setSymbol.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.setOnchainID.selector;
         staticFunctionSelectors_[selectorsIndex++] = this
-            .setIdentityRegistry
+            .transferWithData
             .selector;
         staticFunctionSelectors_[selectorsIndex++] = this
-            .setCompliance
+            .transferFromWithData
             .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.addAgent.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.removeAgent.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.isIssuable.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.issue.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.redeem.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.redeemFrom.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.canTransfer.selector;
         staticFunctionSelectors_[selectorsIndex++] = this
-            .recoveryAddress
+            .canTransferFrom
             .selector;
     }
 
@@ -258,7 +258,6 @@ contract ERC3643ManagementFacet is IStaticFunctionSelectors, ERC3643Management {
     {
         staticInterfaceIds_ = new bytes4[](1);
         uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC3643Management)
-            .interfaceId;
+        staticInterfaceIds_[selectorsIndex++] = type(IERC1594).interfaceId;
     }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643.sol
index 15dec23e2..1716d0aff 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643.sol
@@ -210,12 +210,8 @@ import {IERC1643} from '../../interfaces/ERC1400/IERC1643.sol';
 import {_DOCUMENTER_ROLE} from '../../constants/roles.sol';
 import {_ERC1643_STORAGE_POSITION} from '../../constants/storagePositions.sol';
 import {Common} from '../../common/Common.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_ERC1643_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
 
-contract ERC1643 is IERC1643, IStaticFunctionSelectors, Common {
+abstract contract ERC1643 is IERC1643, Common {
     struct Document {
         bytes32 docHash; // Hash of the document
         uint256 lastModified; // Timestamp at which document details was last modified
@@ -326,44 +322,6 @@ contract ERC1643 is IERC1643, IStaticFunctionSelectors, Common {
         return _erc1643Storage().docNames;
     }
 
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _ERC1643_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        staticFunctionSelectors_ = new bytes4[](4);
-        uint256 selectorsIndex;
-        staticFunctionSelectors_[selectorsIndex++] = this.getDocument.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.setDocument.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .removeDocument
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .getAllDocuments
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC1643).interfaceId;
-    }
-
     function _erc1643Storage()
         internal
         pure
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643Facet.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643Facet.sol
new file mode 100644
index 000000000..ee99ec481
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643Facet.sol
@@ -0,0 +1,254 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {IERC1643} from '../../interfaces/ERC1400/IERC1643.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_ERC1643_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
+import {ERC1643} from './ERC1643.sol';
+
+contract ERC1643Facet is ERC1643, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _ERC1643_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        staticFunctionSelectors_ = new bytes4[](4);
+        uint256 selectorsIndex;
+        staticFunctionSelectors_[selectorsIndex++] = this.getDocument.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.setDocument.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .removeDocument
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .getAllDocuments
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IERC1643).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644.sol
index cb0a05aa8..741ccef19 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644.sol
@@ -212,13 +212,9 @@ import {
     _CONTROLLER_ROLE,
     _AGENT_ROLE
 } from '../../constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_ERC1644_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
 import {Common} from '../../common/Common.sol';
 
-contract ERC1644 is IERC1644, IStaticFunctionSelectors, Common {
+abstract contract ERC1644 is IERC1644, Common {
     // solhint-disable-next-line func-name-mixedcase
     function initialize_ERC1644(
         bool _controllable
@@ -318,49 +314,4 @@ contract ERC1644 is IERC1644, IStaticFunctionSelectors, Common {
     function isControllable() external view override returns (bool) {
         return _isControllable();
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _ERC1644_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        staticFunctionSelectors_ = new bytes4[](5);
-        uint256 selectorsIndex;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .initialize_ERC1644
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .isControllable
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .controllerTransfer
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .controllerRedeem
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .finalizeControllable
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC1644).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644Facet.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644Facet.sol
new file mode 100644
index 000000000..a99452179
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644Facet.sol
@@ -0,0 +1,261 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {IERC1644} from '../../interfaces/ERC1400/IERC1644.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_ERC1644_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
+import {ERC1644} from './ERC1644.sol';
+
+contract ERC1644Facet is ERC1644, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _ERC1644_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        staticFunctionSelectors_ = new bytes4[](5);
+        uint256 selectorsIndex;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .initialize_ERC1644
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .isControllable
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .controllerTransfer
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .controllerRedeem
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .finalizeControllable
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IERC1644).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20.sol
index 71d7bd417..57466ce3a 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20.sol
@@ -209,13 +209,9 @@ pragma solidity 0.8.18;
 
 import {Common} from '../../common/Common.sol';
 import {IERC20} from '../../interfaces/ERC1400/IERC20.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_ERC20_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
 import {_DEFAULT_PARTITION} from '../../../layer_0/constants/values.sol';
 
-contract ERC20 is IERC20, IStaticFunctionSelectors, Common {
+abstract contract ERC20 is IERC20, Common {
     // solhint-disable-next-line func-name-mixedcase
     function initialize_ERC20(
         ERC20Metadata calldata erc20Metadata
@@ -350,54 +346,4 @@ contract ERC20 is IERC20, IStaticFunctionSelectors, Common {
     function getERC20Metadata() external view returns (ERC20Metadata memory) {
         return _getERC20MetadataAdjusted();
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _ERC20_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        staticFunctionSelectors_ = new bytes4[](12);
-        uint256 selectorsIndex;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .initialize_ERC20
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.approve.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.transfer.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.transferFrom.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .increaseAllowance
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .decreaseAllowance
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.allowance.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .getERC20Metadata
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.name.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.symbol.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.decimals.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.decimalsAt.selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC20).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20Facet.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20Facet.sol
new file mode 100644
index 000000000..1fe08c89c
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20Facet.sol
@@ -0,0 +1,267 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+// Contract copy-pasted form OZ and extended
+pragma solidity 0.8.18;
+
+import {IERC20} from '../../interfaces/ERC1400/IERC20.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_ERC20_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
+import {ERC20} from './ERC20.sol';
+
+contract ERC20Facet is ERC20, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _ERC20_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        staticFunctionSelectors_ = new bytes4[](12);
+        uint256 selectorsIndex;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .initialize_ERC20
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.approve.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.transfer.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.transferFrom.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .increaseAllowance
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .decreaseAllowance
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.allowance.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .getERC20Metadata
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.name.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.symbol.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.decimals.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.decimalsAt.selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IERC20).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20Permit.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20Permit.sol
index e99305e3f..084000023 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20Permit.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20Permit.sol
@@ -209,16 +209,12 @@ pragma solidity 0.8.18;
 
 import {Common} from '../../common/Common.sol';
 import {IERC20Permit} from '../../interfaces/ERC1400/IERC20Permit.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_ERC20PERMIT_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
 import {
     _CONTRACT_NAME_ERC20PERMIT,
     _CONTRACT_VERSION_ERC20PERMIT
 } from '../../constants/values.sol';
 
-contract ERC20Permit is IERC20Permit, IStaticFunctionSelectors, Common {
+abstract contract ERC20Permit is IERC20Permit, Common {
     // solhint-disable-next-line func-name-mixedcase
     function initialize_ERC20Permit()
         external
@@ -262,42 +258,4 @@ contract ERC20Permit is IERC20Permit, IStaticFunctionSelectors, Common {
     function DOMAIN_SEPARATOR() external view override returns (bytes32) {
         return _DOMAIN_SEPARATOR();
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _ERC20PERMIT_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        staticFunctionSelectors_ = new bytes4[](4);
-        uint256 selectorsIndex;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .initialize_ERC20Permit
-            .selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.permit.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this.nonces.selector;
-        staticFunctionSelectors_[selectorsIndex++] = this
-            .DOMAIN_SEPARATOR
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IERC20Permit).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20PermitFacet.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20PermitFacet.sol
new file mode 100644
index 000000000..38fe2e41c
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20PermitFacet.sol
@@ -0,0 +1,255 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+// Contract copy-pasted form OZ and extended
+pragma solidity 0.8.18;
+
+import {IERC20Permit} from '../../interfaces/ERC1400/IERC20Permit.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_ERC20PERMIT_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
+import {ERC20Permit} from './ERC20Permit.sol';
+
+contract ERC20PermitFacet is ERC20Permit, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _ERC20PERMIT_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        staticFunctionSelectors_ = new bytes4[](4);
+        uint256 selectorsIndex;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .initialize_ERC20Permit
+            .selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.permit.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this.nonces.selector;
+        staticFunctionSelectors_[selectorsIndex++] = this
+            .DOMAIN_SEPARATOR
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IERC20Permit).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/cap/Cap.sol b/packages/ats/contracts/contracts/layer_1/cap/Cap.sol
index 32575834c..773c43340 100644
--- a/packages/ats/contracts/contracts/layer_1/cap/Cap.sol
+++ b/packages/ats/contracts/contracts/layer_1/cap/Cap.sol
@@ -208,13 +208,9 @@ pragma solidity 0.8.18;
 
 import {ICap} from '../interfaces/cap/ICap.sol';
 import {_CAP_ROLE} from '../constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_CAP_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {Common} from '../common/Common.sol';
 
-contract Cap is ICap, IStaticFunctionSelectors, Common {
+abstract contract Cap is ICap, Common {
     // solhint-disable-next-line func-name-mixedcase
     function initialize_Cap(
         uint256 maxSupply,
@@ -281,45 +277,4 @@ contract Cap is ICap, IStaticFunctionSelectors, Common {
     ) external view override returns (uint256 maxSupply_) {
         return _getMaxSupplyByPartitionAdjusted(_partition);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _CAP_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](5);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .initialize_Cap
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.setMaxSupply.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .setMaxSupplyByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.getMaxSupply.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getMaxSupplyByPartition
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(ICap).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ControlListTimeTravelTimeTravel.sol b/packages/ats/contracts/contracts/layer_1/cap/CapFacet.sol
similarity index 88%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ControlListTimeTravelTimeTravel.sol
rename to packages/ats/contracts/contracts/layer_1/cap/CapFacet.sol
index cf9223364..1f708d4f4 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ControlListTimeTravelTimeTravel.sol
+++ b/packages/ats/contracts/contracts/layer_1/cap/CapFacet.sol
@@ -206,28 +206,52 @@
 pragma solidity 0.8.18;
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 
-import {ControlList} from '../../../layer_1/controlList/ControlList.sol';
+import {ICap} from '../interfaces/cap/ICap.sol';
 import {
-    TimeTravelStorageWrapper
-} from '../timeTravel/TimeTravelStorageWrapper.sol';
-import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
-
-contract ControlListTimeTravel is ControlList, TimeTravelStorageWrapper {
-    function _blockTimestamp()
-        internal
-        view
-        override(LocalContext, TimeTravelStorageWrapper)
-        returns (uint256)
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_CAP_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {Cap} from './Cap.sol';
+
+contract CapFacet is Cap, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
     {
-        return TimeTravelStorageWrapper._blockTimestamp();
+        staticResolverKey_ = _CAP_RESOLVER_KEY;
     }
 
-    function _blockNumber()
-        internal
-        view
-        override(LocalContext, TimeTravelStorageWrapper)
-        returns (uint256)
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
     {
-        return TimeTravelStorageWrapper._blockNumber();
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](5);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .initialize_Cap
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setMaxSupply.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .setMaxSupplyByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getMaxSupply.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getMaxSupplyByPartition
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(ICap).interfaceId;
     }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingActions.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingActions.sol
new file mode 100644
index 000000000..c07f37e0c
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingActions.sol
@@ -0,0 +1,333 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+import {Common} from '../common/Common.sol';
+import {IClearingActions} from '../interfaces/clearing/IClearingActions.sol';
+import {IClearing} from '../interfaces/clearing/IClearing.sol';
+import {_CLEARING_VALIDATOR_ROLE} from '../constants/roles.sol';
+import {_CLEARING_ROLE} from '../constants/roles.sol';
+
+abstract contract ClearingActions is IClearingActions, Common {
+    function initializeClearing(
+        bool _clearingActive
+    ) external onlyUninitialized(_clearingStorage().initialized) {
+        IClearing.ClearingDataStorage
+            storage clearingStorage = _clearingStorage();
+        clearingStorage.initialized = true;
+        clearingStorage.activated = _clearingActive;
+    }
+
+    function activateClearing()
+        external
+        onlyRole(_CLEARING_ROLE)
+        onlyUnpaused
+        returns (bool success_)
+    {
+        success_ = _setClearing(true);
+        emit ClearingActivated(_msgSender());
+    }
+
+    function deactivateClearing()
+        external
+        onlyRole(_CLEARING_ROLE)
+        onlyUnpaused
+        returns (bool success_)
+    {
+        success_ = _setClearing(false);
+        emit ClearingDeactivated(_msgSender());
+    }
+
+    function approveClearingOperationByPartition(
+        IClearing.ClearingOperationIdentifier
+            calldata _clearingOperationIdentifier
+    )
+        external
+        override
+        onlyRole(_CLEARING_VALIDATOR_ROLE)
+        onlyUnpaused
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationIdentifier.partition
+        )
+        onlyWithValidClearingId(_clearingOperationIdentifier)
+        onlyClearingActivated
+        validateExpirationTimestamp(_clearingOperationIdentifier, false)
+        returns (bool success_)
+    {
+        success_ = _approveClearingOperationByPartition(
+            _clearingOperationIdentifier
+        );
+
+        emit ClearingOperationApproved(
+            _msgSender(),
+            _clearingOperationIdentifier.tokenHolder,
+            _clearingOperationIdentifier.partition,
+            _clearingOperationIdentifier.clearingId,
+            _clearingOperationIdentifier.clearingOperationType
+        );
+    }
+
+    function cancelClearingOperationByPartition(
+        IClearing.ClearingOperationIdentifier
+            calldata _clearingOperationIdentifier
+    )
+        external
+        override
+        onlyRole(_CLEARING_VALIDATOR_ROLE)
+        onlyUnpaused
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationIdentifier.partition
+        )
+        onlyWithValidClearingId(_clearingOperationIdentifier)
+        onlyClearingActivated
+        validateExpirationTimestamp(_clearingOperationIdentifier, false)
+        returns (bool success_)
+    {
+        success_ = _cancelClearingOperationByPartition(
+            _clearingOperationIdentifier
+        );
+        emit ClearingOperationCanceled(
+            _msgSender(),
+            _clearingOperationIdentifier.tokenHolder,
+            _clearingOperationIdentifier.partition,
+            _clearingOperationIdentifier.clearingId,
+            _clearingOperationIdentifier.clearingOperationType
+        );
+    }
+
+    function reclaimClearingOperationByPartition(
+        IClearing.ClearingOperationIdentifier
+            calldata _clearingOperationIdentifier
+    )
+        external
+        override
+        onlyUnpaused
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationIdentifier.partition
+        )
+        onlyWithValidClearingId(_clearingOperationIdentifier)
+        onlyIdentified(_clearingOperationIdentifier.tokenHolder, address(0))
+        onlyClearingActivated
+        validateExpirationTimestamp(_clearingOperationIdentifier, true)
+        returns (bool success_)
+    {
+        success_ = _reclaimClearingOperationByPartition(
+            _clearingOperationIdentifier
+        );
+        emit ClearingOperationReclaimed(
+            _msgSender(),
+            _clearingOperationIdentifier.tokenHolder,
+            _clearingOperationIdentifier.partition,
+            _clearingOperationIdentifier.clearingId,
+            _clearingOperationIdentifier.clearingOperationType
+        );
+    }
+
+    function isClearingActivated() external view returns (bool) {
+        return _isClearingActivated();
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingActionsFacet.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingActionsFacet.sol
index cab81b377..212513033 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingActionsFacet.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingActionsFacet.sol
@@ -206,139 +206,14 @@
 pragma solidity 0.8.18;
 
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
-import {Common} from '../common/Common.sol';
-import {IClearingActions} from '../interfaces/clearing/IClearingActions.sol';
 import {IClearing} from '../interfaces/clearing/IClearing.sol';
-import {_CLEARING_VALIDATOR_ROLE} from '../constants/roles.sol';
 import {
     IStaticFunctionSelectors
 } from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {_CLEARING_ACTIONS_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {_CLEARING_ROLE} from '../constants/roles.sol';
-
-contract ClearingActionsFacet is
-    IStaticFunctionSelectors,
-    IClearingActions,
-    Common
-{
-    function initializeClearing(
-        bool _clearingActive
-    ) external onlyUninitialized(_clearingStorage().initialized) {
-        IClearing.ClearingDataStorage
-            storage clearingStorage = _clearingStorage();
-        clearingStorage.initialized = true;
-        clearingStorage.activated = _clearingActive;
-    }
-
-    function activateClearing()
-        external
-        onlyRole(_CLEARING_ROLE)
-        onlyUnpaused
-        returns (bool success_)
-    {
-        success_ = _setClearing(true);
-        emit ClearingActivated(_msgSender());
-    }
-
-    function deactivateClearing()
-        external
-        onlyRole(_CLEARING_ROLE)
-        onlyUnpaused
-        returns (bool success_)
-    {
-        success_ = _setClearing(false);
-        emit ClearingDeactivated(_msgSender());
-    }
-
-    function approveClearingOperationByPartition(
-        IClearing.ClearingOperationIdentifier
-            calldata _clearingOperationIdentifier
-    )
-        external
-        override
-        onlyRole(_CLEARING_VALIDATOR_ROLE)
-        onlyUnpaused
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationIdentifier.partition
-        )
-        onlyWithValidClearingId(_clearingOperationIdentifier)
-        onlyClearingActivated
-        validateExpirationTimestamp(_clearingOperationIdentifier, false)
-        returns (bool success_)
-    {
-        success_ = _approveClearingOperationByPartition(
-            _clearingOperationIdentifier
-        );
-
-        emit ClearingOperationApproved(
-            _msgSender(),
-            _clearingOperationIdentifier.tokenHolder,
-            _clearingOperationIdentifier.partition,
-            _clearingOperationIdentifier.clearingId,
-            _clearingOperationIdentifier.clearingOperationType
-        );
-    }
-
-    function cancelClearingOperationByPartition(
-        IClearing.ClearingOperationIdentifier
-            calldata _clearingOperationIdentifier
-    )
-        external
-        override
-        onlyRole(_CLEARING_VALIDATOR_ROLE)
-        onlyUnpaused
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationIdentifier.partition
-        )
-        onlyWithValidClearingId(_clearingOperationIdentifier)
-        onlyClearingActivated
-        validateExpirationTimestamp(_clearingOperationIdentifier, false)
-        returns (bool success_)
-    {
-        success_ = _cancelClearingOperationByPartition(
-            _clearingOperationIdentifier
-        );
-        emit ClearingOperationCanceled(
-            _msgSender(),
-            _clearingOperationIdentifier.tokenHolder,
-            _clearingOperationIdentifier.partition,
-            _clearingOperationIdentifier.clearingId,
-            _clearingOperationIdentifier.clearingOperationType
-        );
-    }
-
-    function reclaimClearingOperationByPartition(
-        IClearing.ClearingOperationIdentifier
-            calldata _clearingOperationIdentifier
-    )
-        external
-        override
-        onlyUnpaused
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationIdentifier.partition
-        )
-        onlyWithValidClearingId(_clearingOperationIdentifier)
-        onlyIdentified(_clearingOperationIdentifier.tokenHolder, address(0))
-        onlyClearingActivated
-        validateExpirationTimestamp(_clearingOperationIdentifier, true)
-        returns (bool success_)
-    {
-        success_ = _reclaimClearingOperationByPartition(
-            _clearingOperationIdentifier
-        );
-        emit ClearingOperationReclaimed(
-            _msgSender(),
-            _clearingOperationIdentifier.tokenHolder,
-            _clearingOperationIdentifier.partition,
-            _clearingOperationIdentifier.clearingId,
-            _clearingOperationIdentifier.clearingOperationType
-        );
-    }
-
-    function isClearingActivated() external view returns (bool) {
-        return _isClearingActivated();
-    }
+import {ClearingActions} from './ClearingActions.sol';
 
+contract ClearingActionsFacet is ClearingActions, IStaticFunctionSelectors {
     function getStaticResolverKey()
         external
         pure
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreation.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreation.sol
new file mode 100644
index 000000000..dcce18280
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreation.sol
@@ -0,0 +1,372 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+import {Common} from '../common/Common.sol';
+import {
+    IClearingHoldCreation
+} from '../interfaces/clearing/IClearingHoldCreation.sol';
+import {Hold} from '../interfaces/hold/IHold.sol';
+import {ThirdPartyType} from '../../layer_0/common/types/ThirdPartyType.sol';
+
+abstract contract ClearingHoldCreation is IClearingHoldCreation, Common {
+    function clearingCreateHoldByPartition(
+        ClearingOperation calldata _clearingOperation,
+        Hold calldata _hold
+    )
+        external
+        override
+        onlyUnpaused
+        onlyUnrecoveredAddress(_msgSender())
+        onlyUnrecoveredAddress(_hold.to)
+        validateAddress(_hold.escrow)
+        onlyDefaultPartitionWithSinglePartition(_clearingOperation.partition)
+        onlyWithValidExpirationTimestamp(_clearingOperation.expirationTimestamp)
+        onlyWithValidExpirationTimestamp(_hold.expirationTimestamp)
+        onlyUnProtectedPartitionsOrWildCardRole
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        (success_, clearingId_) = _clearingHoldCreationCreation(
+            _clearingOperation,
+            _msgSender(),
+            _hold,
+            '',
+            ThirdPartyType.NULL
+        );
+    }
+
+    function clearingCreateHoldFromByPartition(
+        ClearingOperationFrom calldata _clearingOperationFrom,
+        Hold calldata _hold
+    )
+        external
+        override
+        onlyUnpaused
+        onlyUnrecoveredAddress(_msgSender())
+        onlyUnrecoveredAddress(_hold.to)
+        onlyUnrecoveredAddress(_clearingOperationFrom.from)
+        validateAddress(_hold.escrow)
+        validateAddress(_clearingOperationFrom.from)
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationFrom.clearingOperation.partition
+        )
+        onlyWithValidExpirationTimestamp(
+            _clearingOperationFrom.clearingOperation.expirationTimestamp
+        )
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        {
+            _checkExpirationTimestamp(_hold.expirationTimestamp);
+            _checkUnProtectedPartitionsOrWildCardRole();
+        }
+
+        (success_, clearingId_) = _clearingHoldCreationCreation(
+            _clearingOperationFrom.clearingOperation,
+            _clearingOperationFrom.from,
+            _hold,
+            _clearingOperationFrom.operatorData,
+            ThirdPartyType.AUTHORIZED
+        );
+
+        _decreaseAllowedBalanceForClearing(
+            _clearingOperationFrom.clearingOperation.partition,
+            clearingId_,
+            ClearingOperationType.HoldCreation,
+            _clearingOperationFrom.from,
+            _hold.amount
+        );
+    }
+
+    function operatorClearingCreateHoldByPartition(
+        ClearingOperationFrom calldata _clearingOperationFrom,
+        Hold calldata _hold
+    )
+        external
+        override
+        onlyUnpaused
+        onlyUnrecoveredAddress(_msgSender())
+        onlyUnrecoveredAddress(_clearingOperationFrom.from)
+        onlyUnrecoveredAddress(_hold.to)
+        validateAddress(_hold.escrow)
+        validateAddress(_clearingOperationFrom.from)
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationFrom.clearingOperation.partition
+        )
+        onlyWithValidExpirationTimestamp(
+            _clearingOperationFrom.clearingOperation.expirationTimestamp
+        )
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        {
+            _checkOperator(
+                _clearingOperationFrom.clearingOperation.partition,
+                _clearingOperationFrom.from
+            );
+            _checkExpirationTimestamp(_hold.expirationTimestamp);
+            _checkUnProtectedPartitionsOrWildCardRole();
+        }
+
+        (success_, clearingId_) = _clearingHoldCreationCreation(
+            _clearingOperationFrom.clearingOperation,
+            _clearingOperationFrom.from,
+            _hold,
+            _clearingOperationFrom.operatorData,
+            ThirdPartyType.OPERATOR
+        );
+    }
+
+    function protectedClearingCreateHoldByPartition(
+        ProtectedClearingOperation calldata _protectedClearingOperation,
+        Hold calldata _hold,
+        bytes calldata _signature
+    )
+        external
+        override
+        onlyUnpaused
+        onlyUnrecoveredAddress(_protectedClearingOperation.from)
+        onlyUnrecoveredAddress(_hold.to)
+        onlyProtectedPartitions
+        validateAddress(_protectedClearingOperation.from)
+        onlyWithValidExpirationTimestamp(
+            _protectedClearingOperation.clearingOperation.expirationTimestamp
+        )
+        onlyRole(
+            _protectedPartitionsRole(
+                _protectedClearingOperation.clearingOperation.partition
+            )
+        )
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        (success_, clearingId_) = _protectedClearingCreateHoldByPartition(
+            _protectedClearingOperation,
+            _hold,
+            _signature
+        );
+    }
+
+    function getClearingCreateHoldForByPartition(
+        bytes32 _partition,
+        address _tokenHolder,
+        uint256 _clearingId
+    )
+        external
+        view
+        override
+        returns (ClearingHoldCreationData memory clearingHoldCreationData_)
+    {
+        return
+            _getClearingHoldCreationForByPartitionAdjusted(
+                _partition,
+                _tokenHolder,
+                _clearingId
+            );
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreationFacet.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreationFacet.sol
index 41ffd76ed..231035c55 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreationFacet.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreationFacet.sol
@@ -206,180 +206,21 @@
 pragma solidity 0.8.18;
 
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
-import {Common} from '../common/Common.sol';
 import {
     IClearingHoldCreation
 } from '../interfaces/clearing/IClearingHoldCreation.sol';
-import {Hold} from '../interfaces/hold/IHold.sol';
 import {
     IStaticFunctionSelectors
 } from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {
     _CLEARING_HOLDCREATION_RESOLVER_KEY
 } from '../constants/resolverKeys.sol';
-import {ThirdPartyType} from '../../layer_0/common/types/ThirdPartyType.sol';
+import {ClearingHoldCreation} from './ClearingHoldCreation.sol';
 
 contract ClearingHoldCreationFacet is
-    IStaticFunctionSelectors,
-    IClearingHoldCreation,
-    Common
+    ClearingHoldCreation,
+    IStaticFunctionSelectors
 {
-    function clearingCreateHoldByPartition(
-        ClearingOperation calldata _clearingOperation,
-        Hold calldata _hold
-    )
-        external
-        override
-        onlyUnpaused
-        onlyUnrecoveredAddress(_msgSender())
-        onlyUnrecoveredAddress(_hold.to)
-        validateAddress(_hold.escrow)
-        onlyDefaultPartitionWithSinglePartition(_clearingOperation.partition)
-        onlyWithValidExpirationTimestamp(_clearingOperation.expirationTimestamp)
-        onlyWithValidExpirationTimestamp(_hold.expirationTimestamp)
-        onlyUnProtectedPartitionsOrWildCardRole
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        (success_, clearingId_) = _clearingHoldCreationCreation(
-            _clearingOperation,
-            _msgSender(),
-            _hold,
-            '',
-            ThirdPartyType.NULL
-        );
-    }
-
-    function clearingCreateHoldFromByPartition(
-        ClearingOperationFrom calldata _clearingOperationFrom,
-        Hold calldata _hold
-    )
-        external
-        override
-        onlyUnpaused
-        onlyUnrecoveredAddress(_msgSender())
-        onlyUnrecoveredAddress(_hold.to)
-        onlyUnrecoveredAddress(_clearingOperationFrom.from)
-        validateAddress(_hold.escrow)
-        validateAddress(_clearingOperationFrom.from)
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationFrom.clearingOperation.partition
-        )
-        onlyWithValidExpirationTimestamp(
-            _clearingOperationFrom.clearingOperation.expirationTimestamp
-        )
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        {
-            _checkExpirationTimestamp(_hold.expirationTimestamp);
-            _checkUnProtectedPartitionsOrWildCardRole();
-        }
-
-        (success_, clearingId_) = _clearingHoldCreationCreation(
-            _clearingOperationFrom.clearingOperation,
-            _clearingOperationFrom.from,
-            _hold,
-            _clearingOperationFrom.operatorData,
-            ThirdPartyType.AUTHORIZED
-        );
-
-        _decreaseAllowedBalanceForClearing(
-            _clearingOperationFrom.clearingOperation.partition,
-            clearingId_,
-            ClearingOperationType.HoldCreation,
-            _clearingOperationFrom.from,
-            _hold.amount
-        );
-    }
-
-    function operatorClearingCreateHoldByPartition(
-        ClearingOperationFrom calldata _clearingOperationFrom,
-        Hold calldata _hold
-    )
-        external
-        override
-        onlyUnpaused
-        onlyUnrecoveredAddress(_msgSender())
-        onlyUnrecoveredAddress(_clearingOperationFrom.from)
-        onlyUnrecoveredAddress(_hold.to)
-        validateAddress(_hold.escrow)
-        validateAddress(_clearingOperationFrom.from)
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationFrom.clearingOperation.partition
-        )
-        onlyWithValidExpirationTimestamp(
-            _clearingOperationFrom.clearingOperation.expirationTimestamp
-        )
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        {
-            _checkOperator(
-                _clearingOperationFrom.clearingOperation.partition,
-                _clearingOperationFrom.from
-            );
-            _checkExpirationTimestamp(_hold.expirationTimestamp);
-            _checkUnProtectedPartitionsOrWildCardRole();
-        }
-
-        (success_, clearingId_) = _clearingHoldCreationCreation(
-            _clearingOperationFrom.clearingOperation,
-            _clearingOperationFrom.from,
-            _hold,
-            _clearingOperationFrom.operatorData,
-            ThirdPartyType.OPERATOR
-        );
-    }
-
-    function protectedClearingCreateHoldByPartition(
-        ProtectedClearingOperation calldata _protectedClearingOperation,
-        Hold calldata _hold,
-        bytes calldata _signature
-    )
-        external
-        override
-        onlyUnpaused
-        onlyUnrecoveredAddress(_protectedClearingOperation.from)
-        onlyUnrecoveredAddress(_hold.to)
-        onlyProtectedPartitions
-        validateAddress(_protectedClearingOperation.from)
-        onlyWithValidExpirationTimestamp(
-            _protectedClearingOperation.clearingOperation.expirationTimestamp
-        )
-        onlyRole(
-            _protectedPartitionsRole(
-                _protectedClearingOperation.clearingOperation.partition
-            )
-        )
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        (success_, clearingId_) = _protectedClearingCreateHoldByPartition(
-            _protectedClearingOperation,
-            _hold,
-            _signature
-        );
-    }
-
-    function getClearingCreateHoldForByPartition(
-        bytes32 _partition,
-        address _tokenHolder,
-        uint256 _clearingId
-    )
-        external
-        view
-        override
-        returns (ClearingHoldCreationData memory clearingHoldCreationData_)
-    {
-        return
-            _getClearingHoldCreationForByPartitionAdjusted(
-                _partition,
-                _tokenHolder,
-                _clearingId
-            );
-    }
-
     function getStaticResolverKey()
         external
         pure
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingRead.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRead.sol
new file mode 100644
index 000000000..3f7ce7406
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRead.sol
@@ -0,0 +1,270 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+import {Common} from '../common/Common.sol';
+import {IClearingRead} from '../interfaces/clearing/IClearingRead.sol';
+
+abstract contract ClearingRead is IClearingRead, Common {
+    function getClearedAmountFor(
+        address _tokenHolder
+    ) external view returns (uint256 amount_) {
+        return _getClearedAmountForAdjusted(_tokenHolder);
+    }
+
+    function getClearedAmountForByPartition(
+        bytes32 _partition,
+        address _tokenHolder
+    ) external view returns (uint256 amount_) {
+        return
+            _getClearedAmountForByPartitionAdjusted(_partition, _tokenHolder);
+    }
+
+    function getClearingCountForByPartition(
+        bytes32 _partition,
+        address _tokenHolder,
+        ClearingOperationType _clearingOperationType
+    ) external view override returns (uint256 clearingCount_) {
+        return
+            _getClearingCountForByPartition(
+                _partition,
+                _tokenHolder,
+                _clearingOperationType
+            );
+    }
+
+    function getClearingsIdForByPartition(
+        bytes32 _partition,
+        address _tokenHolder,
+        ClearingOperationType _clearingOperationType,
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view override returns (uint256[] memory clearingsId_) {
+        return
+            _getClearingsIdForByPartition(
+                _partition,
+                _tokenHolder,
+                _clearingOperationType,
+                _pageIndex,
+                _pageLength
+            );
+    }
+
+    function getClearingThirdParty(
+        bytes32 _partition,
+        address _tokenHolder,
+        ClearingOperationType _clearingOpeartionType,
+        uint256 _clearingId
+    ) external view override returns (address thirdParty_) {
+        thirdParty_ = _getClearingThirdParty(
+            _partition,
+            _tokenHolder,
+            _clearingOpeartionType,
+            _clearingId
+        );
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingReadFacet.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingReadFacet.sol
index a1772b3a3..c0f2f7d23 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingReadFacet.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingReadFacet.sol
@@ -206,72 +206,14 @@
 pragma solidity 0.8.18;
 
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
-import {Common} from '../common/Common.sol';
 import {IClearingRead} from '../interfaces/clearing/IClearingRead.sol';
 import {
     IStaticFunctionSelectors
 } from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {_CLEARING_READ_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {ClearingRead} from './ClearingRead.sol';
 
-contract ClearingReadFacet is IStaticFunctionSelectors, IClearingRead, Common {
-    function getClearedAmountFor(
-        address _tokenHolder
-    ) external view returns (uint256 amount_) {
-        return _getClearedAmountForAdjusted(_tokenHolder);
-    }
-
-    function getClearedAmountForByPartition(
-        bytes32 _partition,
-        address _tokenHolder
-    ) external view returns (uint256 amount_) {
-        return
-            _getClearedAmountForByPartitionAdjusted(_partition, _tokenHolder);
-    }
-
-    function getClearingCountForByPartition(
-        bytes32 _partition,
-        address _tokenHolder,
-        ClearingOperationType _clearingOperationType
-    ) external view override returns (uint256 clearingCount_) {
-        return
-            _getClearingCountForByPartition(
-                _partition,
-                _tokenHolder,
-                _clearingOperationType
-            );
-    }
-
-    function getClearingsIdForByPartition(
-        bytes32 _partition,
-        address _tokenHolder,
-        ClearingOperationType _clearingOperationType,
-        uint256 _pageIndex,
-        uint256 _pageLength
-    ) external view override returns (uint256[] memory clearingsId_) {
-        return
-            _getClearingsIdForByPartition(
-                _partition,
-                _tokenHolder,
-                _clearingOperationType,
-                _pageIndex,
-                _pageLength
-            );
-    }
-
-    function getClearingThirdParty(
-        bytes32 _partition,
-        address _tokenHolder,
-        ClearingOperationType _clearingOpeartionType,
-        uint256 _clearingId
-    ) external view override returns (address thirdParty_) {
-        thirdParty_ = _getClearingThirdParty(
-            _partition,
-            _tokenHolder,
-            _clearingOpeartionType,
-            _clearingId
-        );
-    }
-
+contract ClearingReadFacet is ClearingRead, IStaticFunctionSelectors {
     function getStaticResolverKey()
         external
         pure
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeem.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeem.sol
new file mode 100644
index 000000000..acd45dcc6
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeem.sol
@@ -0,0 +1,355 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+import {Common} from '../common/Common.sol';
+import {IClearingRedeem} from '../interfaces/clearing/IClearingRedeem.sol';
+import {ThirdPartyType} from '../../layer_0/common/types/ThirdPartyType.sol';
+
+abstract contract ClearingRedeem is IClearingRedeem, Common {
+    function clearingRedeemByPartition(
+        ClearingOperation calldata _clearingOperation,
+        uint256 _amount
+    )
+        external
+        override
+        onlyUnpaused
+        onlyUnrecoveredAddress(_msgSender())
+        onlyDefaultPartitionWithSinglePartition(_clearingOperation.partition)
+        onlyUnProtectedPartitionsOrWildCardRole
+        onlyWithValidExpirationTimestamp(_clearingOperation.expirationTimestamp)
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        (success_, clearingId_) = _clearingRedeemCreation(
+            _clearingOperation,
+            _amount,
+            _msgSender(),
+            '',
+            ThirdPartyType.NULL
+        );
+    }
+
+    function clearingRedeemFromByPartition(
+        ClearingOperationFrom calldata _clearingOperationFrom,
+        uint256 _amount
+    )
+        external
+        override
+        onlyUnpaused
+        onlyUnrecoveredAddress(_clearingOperationFrom.from)
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationFrom.clearingOperation.partition
+        )
+        onlyUnProtectedPartitionsOrWildCardRole
+        onlyWithValidExpirationTimestamp(
+            _clearingOperationFrom.clearingOperation.expirationTimestamp
+        )
+        onlyUnrecoveredAddress(_msgSender())
+        validateAddress(_clearingOperationFrom.from)
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        (success_, clearingId_) = _clearingRedeemCreation(
+            _clearingOperationFrom.clearingOperation,
+            _amount,
+            _clearingOperationFrom.from,
+            _clearingOperationFrom.operatorData,
+            ThirdPartyType.AUTHORIZED
+        );
+        _decreaseAllowedBalanceForClearing(
+            _clearingOperationFrom.clearingOperation.partition,
+            clearingId_,
+            ClearingOperationType.Redeem,
+            _clearingOperationFrom.from,
+            _amount
+        );
+    }
+
+    function operatorClearingRedeemByPartition(
+        ClearingOperationFrom calldata _clearingOperationFrom,
+        uint256 _amount
+    )
+        external
+        override
+        onlyUnpaused
+        onlyUnrecoveredAddress(_clearingOperationFrom.from)
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationFrom.clearingOperation.partition
+        )
+        onlyUnProtectedPartitionsOrWildCardRole
+        onlyWithValidExpirationTimestamp(
+            _clearingOperationFrom.clearingOperation.expirationTimestamp
+        )
+        validateAddress(_clearingOperationFrom.from)
+        onlyUnrecoveredAddress(_msgSender())
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        {
+            _checkOperator(
+                _clearingOperationFrom.clearingOperation.partition,
+                _clearingOperationFrom.from
+            );
+        }
+
+        (success_, clearingId_) = _clearingRedeemCreation(
+            _clearingOperationFrom.clearingOperation,
+            _amount,
+            _clearingOperationFrom.from,
+            _clearingOperationFrom.operatorData,
+            ThirdPartyType.OPERATOR
+        );
+    }
+
+    function protectedClearingRedeemByPartition(
+        ProtectedClearingOperation calldata _protectedClearingOperation,
+        uint256 _amount,
+        bytes calldata _signature
+    )
+        external
+        override
+        onlyUnpaused
+        onlyProtectedPartitions
+        validateAddress(_protectedClearingOperation.from)
+        onlyWithValidExpirationTimestamp(
+            _protectedClearingOperation.clearingOperation.expirationTimestamp
+        )
+        onlyRole(
+            _protectedPartitionsRole(
+                _protectedClearingOperation.clearingOperation.partition
+            )
+        )
+        onlyClearingActivated
+        onlyUnrecoveredAddress(_protectedClearingOperation.from)
+        returns (bool success_, uint256 clearingId_)
+    {
+        (success_, clearingId_) = _protectedClearingRedeemByPartition(
+            _protectedClearingOperation,
+            _amount,
+            _signature
+        );
+    }
+
+    function getClearingRedeemForByPartition(
+        bytes32 _partition,
+        address _tokenHolder,
+        uint256 _clearingId
+    )
+        external
+        view
+        override
+        returns (ClearingRedeemData memory clearingRedeemData_)
+    {
+        return
+            _getClearingRedeemForByPartitionAdjusted(
+                _partition,
+                _tokenHolder,
+                _clearingId
+            );
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeemFacet.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeemFacet.sol
index 949b28288..559b77a09 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeemFacet.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeemFacet.sol
@@ -206,161 +206,14 @@
 pragma solidity 0.8.18;
 
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
-import {Common} from '../common/Common.sol';
 import {IClearingRedeem} from '../interfaces/clearing/IClearingRedeem.sol';
 import {
     IStaticFunctionSelectors
 } from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {_CLEARING_REDEEM_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {ThirdPartyType} from '../../layer_0/common/types/ThirdPartyType.sol';
-
-contract ClearingRedeemFacet is
-    IStaticFunctionSelectors,
-    IClearingRedeem,
-    Common
-{
-    function clearingRedeemByPartition(
-        ClearingOperation calldata _clearingOperation,
-        uint256 _amount
-    )
-        external
-        override
-        onlyUnpaused
-        onlyUnrecoveredAddress(_msgSender())
-        onlyDefaultPartitionWithSinglePartition(_clearingOperation.partition)
-        onlyUnProtectedPartitionsOrWildCardRole
-        onlyWithValidExpirationTimestamp(_clearingOperation.expirationTimestamp)
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        (success_, clearingId_) = _clearingRedeemCreation(
-            _clearingOperation,
-            _amount,
-            _msgSender(),
-            '',
-            ThirdPartyType.NULL
-        );
-    }
-
-    function clearingRedeemFromByPartition(
-        ClearingOperationFrom calldata _clearingOperationFrom,
-        uint256 _amount
-    )
-        external
-        override
-        onlyUnpaused
-        onlyUnrecoveredAddress(_clearingOperationFrom.from)
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationFrom.clearingOperation.partition
-        )
-        onlyUnProtectedPartitionsOrWildCardRole
-        onlyWithValidExpirationTimestamp(
-            _clearingOperationFrom.clearingOperation.expirationTimestamp
-        )
-        onlyUnrecoveredAddress(_msgSender())
-        validateAddress(_clearingOperationFrom.from)
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        (success_, clearingId_) = _clearingRedeemCreation(
-            _clearingOperationFrom.clearingOperation,
-            _amount,
-            _clearingOperationFrom.from,
-            _clearingOperationFrom.operatorData,
-            ThirdPartyType.AUTHORIZED
-        );
-        _decreaseAllowedBalanceForClearing(
-            _clearingOperationFrom.clearingOperation.partition,
-            clearingId_,
-            ClearingOperationType.Redeem,
-            _clearingOperationFrom.from,
-            _amount
-        );
-    }
-
-    function operatorClearingRedeemByPartition(
-        ClearingOperationFrom calldata _clearingOperationFrom,
-        uint256 _amount
-    )
-        external
-        override
-        onlyUnpaused
-        onlyUnrecoveredAddress(_clearingOperationFrom.from)
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationFrom.clearingOperation.partition
-        )
-        onlyUnProtectedPartitionsOrWildCardRole
-        onlyWithValidExpirationTimestamp(
-            _clearingOperationFrom.clearingOperation.expirationTimestamp
-        )
-        validateAddress(_clearingOperationFrom.from)
-        onlyUnrecoveredAddress(_msgSender())
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        {
-            _checkOperator(
-                _clearingOperationFrom.clearingOperation.partition,
-                _clearingOperationFrom.from
-            );
-        }
-
-        (success_, clearingId_) = _clearingRedeemCreation(
-            _clearingOperationFrom.clearingOperation,
-            _amount,
-            _clearingOperationFrom.from,
-            _clearingOperationFrom.operatorData,
-            ThirdPartyType.OPERATOR
-        );
-    }
-
-    function protectedClearingRedeemByPartition(
-        ProtectedClearingOperation calldata _protectedClearingOperation,
-        uint256 _amount,
-        bytes calldata _signature
-    )
-        external
-        override
-        onlyUnpaused
-        onlyProtectedPartitions
-        validateAddress(_protectedClearingOperation.from)
-        onlyWithValidExpirationTimestamp(
-            _protectedClearingOperation.clearingOperation.expirationTimestamp
-        )
-        onlyRole(
-            _protectedPartitionsRole(
-                _protectedClearingOperation.clearingOperation.partition
-            )
-        )
-        onlyClearingActivated
-        onlyUnrecoveredAddress(_protectedClearingOperation.from)
-        returns (bool success_, uint256 clearingId_)
-    {
-        (success_, clearingId_) = _protectedClearingRedeemByPartition(
-            _protectedClearingOperation,
-            _amount,
-            _signature
-        );
-    }
-
-    function getClearingRedeemForByPartition(
-        bytes32 _partition,
-        address _tokenHolder,
-        uint256 _clearingId
-    )
-        external
-        view
-        override
-        returns (ClearingRedeemData memory clearingRedeemData_)
-    {
-        return
-            _getClearingRedeemForByPartitionAdjusted(
-                _partition,
-                _tokenHolder,
-                _clearingId
-            );
-    }
+import {ClearingRedeem} from './ClearingRedeem.sol';
 
+contract ClearingRedeemFacet is ClearingRedeem, IStaticFunctionSelectors {
     function getStaticResolverKey()
         external
         pure
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransfer.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransfer.sol
new file mode 100644
index 000000000..0edd93a6d
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransfer.sol
@@ -0,0 +1,373 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+import {Common} from '../common/Common.sol';
+import {IClearingTransfer} from '../interfaces/clearing/IClearingTransfer.sol';
+import {ThirdPartyType} from '../../layer_0/common/types/ThirdPartyType.sol';
+
+abstract contract ClearingTransfer is IClearingTransfer, Common {
+    function clearingTransferByPartition(
+        ClearingOperation calldata _clearingOperation,
+        uint256 _amount,
+        address _to
+    )
+        external
+        override
+        onlyUnpaused
+        onlyDefaultPartitionWithSinglePartition(_clearingOperation.partition)
+        onlyUnProtectedPartitionsOrWildCardRole
+        onlyWithValidExpirationTimestamp(_clearingOperation.expirationTimestamp)
+        validateAddress(_to)
+        onlyUnrecoveredAddress(_msgSender())
+        onlyUnrecoveredAddress(_to)
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        (success_, clearingId_) = _clearingTransferCreation(
+            _clearingOperation,
+            _amount,
+            _to,
+            _msgSender(),
+            '',
+            ThirdPartyType.NULL
+        );
+    }
+
+    function clearingTransferFromByPartition(
+        ClearingOperationFrom calldata _clearingOperationFrom,
+        uint256 _amount,
+        address _to
+    )
+        external
+        override
+        onlyUnpaused
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationFrom.clearingOperation.partition
+        )
+        onlyUnProtectedPartitionsOrWildCardRole
+        onlyWithValidExpirationTimestamp(
+            _clearingOperationFrom.clearingOperation.expirationTimestamp
+        )
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        {
+            _checkValidAddress(_clearingOperationFrom.from);
+            _checkValidAddress(_to);
+            _checkRecoveredAddress(_msgSender());
+            _checkRecoveredAddress(_to);
+            _checkRecoveredAddress(_clearingOperationFrom.from);
+        }
+        (success_, clearingId_) = _clearingTransferCreation(
+            _clearingOperationFrom.clearingOperation,
+            _amount,
+            _to,
+            _clearingOperationFrom.from,
+            _clearingOperationFrom.operatorData,
+            ThirdPartyType.AUTHORIZED
+        );
+        _decreaseAllowedBalanceForClearing(
+            _clearingOperationFrom.clearingOperation.partition,
+            clearingId_,
+            ClearingOperationType.Transfer,
+            _clearingOperationFrom.from,
+            _amount
+        );
+    }
+
+    function operatorClearingTransferByPartition(
+        ClearingOperationFrom calldata _clearingOperationFrom,
+        uint256 _amount,
+        address _to
+    )
+        external
+        override
+        onlyUnpaused
+        onlyDefaultPartitionWithSinglePartition(
+            _clearingOperationFrom.clearingOperation.partition
+        )
+        onlyUnProtectedPartitionsOrWildCardRole
+        onlyWithValidExpirationTimestamp(
+            _clearingOperationFrom.clearingOperation.expirationTimestamp
+        )
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        {
+            _checkValidAddress(_clearingOperationFrom.from);
+            _checkValidAddress(_to);
+            _checkOperator(
+                _clearingOperationFrom.clearingOperation.partition,
+                _clearingOperationFrom.from
+            );
+            _checkRecoveredAddress(_msgSender());
+            _checkRecoveredAddress(_to);
+            _checkRecoveredAddress(_clearingOperationFrom.from);
+        }
+
+        (success_, clearingId_) = _clearingTransferCreation(
+            _clearingOperationFrom.clearingOperation,
+            _amount,
+            _to,
+            _clearingOperationFrom.from,
+            _clearingOperationFrom.operatorData,
+            ThirdPartyType.OPERATOR
+        );
+    }
+
+    function protectedClearingTransferByPartition(
+        ProtectedClearingOperation calldata _protectedClearingOperation,
+        uint256 _amount,
+        address _to,
+        bytes calldata _signature
+    )
+        external
+        override
+        onlyUnpaused
+        onlyProtectedPartitions
+        validateAddress(_protectedClearingOperation.from)
+        validateAddress(_to)
+        onlyUnrecoveredAddress(_protectedClearingOperation.from)
+        onlyUnrecoveredAddress(_to)
+        onlyWithValidExpirationTimestamp(
+            _protectedClearingOperation.clearingOperation.expirationTimestamp
+        )
+        onlyRole(
+            _protectedPartitionsRole(
+                _protectedClearingOperation.clearingOperation.partition
+            )
+        )
+        onlyClearingActivated
+        returns (bool success_, uint256 clearingId_)
+    {
+        (success_, clearingId_) = _protectedClearingTransferByPartition(
+            _protectedClearingOperation,
+            _amount,
+            _to,
+            _signature
+        );
+    }
+
+    function getClearingTransferForByPartition(
+        bytes32 _partition,
+        address _tokenHolder,
+        uint256 _clearingId
+    )
+        external
+        view
+        override
+        returns (ClearingTransferData memory clearingTransferData_)
+    {
+        return
+            _getClearingTransferForByPartitionAdjusted(
+                _partition,
+                _tokenHolder,
+                _clearingId
+            );
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransferFacet.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransferFacet.sol
index 2be6f0a63..9a79f3fe9 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransferFacet.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransferFacet.sol
@@ -206,179 +206,14 @@
 pragma solidity 0.8.18;
 
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
-import {Common} from '../common/Common.sol';
 import {IClearingTransfer} from '../interfaces/clearing/IClearingTransfer.sol';
 import {
     IStaticFunctionSelectors
 } from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {_CLEARING_TRANSFER_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {ThirdPartyType} from '../../layer_0/common/types/ThirdPartyType.sol';
-
-contract ClearingTransferFacet is
-    IStaticFunctionSelectors,
-    IClearingTransfer,
-    Common
-{
-    function clearingTransferByPartition(
-        ClearingOperation calldata _clearingOperation,
-        uint256 _amount,
-        address _to
-    )
-        external
-        override
-        onlyUnpaused
-        onlyDefaultPartitionWithSinglePartition(_clearingOperation.partition)
-        onlyUnProtectedPartitionsOrWildCardRole
-        onlyWithValidExpirationTimestamp(_clearingOperation.expirationTimestamp)
-        validateAddress(_to)
-        onlyUnrecoveredAddress(_msgSender())
-        onlyUnrecoveredAddress(_to)
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        (success_, clearingId_) = _clearingTransferCreation(
-            _clearingOperation,
-            _amount,
-            _to,
-            _msgSender(),
-            '',
-            ThirdPartyType.NULL
-        );
-    }
-
-    function clearingTransferFromByPartition(
-        ClearingOperationFrom calldata _clearingOperationFrom,
-        uint256 _amount,
-        address _to
-    )
-        external
-        override
-        onlyUnpaused
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationFrom.clearingOperation.partition
-        )
-        onlyUnProtectedPartitionsOrWildCardRole
-        onlyWithValidExpirationTimestamp(
-            _clearingOperationFrom.clearingOperation.expirationTimestamp
-        )
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        {
-            _checkValidAddress(_clearingOperationFrom.from);
-            _checkValidAddress(_to);
-            _checkRecoveredAddress(_msgSender());
-            _checkRecoveredAddress(_to);
-            _checkRecoveredAddress(_clearingOperationFrom.from);
-        }
-        (success_, clearingId_) = _clearingTransferCreation(
-            _clearingOperationFrom.clearingOperation,
-            _amount,
-            _to,
-            _clearingOperationFrom.from,
-            _clearingOperationFrom.operatorData,
-            ThirdPartyType.AUTHORIZED
-        );
-        _decreaseAllowedBalanceForClearing(
-            _clearingOperationFrom.clearingOperation.partition,
-            clearingId_,
-            ClearingOperationType.Transfer,
-            _clearingOperationFrom.from,
-            _amount
-        );
-    }
-
-    function operatorClearingTransferByPartition(
-        ClearingOperationFrom calldata _clearingOperationFrom,
-        uint256 _amount,
-        address _to
-    )
-        external
-        override
-        onlyUnpaused
-        onlyDefaultPartitionWithSinglePartition(
-            _clearingOperationFrom.clearingOperation.partition
-        )
-        onlyUnProtectedPartitionsOrWildCardRole
-        onlyWithValidExpirationTimestamp(
-            _clearingOperationFrom.clearingOperation.expirationTimestamp
-        )
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        {
-            _checkValidAddress(_clearingOperationFrom.from);
-            _checkValidAddress(_to);
-            _checkOperator(
-                _clearingOperationFrom.clearingOperation.partition,
-                _clearingOperationFrom.from
-            );
-            _checkRecoveredAddress(_msgSender());
-            _checkRecoveredAddress(_to);
-            _checkRecoveredAddress(_clearingOperationFrom.from);
-        }
-
-        (success_, clearingId_) = _clearingTransferCreation(
-            _clearingOperationFrom.clearingOperation,
-            _amount,
-            _to,
-            _clearingOperationFrom.from,
-            _clearingOperationFrom.operatorData,
-            ThirdPartyType.OPERATOR
-        );
-    }
-
-    function protectedClearingTransferByPartition(
-        ProtectedClearingOperation calldata _protectedClearingOperation,
-        uint256 _amount,
-        address _to,
-        bytes calldata _signature
-    )
-        external
-        override
-        onlyUnpaused
-        onlyProtectedPartitions
-        validateAddress(_protectedClearingOperation.from)
-        validateAddress(_to)
-        onlyUnrecoveredAddress(_protectedClearingOperation.from)
-        onlyUnrecoveredAddress(_to)
-        onlyWithValidExpirationTimestamp(
-            _protectedClearingOperation.clearingOperation.expirationTimestamp
-        )
-        onlyRole(
-            _protectedPartitionsRole(
-                _protectedClearingOperation.clearingOperation.partition
-            )
-        )
-        onlyClearingActivated
-        returns (bool success_, uint256 clearingId_)
-    {
-        (success_, clearingId_) = _protectedClearingTransferByPartition(
-            _protectedClearingOperation,
-            _amount,
-            _to,
-            _signature
-        );
-    }
-
-    function getClearingTransferForByPartition(
-        bytes32 _partition,
-        address _tokenHolder,
-        uint256 _clearingId
-    )
-        external
-        view
-        override
-        returns (ClearingTransferData memory clearingTransferData_)
-    {
-        return
-            _getClearingTransferForByPartitionAdjusted(
-                _partition,
-                _tokenHolder,
-                _clearingId
-            );
-    }
+import {ClearingTransfer} from './ClearingTransfer.sol';
 
+contract ClearingTransferFacet is ClearingTransfer, IStaticFunctionSelectors {
     function getStaticResolverKey()
         external
         pure
diff --git a/packages/ats/contracts/contracts/layer_1/controlList/ControlList.sol b/packages/ats/contracts/contracts/layer_1/controlList/ControlList.sol
index f31c4ffca..8539e6a33 100644
--- a/packages/ats/contracts/contracts/layer_1/controlList/ControlList.sol
+++ b/packages/ats/contracts/contracts/layer_1/controlList/ControlList.sol
@@ -209,12 +209,8 @@ pragma solidity 0.8.18;
 import {IControlList} from '../interfaces/controlList/IControlList.sol';
 import {Common} from '../common/Common.sol';
 import {_CONTROL_LIST_ROLE} from '../constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_CONTROL_LIST_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 
-contract ControlList is IControlList, IStaticFunctionSelectors, Common {
+abstract contract ControlList is IControlList, Common {
     // TODO: UNPAUSED
     // solhint-disable-next-line func-name-mixedcase
     function initialize_ControlList(
@@ -283,55 +279,4 @@ contract ControlList is IControlList, IStaticFunctionSelectors, Common {
     ) external view override returns (address[] memory members_) {
         members_ = _getControlListMembers(_pageIndex, _pageLength);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _CONTROL_LIST_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](7);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .initialize_ControlList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .addToControlList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .removeFromControlList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .isInControlList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getControlListType
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getControlListCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getControlListMembers
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IControlList).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/controlList/ControlListFacet.sol b/packages/ats/contracts/contracts/layer_1/controlList/ControlListFacet.sol
new file mode 100644
index 000000000..a08510636
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/controlList/ControlListFacet.sol
@@ -0,0 +1,267 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+
+import {IControlList} from '../interfaces/controlList/IControlList.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_CONTROL_LIST_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {ControlList} from './ControlList.sol';
+
+contract ControlListFacet is ControlList, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _CONTROL_LIST_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](7);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .initialize_ControlList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .addToControlList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .removeFromControlList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .isInControlList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getControlListType
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getControlListCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getControlListMembers
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IControlList).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActions.sol b/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActions.sol
index 6013e4352..dff2b2d38 100644
--- a/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActions.sol
+++ b/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActions.sol
@@ -211,16 +211,8 @@ import {
 } from '../interfaces/corporateActions/ICorporateActions.sol';
 import {Common} from '../common/Common.sol';
 import {_CORPORATE_ACTION_ROLE} from '../constants/roles.sol';
-import {_CORPORATE_ACTIONS_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-
-contract CorporateActions is
-    ICorporateActions,
-    IStaticFunctionSelectors,
-    Common
-{
+
+abstract contract CorporateActions is ICorporateActions, Common {
     function addCorporateAction(
         bytes32 _actionType,
         bytes memory _data
@@ -292,53 +284,4 @@ contract CorporateActions is
             _pageLength
         );
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _CORPORATE_ACTIONS_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](6);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .addCorporateAction
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getCorporateAction
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getCorporateActionCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getCorporateActionIds
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getCorporateActionCountByType
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getCorporateActionIdsByType
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(ICorporateActions)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActionsFacet.sol b/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActionsFacet.sol
new file mode 100644
index 000000000..5901cf0b7
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActionsFacet.sol
@@ -0,0 +1,267 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+
+import {
+    ICorporateActions
+} from '../interfaces/corporateActions/ICorporateActions.sol';
+import {_CORPORATE_ACTIONS_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {CorporateActions} from './CorporateActions.sol';
+
+contract CorporateActionsFacet is CorporateActions, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _CORPORATE_ACTIONS_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](6);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .addCorporateAction
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getCorporateAction
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getCorporateActionCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getCorporateActionIds
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getCorporateActionCountByType
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getCorporateActionIdsByType
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(ICorporateActions)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagement.sol b/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagement.sol
index 5004474e1..eab52617f 100644
--- a/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagement.sol
@@ -211,19 +211,12 @@ import {
 } from '../interfaces/externalControlLists/IExternalControlListManagement.sol';
 import {Common} from '../common/Common.sol';
 import {_CONTROL_LIST_MANAGER_ROLE} from '../constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {
-    _CONTROL_LIST_MANAGEMENT_RESOLVER_KEY
-} from '../constants/resolverKeys.sol';
 import {
     _CONTROL_LIST_MANAGEMENT_STORAGE_POSITION
 } from '../../layer_0/constants/storagePositions.sol';
 
-contract ExternalControlListManagement is
+abstract contract ExternalControlListManagement is
     IExternalControlListManagement,
-    IStaticFunctionSelectors,
     Common
 {
     // solhint-disable-next-line func-name-mixedcase
@@ -345,57 +338,4 @@ contract ExternalControlListManagement is
                 _pageLength
             );
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _CONTROL_LIST_MANAGEMENT_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](7);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .initialize_ExternalControlLists
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .updateExternalControlLists
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .addExternalControlList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .removeExternalControlList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .isExternalControlList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getExternalControlListsCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getExternalControlListsMembers
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(
-            IExternalControlListManagement
-        ).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagementFacet.sol b/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagementFacet.sol
new file mode 100644
index 000000000..b9f1ed233
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagementFacet.sol
@@ -0,0 +1,278 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {
+    IExternalControlListManagement
+} from '../interfaces/externalControlLists/IExternalControlListManagement.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {
+    _CONTROL_LIST_MANAGEMENT_RESOLVER_KEY
+} from '../constants/resolverKeys.sol';
+import {
+    ExternalControlListManagement
+} from './ExternalControlListManagement.sol';
+
+contract ExternalControlListManagementFacet is
+    ExternalControlListManagement,
+    IStaticFunctionSelectors
+{
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _CONTROL_LIST_MANAGEMENT_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](7);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .initialize_ExternalControlLists
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .updateExternalControlLists
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .addExternalControlList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .removeExternalControlList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .isExternalControlList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getExternalControlListsCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getExternalControlListsMembers
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(
+            IExternalControlListManagement
+        ).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagement.sol b/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagement.sol
index 1a8df3df6..d980d39a6 100644
--- a/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagement.sol
@@ -211,18 +211,13 @@ import {
 } from '../interfaces/externalKycLists/IExternalKycListManagement.sol';
 import {Common} from '../common/Common.sol';
 import {_KYC_MANAGER_ROLE} from '../constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_KYC_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {
     _KYC_MANAGEMENT_STORAGE_POSITION
 } from '../../layer_0/constants/storagePositions.sol';
 import {IKyc} from '../interfaces/kyc/IKyc.sol';
 
-contract ExternalKycListManagement is
+abstract contract ExternalKycListManagement is
     IExternalKycListManagement,
-    IStaticFunctionSelectors,
     Common
 {
     // solhint-disable-next-line func-name-mixedcase
@@ -345,59 +340,4 @@ contract ExternalKycListManagement is
                 _pageLength
             );
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _KYC_MANAGEMENT_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](8);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .initialize_ExternalKycLists
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .updateExternalKycLists
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .addExternalKycList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .removeExternalKycList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .isExternalKycList
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .isExternallyGranted
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getExternalKycListsCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getExternalKycListsMembers
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IExternalKycListManagement)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagementFacet.sol b/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagementFacet.sol
new file mode 100644
index 000000000..d9bd818e3
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagementFacet.sol
@@ -0,0 +1,276 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {
+    IExternalKycListManagement
+} from '../interfaces/externalKycLists/IExternalKycListManagement.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_KYC_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {ExternalKycListManagement} from './ExternalKycListManagement.sol';
+
+contract ExternalKycListManagementFacet is
+    ExternalKycListManagement,
+    IStaticFunctionSelectors
+{
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _KYC_MANAGEMENT_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](8);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .initialize_ExternalKycLists
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .updateExternalKycLists
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .addExternalKycList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .removeExternalKycList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .isExternalKycList
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .isExternallyGranted
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getExternalKycListsCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getExternalKycListsMembers
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IExternalKycListManagement)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagement.sol b/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagement.sol
index 53dd48a30..0ff8966d6 100644
--- a/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagement.sol
@@ -211,19 +211,11 @@ import {
 } from '../interfaces/externalPauses/IExternalPauseManagement.sol';
 import {Common} from '../common/Common.sol';
 import {_PAUSE_MANAGER_ROLE} from '../constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_PAUSE_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {
     _PAUSE_MANAGEMENT_STORAGE_POSITION
 } from '../../layer_0/constants/storagePositions.sol';
 
-contract ExternalPauseManagement is
-    IExternalPauseManagement,
-    IStaticFunctionSelectors,
-    Common
-{
+abstract contract ExternalPauseManagement is IExternalPauseManagement, Common {
     // solhint-disable-next-line func-name-mixedcase
     function initialize_ExternalPauses(
         address[] calldata _pauses
@@ -334,56 +326,4 @@ contract ExternalPauseManagement is
                 _pageLength
             );
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _PAUSE_MANAGEMENT_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](7);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .initialize_ExternalPauses
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .updateExternalPauses
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .addExternalPause
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .removeExternalPause
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .isExternalPause
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getExternalPausesCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getExternalPausesMembers
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IExternalPauseManagement)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagementFacet.sol b/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagementFacet.sol
new file mode 100644
index 000000000..54ab822a4
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagementFacet.sol
@@ -0,0 +1,273 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {
+    IExternalPauseManagement
+} from '../interfaces/externalPauses/IExternalPauseManagement.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_PAUSE_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {ExternalPauseManagement} from './ExternalPauseManagement.sol';
+
+contract ExternalPauseManagementFacet is
+    ExternalPauseManagement,
+    IStaticFunctionSelectors
+{
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _PAUSE_MANAGEMENT_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](7);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .initialize_ExternalPauses
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .updateExternalPauses
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .addExternalPause
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .removeExternalPause
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .isExternalPause
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getExternalPausesCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getExternalPausesMembers
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IExternalPauseManagement)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/kyc/Kyc.sol b/packages/ats/contracts/contracts/layer_1/kyc/Kyc.sol
index e23673837..8f5a2f39d 100644
--- a/packages/ats/contracts/contracts/layer_1/kyc/Kyc.sol
+++ b/packages/ats/contracts/contracts/layer_1/kyc/Kyc.sol
@@ -208,13 +208,9 @@ pragma solidity 0.8.18;
 
 import {_KYC_ROLE, _INTERNAL_KYC_MANAGER_ROLE} from '../constants/roles.sol';
 import {IKyc} from '../interfaces/kyc/IKyc.sol';
-import {_KYC_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {Common} from '../common/Common.sol';
 
-contract Kyc is IKyc, IStaticFunctionSelectors, Common {
+abstract contract Kyc is IKyc, Common {
     function initializeInternalKyc(
         bool _internalKycActivated
     ) external onlyUninitialized(_kycStorage().initialized) {
@@ -325,59 +321,4 @@ contract Kyc is IKyc, IStaticFunctionSelectors, Common {
     {
         return _isInternalKycActivated();
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        virtual
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _KYC_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](10);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .initializeInternalKyc
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .activateInternalKyc
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .deactivateInternalKyc
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.grantKyc.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.revokeKyc.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.getKycFor.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getKycStatusFor
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getKycAccountsCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getKycAccountsData
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .isInternalKycActivated
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IKyc).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/kyc/KycFacet.sol b/packages/ats/contracts/contracts/layer_1/kyc/KycFacet.sol
new file mode 100644
index 000000000..51b52c430
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/kyc/KycFacet.sol
@@ -0,0 +1,271 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {IKyc} from '../interfaces/kyc/IKyc.sol';
+import {_KYC_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {Kyc} from './Kyc.sol';
+
+contract KycFacet is Kyc, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        virtual
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _KYC_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](10);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .initializeInternalKyc
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .activateInternalKyc
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .deactivateInternalKyc
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.grantKyc.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.revokeKyc.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getKycFor.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getKycStatusFor
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getKycAccountsCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getKycAccountsData
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .isInternalKycActivated
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IKyc).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/lock/Lock.sol b/packages/ats/contracts/contracts/layer_1/lock/Lock.sol
index ffe7a4622..17de85679 100644
--- a/packages/ats/contracts/contracts/layer_1/lock/Lock.sol
+++ b/packages/ats/contracts/contracts/layer_1/lock/Lock.sol
@@ -205,17 +205,13 @@
 
 pragma solidity 0.8.18;
 
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {_DEFAULT_PARTITION} from '../../layer_0/constants/values.sol';
 import {_LOCKER_ROLE} from '../constants/roles.sol';
 import {ILock} from '../interfaces/lock/ILock.sol';
 import {Common} from '../common/Common.sol';
-import {_LOCK_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
-contract Lock is ILock, IStaticFunctionSelectors, Common {
+abstract contract Lock is ILock, Common {
     // Functions
     function lockByPartition(
         bytes32 _partition,
@@ -419,62 +415,4 @@ contract Lock is ILock, IStaticFunctionSelectors, Common {
                 _lockId
             );
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _LOCK_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](12);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .lockByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .releaseByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getLockedAmountForByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getLockCountForByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getLocksIdForByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getLockForByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.lock.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.release.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getLockedAmountFor
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getLockCountFor
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.getLocksIdFor.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.getLockFor.selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(ILock).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/lock/LockFacet.sol b/packages/ats/contracts/contracts/layer_1/lock/LockFacet.sol
new file mode 100644
index 000000000..3e9b930f7
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/lock/LockFacet.sol
@@ -0,0 +1,274 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {ILock} from '../interfaces/lock/ILock.sol';
+import {_LOCK_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {Lock} from './Lock.sol';
+
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+contract LockFacet is Lock, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _LOCK_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](12);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .lockByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .releaseByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getLockedAmountForByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getLockCountForByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getLocksIdForByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getLockForByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.lock.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.release.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getLockedAmountFor
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getLockCountFor
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getLocksIdFor.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getLockFor.selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(ILock).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitions.sol b/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitions.sol
index 89836beac..bea2419dd 100644
--- a/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitions.sol
+++ b/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitions.sol
@@ -5,23 +5,13 @@ import {Common} from '../common/Common.sol';
 import {
     IProtectedPartitions
 } from '../interfaces/protectedPartitions/IProtectedPartitions.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {
-    _PROTECTED_PARTITIONS_RESOLVER_KEY
-} from '../constants/resolverKeys.sol';
 import {
     _CONTRACT_NAME_PROTECTEDPARTITIONS,
     _CONTRACT_VERSION_PROTECTEDPARTITIONS
 } from '../constants/values.sol';
 import {_PROTECTED_PARTITIONS_ROLE} from '../constants/roles.sol';
 
-contract ProtectedPartitions is
-    IProtectedPartitions,
-    IStaticFunctionSelectors,
-    Common
-{
+abstract contract ProtectedPartitions is IProtectedPartitions, Common {
     // solhint-disable-next-line func-name-mixedcase
     function initialize_ProtectedPartitions(
         bool _protectPartitions
@@ -79,51 +69,4 @@ contract ProtectedPartitions is
     ) external pure override returns (bytes32 role) {
         role = _calculateRoleForPartition(partition);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _PROTECTED_PARTITIONS_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](6);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .initialize_ProtectedPartitions
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .protectPartitions
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .unprotectPartitions
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .arePartitionsProtected
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.getNounceFor.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .calculateRoleForPartition
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IProtectedPartitions)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitionsFacet.sol b/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitionsFacet.sol
new file mode 100644
index 000000000..35fb6c934
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitionsFacet.sol
@@ -0,0 +1,65 @@
+pragma solidity 0.8.18;
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+
+import {
+    IProtectedPartitions
+} from '../interfaces/protectedPartitions/IProtectedPartitions.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {
+    _PROTECTED_PARTITIONS_RESOLVER_KEY
+} from '../constants/resolverKeys.sol';
+import {ProtectedPartitions} from './ProtectedPartitions.sol';
+
+contract ProtectedPartitionsFacet is
+    ProtectedPartitions,
+    IStaticFunctionSelectors
+{
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _PROTECTED_PARTITIONS_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](6);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .initialize_ProtectedPartitions
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .protectPartitions
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .unprotectPartitions
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .arePartitionsProtected
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getNounceFor.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .calculateRoleForPartition
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IProtectedPartitions)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/snapshots/Snapshots.sol b/packages/ats/contracts/contracts/layer_1/snapshots/Snapshots.sol
index 13ccc09e1..2bd6bccfe 100644
--- a/packages/ats/contracts/contracts/layer_1/snapshots/Snapshots.sol
+++ b/packages/ats/contracts/contracts/layer_1/snapshots/Snapshots.sol
@@ -206,17 +206,11 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.18;
 
-import {
-    _SNAPSHOTS_RESOLVER_KEY
-} from '../../layer_1/constants/resolverKeys.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {ISnapshots} from '../interfaces/snapshots/ISnapshots.sol';
 import {Common} from '../common/Common.sol';
 import {_SNAPSHOT_ROLE} from '../constants/roles.sol';
 
-contract Snapshots is IStaticFunctionSelectors, ISnapshots, Common {
+abstract contract Snapshots is ISnapshots, Common {
     function takeSnapshot()
         external
         override
@@ -346,77 +340,4 @@ contract Snapshots is IStaticFunctionSelectors, ISnapshots, Common {
             _tokenHolder
         );
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _SNAPSHOTS_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](15);
-        staticFunctionSelectors_[selectorIndex++] = this.takeSnapshot.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .balanceOfAtSnapshot
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .totalSupplyAtSnapshot
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .balanceOfAtSnapshotByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .partitionsOfAtSnapshot
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .totalSupplyAtSnapshotByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .lockedBalanceOfAtSnapshot
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .lockedBalanceOfAtSnapshotByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .heldBalanceOfAtSnapshot
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .heldBalanceOfAtSnapshotByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .clearedBalanceOfAtSnapshot
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .clearedBalanceOfAtSnapshotByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .decimalsAtSnapshot
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getTokenHoldersAtSnapshot
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getTotalTokenHoldersAtSnapshot
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(ISnapshots).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/snapshots/SnapshotsFacet.sol b/packages/ats/contracts/contracts/layer_1/snapshots/SnapshotsFacet.sol
new file mode 100644
index 000000000..1ec4158fd
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/snapshots/SnapshotsFacet.sol
@@ -0,0 +1,291 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.18;
+
+import {
+    _SNAPSHOTS_RESOLVER_KEY
+} from '../../layer_1/constants/resolverKeys.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {ISnapshots} from '../interfaces/snapshots/ISnapshots.sol';
+import {Snapshots} from './Snapshots.sol';
+
+contract SnapshotsFacet is Snapshots, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _SNAPSHOTS_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](15);
+        staticFunctionSelectors_[selectorIndex++] = this.takeSnapshot.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .balanceOfAtSnapshot
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .totalSupplyAtSnapshot
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .balanceOfAtSnapshotByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .partitionsOfAtSnapshot
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .totalSupplyAtSnapshotByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .lockedBalanceOfAtSnapshot
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .lockedBalanceOfAtSnapshotByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .heldBalanceOfAtSnapshot
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .heldBalanceOfAtSnapshotByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .clearedBalanceOfAtSnapshot
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .clearedBalanceOfAtSnapshotByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .decimalsAtSnapshot
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getTokenHoldersAtSnapshot
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getTotalTokenHoldersAtSnapshot
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(ISnapshots).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/ssi/SsiManagement.sol b/packages/ats/contracts/contracts/layer_1/ssi/SsiManagement.sol
index 51d621ad9..dd6ffe1c1 100644
--- a/packages/ats/contracts/contracts/layer_1/ssi/SsiManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/ssi/SsiManagement.sol
@@ -208,13 +208,9 @@ pragma solidity 0.8.18;
 
 import {Common} from '../common/Common.sol';
 import {_SSI_MANAGER_ROLE} from '../constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {_SSI_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {ISsiManagement} from '../interfaces/ssi/ISsiManagement.sol';
 
-contract SsiManagement is ISsiManagement, IStaticFunctionSelectors, Common {
+abstract contract SsiManagement is ISsiManagement, Common {
     function setRevocationRegistryAddress(
         address _revocationRegistryAddress
     )
@@ -292,53 +288,4 @@ contract SsiManagement is ISsiManagement, IStaticFunctionSelectors, Common {
     ) external view override returns (address[] memory members_) {
         return _getIssuerListMembers(_pageIndex, _pageLength);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        virtual
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _SSI_MANAGEMENT_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        virtual
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](7);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .setRevocationRegistryAddress
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.addIssuer.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.removeIssuer.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.isIssuer.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getRevocationRegistryAddress
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getIssuerListCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getIssuerListMembers
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        virtual
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(ISsiManagement)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_1/ssi/SsiManagementFacet.sol b/packages/ats/contracts/contracts/layer_1/ssi/SsiManagementFacet.sol
new file mode 100644
index 000000000..a6cd71c40
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_1/ssi/SsiManagementFacet.sol
@@ -0,0 +1,265 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_SSI_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {ISsiManagement} from '../interfaces/ssi/ISsiManagement.sol';
+import {SsiManagement} from './SsiManagement.sol';
+
+contract SsiManagementFacet is SsiManagement, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        virtual
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _SSI_MANAGEMENT_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        virtual
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](7);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .setRevocationRegistryAddress
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.addIssuer.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.removeIssuer.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.isIssuer.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getRevocationRegistryAddress
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getIssuerListCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getIssuerListMembers
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        virtual
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(ISsiManagement)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalances.sol b/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalances.sol
index 735b1a940..474b98c92 100644
--- a/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalances.sol
+++ b/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalances.sol
@@ -209,13 +209,9 @@ import {
     IAdjustBalances
 } from '../interfaces/adjustBalances/IAdjustBalances.sol';
 import {Common} from '../../layer_1/common/Common.sol';
-import {_BALANCE_ADJUSTMENTS_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {_ADJUSTMENT_BALANCE_ROLE} from '../constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 
-contract AdjustBalances is IAdjustBalances, IStaticFunctionSelectors, Common {
+abstract contract AdjustBalances is IAdjustBalances, Common {
     function adjustBalances(
         uint256 factor,
         uint8 decimals
@@ -231,38 +227,4 @@ contract AdjustBalances is IAdjustBalances, IStaticFunctionSelectors, Common {
         _adjustBalances(factor, decimals);
         success_ = true;
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _BALANCE_ADJUSTMENTS_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](1);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .adjustBalances
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IAdjustBalances)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalancesFacet.sol b/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalancesFacet.sol
new file mode 100644
index 000000000..dad2702f5
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalancesFacet.sol
@@ -0,0 +1,251 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+import {
+    IAdjustBalances
+} from '../interfaces/adjustBalances/IAdjustBalances.sol';
+import {_BALANCE_ADJUSTMENTS_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {AdjustBalances} from './AdjustBalances.sol';
+
+contract AdjustBalancesFacet is AdjustBalances, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _BALANCE_ADJUSTMENTS_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](1);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .adjustBalances
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IAdjustBalances)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/bond/Bond.sol b/packages/ats/contracts/contracts/layer_2/bond/Bond.sol
index 6309fc68f..deed82b49 100644
--- a/packages/ats/contracts/contracts/layer_2/bond/Bond.sol
+++ b/packages/ats/contracts/contracts/layer_2/bond/Bond.sol
@@ -215,11 +215,8 @@ import {
     _BOND_MANAGER_ROLE,
     _MATURITY_REDEEMER_ROLE
 } from '../../layer_1/constants/roles.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 
-abstract contract Bond is IBond, IStaticFunctionSelectors, Common {
+abstract contract Bond is IBond, Common {
     function redeemAtMaturityByPartition(
         address _tokenHolder,
         bytes32 _partition,
@@ -267,7 +264,8 @@ abstract contract Bond is IBond, IStaticFunctionSelectors, Common {
             _msgSender(),
             _newCoupon.recordDate,
             _newCoupon.executionDate,
-            _newCoupon.rate
+            _newCoupon.rate,
+            _newCoupon.period
         );
     }
 
diff --git a/packages/ats/contracts/contracts/layer_2/constants/values.sol b/packages/ats/contracts/contracts/layer_2/constants/values.sol
index 6b0bfcf00..02ae0a16f 100644
--- a/packages/ats/contracts/contracts/layer_2/constants/values.sol
+++ b/packages/ats/contracts/contracts/layer_2/constants/values.sol
@@ -203,28 +203,24 @@
 
 */
 
-pragma solidity 0.8.18;
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
+pragma solidity 0.8.18;
+
+uint256 constant MAX_UINT256 = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
+
+uint256 constant SNAPSHOT_RESULT_ID = 0;
 
 // solhint-disable max-line-length
 // keccak256('security.token.standard.dividend.corporateAction');
 bytes32 constant DIVIDEND_CORPORATE_ACTION_TYPE = 0x1c29d09f87f2b0c8192a7719a2acdfdfa320dc2835b5a0398e5bd8dc34c14b0e;
-
 // keccak256('security.token.standard.votingRights.corporateAction');
 bytes32 constant VOTING_RIGHTS_CORPORATE_ACTION_TYPE = 0x250dbe25ab2f06b39b936572a67e1dbfce91fb156f522809fe817f89bf684047;
-
 // keccak256('security.token.standard.coupon.corporateAction');
 bytes32 constant COUPON_CORPORATE_ACTION_TYPE = 0x4657b10f3cac57d39d628d52e74738d0fdcadc1b2f82958cb835081f1bb26620;
-
 // keccak256('security.token.standard.balanceAdjustment.corporateAction');
 bytes32 constant BALANCE_ADJUSTMENT_CORPORATE_ACTION_TYPE = 0x1256aa1b36483ca651f5d8cbafb7033dcb54872ae7d24442b8ee4baa3f49aa2f;
 
-uint256 constant SNAPSHOT_RESULT_ID = 0;
-
-uint256 constant MAX_UINT256 = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
-
 // keccak256('security.token.standard.balanceAdjustment.scheduledTasks');
 bytes32 constant BALANCE_ADJUSTMENT_TASK_TYPE = 0x9ce9cffaccaf68fc544ce4df9e5e2774249df2f0b3c9cf940a53a6827465db9d;
-
 // keccak256('security.token.standard.snapshot.scheduledTasks');
 bytes32 constant SNAPSHOT_TASK_TYPE = 0x322c4b500b27950e00c27e3a40ca8f9ffacbc81a3b4e3c9516717391fd54234c;
diff --git a/packages/ats/contracts/contracts/layer_2/equity/Equity.sol b/packages/ats/contracts/contracts/layer_2/equity/Equity.sol
index aaf9d1f1a..f412a4986 100644
--- a/packages/ats/contracts/contracts/layer_2/equity/Equity.sol
+++ b/packages/ats/contracts/contracts/layer_2/equity/Equity.sol
@@ -206,9 +206,6 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.18;
 
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {_CORPORATE_ACTION_ROLE} from '../../layer_1/constants/roles.sol';
 import {
     DIVIDEND_CORPORATE_ACTION_TYPE,
@@ -221,7 +218,7 @@ import {
     EnumerableSet
 } from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
-abstract contract Equity is IEquity, IStaticFunctionSelectors, Common {
+abstract contract Equity is IEquity, Common {
     using EnumerableSet for EnumerableSet.Bytes32Set;
 
     function setDividends(
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondRead.sol b/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondRead.sol
index 11084cf28..b6792c0eb 100644
--- a/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondRead.sol
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondRead.sol
@@ -224,6 +224,7 @@ interface IBondRead {
         uint256 recordDate;
         uint256 executionDate;
         uint256 rate;
+        uint256 period;
     }
 
     struct RegisteredCoupon {
@@ -236,6 +237,7 @@ interface IBondRead {
         uint256 rate;
         uint256 recordDate;
         uint256 executionDate;
+        uint256 period;
         uint8 decimals;
         bool recordDateReached;
     }
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondStorageWrapper.sol b/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondStorageWrapper.sol
index a4cc68aa2..881715769 100644
--- a/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondStorageWrapper.sol
@@ -207,23 +207,55 @@
 pragma solidity 0.8.18;
 
 interface IBondStorageWrapper {
+    /**
+     * @notice Emitted when a coupon is created or updated for a bond or corporate action.
+     * @param corporateActionId Unique identifier grouping related corporate actions or coupons.
+     * @param couponId Identifier of the created or updated coupon.
+     * @param operator Address that performed the operation.
+     * @param recordDate Record date timestamp used to determine eligible holders.
+     * @param executionDate Execution/payment date timestamp for the coupon.
+     * @param rate Coupon rate or amount expressed in contract-specific units.
+     * @param period Period length between coupon payments.
+     */
     event CouponSet(
         bytes32 corporateActionId,
         uint256 couponId,
         address indexed operator,
         uint256 indexed recordDate,
         uint256 indexed executionDate,
-        uint256 rate
+        uint256 rate,
+        uint256 period
     );
 
+    /**
+     * @notice Emitted when a bond's maturity date is modified.
+     * @param bondId Address of the bond whose maturity changed.
+     * @param maturityDate New maturity timestamp.
+     * @param previousMaturityDate Previous maturity timestamp prior to the update.
+     */
     event MaturityDateUpdated(
         address indexed bondId,
         uint256 indexed maturityDate,
         uint256 indexed previousMaturityDate
     );
 
+    /**
+     * @notice Coupon creation failed due to an internal failure.
+     */
     error CouponCreationFailed();
+
+    /**
+     * @notice First coupon date is invalid or misaligned.
+     */
     error CouponFirstDateWrong();
+
+    /**
+     * @notice Coupon frequency parameter is invalid.
+     */
     error CouponFrequencyWrong();
+
+    /**
+     * @notice Provided maturity date is invalid (e.g. in the past or before issuance).
+     */
     error BondMaturityDateWrong();
 }
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustments.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustments.sol
index 236f199ab..e874569be 100644
--- a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustments.sol
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustments.sol
@@ -206,13 +206,6 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.18;
 
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
-import {Common} from '../../../layer_1/common/Common.sol';
-import {
-    _SCHEDULED_BALANCE_ADJUSTMENTS_RESOLVER_KEY
-} from '../../constants/resolverKeys.sol';
 import {Common} from '../../../layer_1/common/Common.sol';
 import {
     IScheduledBalanceAdjustments
@@ -222,8 +215,7 @@ import {
     EnumerableSet
 } from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
-contract ScheduledBalanceAdjustments is
-    IStaticFunctionSelectors,
+abstract contract ScheduledBalanceAdjustments is
     IScheduledBalanceAdjustments,
     Common
 {
@@ -266,45 +258,4 @@ contract ScheduledBalanceAdjustments is
             _pageLength
         );
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _SCHEDULED_BALANCE_ADJUSTMENTS_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](3);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .scheduledBalanceAdjustmentCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getScheduledBalanceAdjustments
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .onScheduledBalanceAdjustmentTriggered
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(
-            IScheduledBalanceAdjustments
-        ).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsFacet.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsFacet.sol
new file mode 100644
index 000000000..2806dc154
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsFacet.sol
@@ -0,0 +1,264 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.18;
+
+import {
+    IStaticFunctionSelectors
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {
+    _SCHEDULED_BALANCE_ADJUSTMENTS_RESOLVER_KEY
+} from '../../constants/resolverKeys.sol';
+import {
+    IScheduledBalanceAdjustments
+} from '../../interfaces/scheduledTasks/scheduledBalanceAdjustments/IScheduledBalanceAdjustments.sol';
+import {ScheduledBalanceAdjustments} from './ScheduledBalanceAdjustments.sol';
+
+contract ScheduledBalanceAdjustmentsFacet is
+    ScheduledBalanceAdjustments,
+    IStaticFunctionSelectors
+{
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _SCHEDULED_BALANCE_ADJUSTMENTS_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](3);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .scheduledBalanceAdjustmentCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getScheduledBalanceAdjustments
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .onScheduledBalanceAdjustmentTriggered
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(
+            IScheduledBalanceAdjustments
+        ).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshots.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshots.sol
index 275cb9882..5f71f13b3 100644
--- a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshots.sol
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshots.sol
@@ -206,13 +206,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.18;
 
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {Common} from '../../../layer_1/common/Common.sol';
-import {
-    _SCHEDULED_SNAPSHOTS_RESOLVER_KEY
-} from '../../constants/resolverKeys.sol';
 import {
     IScheduledSnapshots
 } from '../../interfaces/scheduledTasks/scheduledSnapshots/IScheduledSnapshots.sol';
@@ -221,11 +215,7 @@ import {
     EnumerableSet
 } from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
-contract ScheduledSnapshots is
-    IStaticFunctionSelectors,
-    IScheduledSnapshots,
-    Common
-{
+abstract contract ScheduledSnapshots is IScheduledSnapshots, Common {
     using EnumerableSet for EnumerableSet.Bytes32Set;
 
     function onScheduledSnapshotTriggered(
@@ -260,44 +250,4 @@ contract ScheduledSnapshots is
     {
         scheduledSnapshot_ = _getScheduledSnapshots(_pageIndex, _pageLength);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _SCHEDULED_SNAPSHOTS_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](3);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .scheduledSnapshotCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getScheduledSnapshots
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .onScheduledSnapshotTriggered
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IScheduledSnapshots)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshotsFacet.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshotsFacet.sol
new file mode 100644
index 000000000..45635aaf7
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshotsFacet.sol
@@ -0,0 +1,263 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.18;
+
+import {
+    IStaticFunctionSelectors
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {
+    _SCHEDULED_SNAPSHOTS_RESOLVER_KEY
+} from '../../constants/resolverKeys.sol';
+import {
+    IScheduledSnapshots
+} from '../../interfaces/scheduledTasks/scheduledSnapshots/IScheduledSnapshots.sol';
+import {ScheduledSnapshots} from './ScheduledSnapshots.sol';
+
+contract ScheduledSnapshotsFacet is
+    ScheduledSnapshots,
+    IStaticFunctionSelectors
+{
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _SCHEDULED_SNAPSHOTS_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](3);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .scheduledSnapshotCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getScheduledSnapshots
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .onScheduledSnapshotTriggered
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IScheduledSnapshots)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledTasks/ScheduledTasks.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledTasks/ScheduledTasks.sol
index 551a26a1f..3be0b8238 100644
--- a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledTasks/ScheduledTasks.sol
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledTasks/ScheduledTasks.sol
@@ -206,11 +206,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.18;
 
-import {
-    IStaticFunctionSelectors
-} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {Common} from '../../../layer_1/common/Common.sol';
-import {_SCHEDULED_TASKS_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
 import {
     IScheduledTasks
 } from '../../interfaces/scheduledTasks/scheduledTasks/IScheduledTasks.sol';
@@ -219,7 +215,7 @@ import {
     EnumerableSet
 } from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
-contract ScheduledTasks is IStaticFunctionSelectors, IScheduledTasks, Common {
+abstract contract ScheduledTasks is IScheduledTasks, Common {
     using EnumerableSet for EnumerableSet.Bytes32Set;
 
     function onScheduledTaskTriggered(
@@ -260,50 +256,4 @@ contract ScheduledTasks is IStaticFunctionSelectors, IScheduledTasks, Common {
     {
         scheduledTask_ = _getScheduledTasks(_pageIndex, _pageLength);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _SCHEDULED_TASKS_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](5);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .triggerPendingScheduledTasks
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .triggerScheduledTasks
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .scheduledTaskCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getScheduledTasks
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .onScheduledTaskTriggered
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IScheduledTasks)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledTasks/ScheduledTasksFacet.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledTasks/ScheduledTasksFacet.sol
new file mode 100644
index 000000000..9caa4e94d
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledTasks/ScheduledTasksFacet.sol
@@ -0,0 +1,264 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.18;
+
+import {
+    IStaticFunctionSelectors
+} from '../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {_SCHEDULED_TASKS_RESOLVER_KEY} from '../../constants/resolverKeys.sol';
+import {
+    IScheduledTasks
+} from '../../interfaces/scheduledTasks/scheduledTasks/IScheduledTasks.sol';
+import {ScheduledTasks} from './ScheduledTasks.sol';
+
+contract ScheduledTasksFacet is ScheduledTasks, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _SCHEDULED_TASKS_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](5);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .triggerPendingScheduledTasks
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .triggerScheduledTasks
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .scheduledTaskCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getScheduledTasks
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .onScheduledTaskTriggered
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IScheduledTasks)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSA.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSA.sol
index 36262cfae..1f71909aa 100644
--- a/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSA.sol
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSA.sol
@@ -213,10 +213,8 @@ import {
     RegulationData,
     AdditionalSecurityData
 } from '../constants/regulation.sol';
-import {_BOND_RESOLVER_KEY} from '../../layer_2/constants/resolverKeys.sol';
-import {IBond} from '../../layer_2/interfaces/bond/IBond.sol';
 
-contract BondUSA is IBondUSA, Bond {
+abstract contract BondUSA is IBondUSA, Bond {
     // solhint-disable func-name-mixedcase
     // solhint-disable-next-line private-vars-leading-underscore
     function _initialize_bondUSA(
@@ -228,45 +226,4 @@ contract BondUSA is IBondUSA, Bond {
         _initialize_bond(_bondDetailsData, _couponDetailsData);
         _initializeSecurity(_regulationData, _additionalSecurityData);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _BOND_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](4);
-        staticFunctionSelectors_[selectorIndex++] = this
-            ._initialize_bondUSA
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.setCoupon.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .updateMaturityDate
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .redeemAtMaturityByPartition
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](3);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IBond).interfaceId;
-        staticInterfaceIds_[selectorsIndex++] = type(IBondUSA).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAFacet.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAFacet.sol
new file mode 100644
index 000000000..561307181
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAFacet.sol
@@ -0,0 +1,260 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {IBondUSA} from '../interfaces/IBondUSA.sol';
+import {_BOND_RESOLVER_KEY} from '../../layer_2/constants/resolverKeys.sol';
+import {IBond} from '../../layer_2/interfaces/bond/IBond.sol';
+import {ISecurity} from '../interfaces/ISecurity.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {BondUSA} from './BondUSA.sol';
+
+contract BondUSAFacet is BondUSA, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _BOND_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](4);
+        staticFunctionSelectors_[selectorIndex++] = this
+            ._initialize_bondUSA
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setCoupon.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .updateMaturityDate
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .redeemAtMaturityByPartition
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](3);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IBond).interfaceId;
+        staticInterfaceIds_[selectorsIndex++] = type(ISecurity).interfaceId;
+        staticInterfaceIds_[selectorsIndex++] = type(IBondUSA).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_3/equityUSA/EquityUSA.sol b/packages/ats/contracts/contracts/layer_3/equityUSA/EquityUSA.sol
index 6370233c7..ea6198945 100644
--- a/packages/ats/contracts/contracts/layer_3/equityUSA/EquityUSA.sol
+++ b/packages/ats/contracts/contracts/layer_3/equityUSA/EquityUSA.sol
@@ -213,11 +213,8 @@ import {
     RegulationData,
     AdditionalSecurityData
 } from '../constants/regulation.sol';
-import {_EQUITY_RESOLVER_KEY} from '../../layer_2/constants/resolverKeys.sol';
-import {IEquity} from '../../layer_2/interfaces/equity/IEquity.sol';
-import {ISecurity} from '../interfaces/ISecurity.sol';
 
-contract EquityUSA is IEquityUSA, Equity, Security {
+abstract contract EquityUSA is IEquityUSA, Equity, Security {
     // solhint-disable func-name-mixedcase
     // solhint-disable-next-line private-vars-leading-underscore
     function _initialize_equityUSA(
@@ -228,86 +225,4 @@ contract EquityUSA is IEquityUSA, Equity, Security {
         _initializeEquity(_equityDetailsData);
         _initializeSecurity(_regulationData, _additionalSecurityData);
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _EQUITY_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](20);
-        staticFunctionSelectors_[selectorIndex++] = this
-            ._initialize_equityUSA
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getEquityDetails
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.setDividends.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.getDividends.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getDividendsFor
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getDividendsCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this.setVoting.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.getVoting.selector;
-        staticFunctionSelectors_[selectorIndex++] = this.getVotingFor.selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getVotingCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .setScheduledBalanceAdjustment
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getScheduledBalanceAdjustment
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getScheduledBalanceAdjustmentCount
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getSecurityRegulationData
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getSecurityHolders
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getTotalSecurityHolders
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getDividendHolders
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getTotalDividendHolders
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getVotingHolders
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .getTotalVotingHolders
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](3);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(IEquity).interfaceId;
-        staticInterfaceIds_[selectorsIndex++] = type(ISecurity).interfaceId;
-        staticInterfaceIds_[selectorsIndex++] = type(IEquityUSA).interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_3/equityUSA/EquityUSAFacet.sol b/packages/ats/contracts/contracts/layer_3/equityUSA/EquityUSAFacet.sol
new file mode 100644
index 000000000..f1a894157
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_3/equityUSA/EquityUSAFacet.sol
@@ -0,0 +1,300 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {IEquityUSA} from '../interfaces/IEquityUSA.sol';
+import {_EQUITY_RESOLVER_KEY} from '../../layer_2/constants/resolverKeys.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {IEquity} from '../../layer_2/interfaces/equity/IEquity.sol';
+import {ISecurity} from '../interfaces/ISecurity.sol';
+import {EquityUSA} from './EquityUSA.sol';
+
+contract EquityUSAFacet is EquityUSA, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _EQUITY_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](20);
+        staticFunctionSelectors_[selectorIndex++] = this
+            ._initialize_equityUSA
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getEquityDetails
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setDividends.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getDividends.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getDividendsFor
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getDividendsCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setVoting.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getVoting.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getVotingFor.selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getVotingCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .setScheduledBalanceAdjustment
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getScheduledBalanceAdjustment
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getScheduledBalanceAdjustmentCount
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getSecurityRegulationData
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getSecurityHolders
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getTotalSecurityHolders
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getDividendHolders
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getTotalDividendHolders
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getVotingHolders
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .getTotalVotingHolders
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](3);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IEquity).interfaceId;
+        staticInterfaceIds_[selectorsIndex++] = type(ISecurity).interfaceId;
+        staticInterfaceIds_[selectorsIndex++] = type(IEquityUSA).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLock.sol b/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLock.sol
index abb671463..5f86991e7 100644
--- a/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLock.sol
+++ b/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLock.sol
@@ -208,16 +208,12 @@ pragma solidity 0.8.18;
 
 import {_DEFAULT_PARTITION} from '../../layer_0/constants/values.sol';
 import {_LOCKER_ROLE} from '../../layer_1/constants/roles.sol';
-import {_TRANSFER_AND_LOCK_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {
-    IStaticFunctionSelectors
-} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
 import {ITransferAndLock} from '../interfaces/ITransferAndLock.sol';
 import {BasicTransferInfo} from '../../layer_1/interfaces/ERC1400/IERC1410.sol';
 import {Common} from '../../layer_1/common/Common.sol';
 import {ITransferAndLock} from '../interfaces/ITransferAndLock.sol';
 
-contract TransferAndLock is ITransferAndLock, IStaticFunctionSelectors, Common {
+abstract contract TransferAndLock is ITransferAndLock, Common {
     function transferAndLockByPartition(
         bytes32 _partition,
         address _to,
@@ -354,41 +350,4 @@ contract TransferAndLock is ITransferAndLock, IStaticFunctionSelectors, Common {
                 _signature
             );
     }
-
-    function getStaticResolverKey()
-        external
-        pure
-        override
-        returns (bytes32 staticResolverKey_)
-    {
-        staticResolverKey_ = _TRANSFER_AND_LOCK_RESOLVER_KEY;
-    }
-
-    function getStaticFunctionSelectors()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticFunctionSelectors_)
-    {
-        uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](2);
-        staticFunctionSelectors_[selectorIndex++] = this
-            .transferAndLockByPartition
-            .selector;
-        staticFunctionSelectors_[selectorIndex++] = this
-            .transferAndLock
-            .selector;
-    }
-
-    function getStaticInterfaceIds()
-        external
-        pure
-        override
-        returns (bytes4[] memory staticInterfaceIds_)
-    {
-        staticInterfaceIds_ = new bytes4[](1);
-        uint256 selectorsIndex;
-        staticInterfaceIds_[selectorsIndex++] = type(ITransferAndLock)
-            .interfaceId;
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLockFacet.sol b/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLockFacet.sol
new file mode 100644
index 000000000..b35335b88
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLockFacet.sol
@@ -0,0 +1,253 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+import {_TRANSFER_AND_LOCK_RESOLVER_KEY} from '../constants/resolverKeys.sol';
+import {
+    IStaticFunctionSelectors
+} from '../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol';
+import {ITransferAndLock} from '../interfaces/ITransferAndLock.sol';
+import {TransferAndLock} from './TransferAndLock.sol';
+
+contract TransferAndLockFacet is TransferAndLock, IStaticFunctionSelectors {
+    function getStaticResolverKey()
+        external
+        pure
+        override
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _TRANSFER_AND_LOCK_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticFunctionSelectors_)
+    {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](2);
+        staticFunctionSelectors_[selectorIndex++] = this
+            .transferAndLockByPartition
+            .selector;
+        staticFunctionSelectors_[selectorIndex++] = this
+            .transferAndLock
+            .selector;
+    }
+
+    function getStaticInterfaceIds()
+        external
+        pure
+        override
+        returns (bytes4[] memory staticInterfaceIds_)
+    {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(ITransferAndLock)
+            .interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AccessControlTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AccessControlFacetTimeTravel.sol
similarity index 100%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AccessControlTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AccessControlFacetTimeTravel.sol
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AdjustBalancesFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AdjustBalancesFacetTimeTravel.sol
new file mode 100644
index 000000000..7953f1214
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AdjustBalancesFacetTimeTravel.sol
@@ -0,0 +1,236 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+pragma solidity 0.8.18;
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+import {
+    AdjustBalancesFacet
+} from '../../../layer_2/adjustBalances/AdjustBalancesFacet.sol';
+import {
+    TimeTravelStorageWrapper
+} from '../timeTravel/TimeTravelStorageWrapper.sol';
+import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
+
+contract AdjustBalancesFacetTimeTravel is
+    AdjustBalancesFacet,
+    TimeTravelStorageWrapper
+{
+    function _blockTimestamp()
+        internal
+        view
+        override(LocalContext, TimeTravelStorageWrapper)
+        returns (uint256)
+    {
+        return TimeTravelStorageWrapper._blockTimestamp();
+    }
+    function _blockNumber()
+        internal
+        view
+        override(LocalContext, TimeTravelStorageWrapper)
+        returns (uint256)
+    {
+        return TimeTravelStorageWrapper._blockNumber();
+    }
+}
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1643TimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1643TimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAFacetTimeTravel.sol
index 9d094da1c..983986c5c 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1643TimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAFacetTimeTravel.sol
@@ -206,13 +206,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {ERC1643} from '../../../layer_1/ERC1400/ERC1643/ERC1643.sol';
+import {BondUSAFacet} from '../../../layer_3/bondUSA/BondUSAFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC1643TimeTravel is ERC1643, TimeTravelStorageWrapper {
+contract BondUSAFacetTimeTravel is BondUSAFacet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/LockTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CapFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/LockTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CapFacetTimeTravel.sol
index 90d77d68d..543740a48 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/LockTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CapFacetTimeTravel.sol
@@ -204,15 +204,15 @@
 */
 
 pragma solidity 0.8.18;
-// SPDX-License-Identifier: BSD-3-Clause-Attribution
 
-import {Lock} from '../../../layer_1/lock/Lock.sol';
+import {CapFacet} from '../../../layer_1/cap/CapFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract LockTimeTravel is Lock, TimeTravelStorageWrapper {
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+contract CapFacetTimeTravel is CapFacet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CorporateActionsTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ControlListFacetTimeTravelTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CorporateActionsTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ControlListFacetTimeTravelTimeTravel.sol
index 7181436e3..84886e4b4 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CorporateActionsTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ControlListFacetTimeTravelTimeTravel.sol
@@ -203,19 +203,19 @@
 
 */
 
-// SPDX-License-Identifier: BSD-3-Clause-Attribution
 pragma solidity 0.8.18;
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
 
 import {
-    CorporateActions
-} from '../../../layer_1/corporateActions/CorporateActions.sol';
+    ControlListFacet
+} from '../../../layer_1/controlList/ControlListFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract CorporateActionsTimeTravel is
-    CorporateActions,
+contract ControlListFacetTimeTravel is
+    ControlListFacet,
     TimeTravelStorageWrapper
 {
     function _blockTimestamp()
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalPauseManagementTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CorporateActionsFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalPauseManagementTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CorporateActionsFacetTimeTravel.sol
index 89d341f32..8ac59480d 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalPauseManagementTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CorporateActionsFacetTimeTravel.sol
@@ -207,15 +207,15 @@
 pragma solidity 0.8.18;
 
 import {
-    ExternalPauseManagement
-} from '../../../layer_1/externalPauses/ExternalPauseManagement.sol';
+    CorporateActionsFacet
+} from '../../../layer_1/corporateActions/CorporateActionsFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ExternalPauseManagementTimeTravel is
-    ExternalPauseManagement,
+contract CorporateActionsFacetTimeTravel is
+    CorporateActionsFacet,
     TimeTravelStorageWrapper
 {
     function _blockTimestamp()
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ManagementTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ManagementFacetTimeTravel.sol
similarity index 99%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ManagementTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ManagementFacetTimeTravel.sol
index 8d31054cf..d5e9f68a4 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ManagementTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ManagementFacetTimeTravel.sol
@@ -216,7 +216,7 @@ import {
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC1410ManagementTimeTravel is
+contract ERC1410ManagementFacetTimeTravel is
     ERC1410ManagementFacet,
     TimeTravelStorageWrapper
 {
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ReadTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ReadFacetTimeTravel.sol
similarity index 99%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ReadTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ReadFacetTimeTravel.sol
index 8476c2461..222239822 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ReadTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410ReadFacetTimeTravel.sol
@@ -216,7 +216,10 @@ import {
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC1410ReadTimeTravel is ERC1410ReadFacet, TimeTravelStorageWrapper {
+contract ERC1410ReadFacetTimeTravel is
+    ERC1410ReadFacet,
+    TimeTravelStorageWrapper
+{
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410TokenHolderTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410TokenHolderFacetTimeTravel.sol
similarity index 99%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410TokenHolderTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410TokenHolderFacetTimeTravel.sol
index fbe2d4bc2..c5750a580 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410TokenHolderTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1410TokenHolderFacetTimeTravel.sol
@@ -216,7 +216,7 @@ import {
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC1410TokenHolderTimeTravel is
+contract ERC1410TokenHolderFacetTimeTravel is
     ERC1410TokenHolderFacet,
     TimeTravelStorageWrapper
 {
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20TimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1594FacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20TimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1594FacetTimeTravel.sol
index cd9025e7d..21e2f98d0 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20TimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1594FacetTimeTravel.sol
@@ -208,13 +208,13 @@
 
 pragma solidity 0.8.18;
 
-import {ERC20} from '../../../layer_1/ERC1400/ERC20/ERC20.sol';
+import {ERC1594Facet} from '../../../layer_1/ERC1400/ERC1594/ERC1594Facet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC20TimeTravel is ERC20, TimeTravelStorageWrapper {
+contract ERC1594FacetTimeTravel is ERC1594Facet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/EquityUSATimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1643FacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/EquityUSATimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1643FacetTimeTravel.sol
index e63d0adfd..f3cb13370 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/EquityUSATimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1643FacetTimeTravel.sol
@@ -206,13 +206,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {EquityUSA} from '../../../layer_3/equityUSA/EquityUSA.sol';
+import {ERC1643Facet} from '../../../layer_1/ERC1400/ERC1643/ERC1643Facet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract EquityUSATimeTravel is EquityUSA, TimeTravelStorageWrapper {
+contract ERC1643FacetTimeTravel is ERC1643Facet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1594TimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1644FacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1594TimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1644FacetTimeTravel.sol
index 32b2bfe2f..a51aabb03 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1594TimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1644FacetTimeTravel.sol
@@ -208,13 +208,13 @@
 
 pragma solidity 0.8.18;
 
-import {ERC1594} from '../../../layer_1/ERC1400/ERC1594/ERC1594.sol';
+import {ERC1644Facet} from '../../../layer_1/ERC1400/ERC1644/ERC1644Facet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC1594TimeTravel is ERC1594, TimeTravelStorageWrapper {
+contract ERC1644FacetTimeTravel is ERC1644Facet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1644TimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20FacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1644TimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20FacetTimeTravel.sol
index 37a0f78f3..89929ce67 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC1644TimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20FacetTimeTravel.sol
@@ -208,13 +208,13 @@
 
 pragma solidity 0.8.18;
 
-import {ERC1644} from '../../../layer_1/ERC1400/ERC1644/ERC1644.sol';
+import {ERC20Facet} from '../../../layer_1/ERC1400/ERC20/ERC20Facet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC1644TimeTravel is ERC1644, TimeTravelStorageWrapper {
+contract ERC20FacetTimeTravel is ERC20Facet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20PermitTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20PermitFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20PermitTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20PermitFacetTimeTravel.sol
index 5025e5ceb..562e64afc 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20PermitTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC20PermitFacetTimeTravel.sol
@@ -176,14 +176,17 @@
 pragma solidity 0.8.18;
 
 import {
-    ERC20Permit
-} from '../../../layer_1/ERC1400/ERC20Permit/ERC20Permit.sol';
+    ERC20PermitFacet
+} from '../../../layer_1/ERC1400/ERC20Permit/ERC20PermitFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC20PermitTimeTravel is ERC20Permit, TimeTravelStorageWrapper {
+contract ERC20PermitFacetTimeTravel is
+    ERC20PermitFacet,
+    TimeTravelStorageWrapper
+{
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643BatchTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643BatchFacetTimeTravel.sol
similarity index 99%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643BatchTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643BatchFacetTimeTravel.sol
index eee4df611..442787473 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643BatchTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643BatchFacetTimeTravel.sol
@@ -216,7 +216,10 @@ import {
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ERC3643BatchTimeTravel is ERC3643BatchFacet, TimeTravelStorageWrapper {
+contract ERC3643BatchFacetTimeTravel is
+    ERC3643BatchFacet,
+    TimeTravelStorageWrapper
+{
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643TimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643TimeTravel.sol
deleted file mode 100644
index 61a01c120..000000000
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ERC3643TimeTravel.sol
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.18;
-
-import {BondUSARead} from '../../../layer_3/bondUSA/BondUSARead.sol';
-import {
-    TimeTravelStorageWrapper
-} from '../timeTravel/TimeTravelStorageWrapper.sol';
-import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
-
-contract BondUSAReadTimeTravel is BondUSARead, TimeTravelStorageWrapper {
-    function _blockTimestamp()
-        internal
-        view
-        override(LocalContext, TimeTravelStorageWrapper)
-        returns (uint256)
-    {
-        return TimeTravelStorageWrapper._blockTimestamp();
-    }
-
-    function _blockNumber()
-        internal
-        view
-        override(LocalContext, TimeTravelStorageWrapper)
-        returns (uint256)
-    {
-        return TimeTravelStorageWrapper._blockNumber();
-    }
-}
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSATimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/EquityUSAFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSATimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/EquityUSAFacetTimeTravel.sol
index 252fefd7f..9b254f2b9 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSATimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/EquityUSAFacetTimeTravel.sol
@@ -206,13 +206,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {BondUSA} from '../../../layer_3/bondUSA/BondUSA.sol';
+import {EquityUSAFacet} from '../../../layer_3/equityUSA/EquityUSAFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract BondUSATimeTravel is BondUSA, TimeTravelStorageWrapper {
+contract EquityUSAFacetTimeTravel is EquityUSAFacet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalControlListManagementTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalControlListManagementFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalControlListManagementTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalControlListManagementFacetTimeTravel.sol
index fc5345d61..9b53406fc 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalControlListManagementTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalControlListManagementFacetTimeTravel.sol
@@ -207,15 +207,15 @@
 pragma solidity 0.8.18;
 
 import {
-    ExternalControlListManagement
-} from '../../../layer_1/externalControlLists/ExternalControlListManagement.sol';
+    ExternalControlListManagementFacet
+} from '../../../layer_1/externalControlLists/ExternalControlListManagementFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ExternalControlListManagementTimeTravel is
-    ExternalControlListManagement,
+contract ExternalControlListManagementFacetTimeTravel is
+    ExternalControlListManagementFacet,
     TimeTravelStorageWrapper
 {
     function _blockTimestamp()
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalKycListManagementTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalKycListManagementFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalKycListManagementTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalKycListManagementFacetTimeTravel.sol
index d821bdb28..ebe19d4b1 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalKycListManagementTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalKycListManagementFacetTimeTravel.sol
@@ -207,15 +207,15 @@
 pragma solidity 0.8.18;
 
 import {
-    ExternalKycListManagement
-} from '../../../layer_1/externalKycLists/ExternalKycListManagement.sol';
+    ExternalKycListManagementFacet
+} from '../../../layer_1/externalKycLists/ExternalKycListManagementFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ExternalKycListManagementTimeTravel is
-    ExternalKycListManagement,
+contract ExternalKycListManagementFacetTimeTravel is
+    ExternalKycListManagementFacet,
     TimeTravelStorageWrapper
 {
     function _blockTimestamp()
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalPauseManagementFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalPauseManagementFacetTimeTravel.sol
new file mode 100644
index 000000000..0f7c302c4
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ExternalPauseManagementFacetTimeTravel.sol
@@ -0,0 +1,238 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+pragma solidity 0.8.18;
+
+import {
+    ExternalPauseManagementFacet
+} from '../../../layer_1/externalPauses/ExternalPauseManagementFacet.sol';
+import {
+    TimeTravelStorageWrapper
+} from '../timeTravel/TimeTravelStorageWrapper.sol';
+import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
+
+contract ExternalPauseManagementFacetTimeTravel is
+    ExternalPauseManagementFacet,
+    TimeTravelStorageWrapper
+{
+    function _blockTimestamp()
+        internal
+        view
+        override(LocalContext, TimeTravelStorageWrapper)
+        returns (uint256)
+    {
+        return TimeTravelStorageWrapper._blockTimestamp();
+    }
+
+    function _blockNumber()
+        internal
+        view
+        override(LocalContext, TimeTravelStorageWrapper)
+        returns (uint256)
+    {
+        return TimeTravelStorageWrapper._blockNumber();
+    }
+}
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldManagementTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldManagementFacetTimeTravel.sol
similarity index 99%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldManagementTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldManagementFacetTimeTravel.sol
index 815ce6fa2..ab62cc9ab 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldManagementTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldManagementFacetTimeTravel.sol
@@ -214,7 +214,7 @@ import {
     HoldManagementFacet
 } from '../../../layer_1/hold/HoldManagementFacet.sol';
 
-contract HoldManagementTimeTravel is
+contract HoldManagementFacetTimeTravel is
     HoldManagementFacet,
     TimeTravelStorageWrapper
 {
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldReadTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldReadFacetTimeTravel.sol
similarity index 99%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldReadTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldReadFacetTimeTravel.sol
index d2e8211f5..60c7cf347 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldReadTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldReadFacetTimeTravel.sol
@@ -212,7 +212,7 @@ import {
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract HoldReadTimeTravel is HoldReadFacet, TimeTravelStorageWrapper {
+contract HoldReadFacetTimeTravel is HoldReadFacet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldTokenHolderTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldTokenHolderFacetTimeTravel.sol
similarity index 99%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldTokenHolderTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldTokenHolderFacetTimeTravel.sol
index 4e8c76789..541e5a392 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldTokenHolderTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/HoldTokenHolderFacetTimeTravel.sol
@@ -214,7 +214,7 @@ import {
     HoldTokenHolderFacet
 } from '../../../layer_1/hold/HoldTokenHolderFacet.sol';
 
-contract HoldTokenHolderTimeTravel is
+contract HoldTokenHolderFacetTimeTravel is
     HoldTokenHolderFacet,
     TimeTravelStorageWrapper
 {
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KycTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KycFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KycTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KycFacetTimeTravel.sol
index a1a1bfa70..ee3f68e6c 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KycTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KycFacetTimeTravel.sol
@@ -206,13 +206,13 @@
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 pragma solidity 0.8.18;
 
-import {Kyc} from '../../../layer_1/kyc/Kyc.sol';
+import {KycFacet} from '../../../layer_1/kyc/KycFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract KycTimeTravel is Kyc, TimeTravelStorageWrapper {
+contract KycFacetTimeTravel is KycFacet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CapTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/LockFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CapTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/LockFacetTimeTravel.sol
index f333bd9d3..bda7ba95f 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/CapTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/LockFacetTimeTravel.sol
@@ -204,15 +204,15 @@
 */
 
 pragma solidity 0.8.18;
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
 
-import {Cap} from '../../../layer_1/cap/Cap.sol';
+import {LockFacet} from '../../../layer_1/lock/LockFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-// SPDX-License-Identifier: BSD-3-Clause-Attribution
-contract CapTimeTravel is Cap, TimeTravelStorageWrapper {
+contract LockFacetTimeTravel is LockFacet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/PauseTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/PauseFacetTimeTravel.sol
similarity index 100%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/PauseTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/PauseFacetTimeTravel.sol
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ProtectedPartitionsTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ProtectedPartitionsFacetTimeTravel.sol
similarity index 86%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ProtectedPartitionsTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ProtectedPartitionsFacetTimeTravel.sol
index b990c2e3f..a4019d23d 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ProtectedPartitionsTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ProtectedPartitionsFacetTimeTravel.sol
@@ -2,15 +2,15 @@ pragma solidity 0.8.18;
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 
 import {
-    ProtectedPartitions
-} from '../../../layer_1/protectedPartitions/ProtectedPartitions.sol';
+    ProtectedPartitionsFacet
+} from '../../../layer_1/protectedPartitions/ProtectedPartitionsFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ProtectedPartitionsTimeTravel is
-    ProtectedPartitions,
+contract ProtectedPartitionsFacetTimeTravel is
+    ProtectedPartitionsFacet,
     TimeTravelStorageWrapper
 {
     function _blockTimestamp()
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledBalanceAdjustmentsTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledBalanceAdjustmentsFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledBalanceAdjustmentsTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledBalanceAdjustmentsFacetTimeTravel.sol
index eb4e78861..580959ced 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledBalanceAdjustmentsTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledBalanceAdjustmentsFacetTimeTravel.sol
@@ -207,15 +207,15 @@
 pragma solidity 0.8.18;
 
 import {
-    ScheduledBalanceAdjustments
-} from '../../../layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustments.sol';
+    ScheduledBalanceAdjustmentsFacet
+} from '../../../layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ScheduledBalanceAdjustmentsTimeTravel is
-    ScheduledBalanceAdjustments,
+contract ScheduledBalanceAdjustmentsFacetTimeTravel is
+    ScheduledBalanceAdjustmentsFacet,
     TimeTravelStorageWrapper
 {
     function _blockTimestamp()
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledSnapshotsTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledSnapshotsFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledSnapshotsTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledSnapshotsFacetTimeTravel.sol
index 6194d5f72..0f8027e61 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledSnapshotsTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledSnapshotsFacetTimeTravel.sol
@@ -207,15 +207,15 @@
 pragma solidity 0.8.18;
 
 import {
-    ScheduledSnapshots
-} from '../../../layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshots.sol';
+    ScheduledSnapshotsFacet
+} from '../../../layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshotsFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ScheduledSnapshotsTimeTravel is
-    ScheduledSnapshots,
+contract ScheduledSnapshotsFacetTimeTravel is
+    ScheduledSnapshotsFacet,
     TimeTravelStorageWrapper
 {
     function _blockTimestamp()
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledTasksTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledTasksFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledTasksTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledTasksFacetTimeTravel.sol
index 0b1991c15..d89f5be45 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledTasksTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledTasksFacetTimeTravel.sol
@@ -207,14 +207,17 @@
 pragma solidity 0.8.18;
 
 import {
-    ScheduledTasks
-} from '../../../layer_2/scheduledTasks/scheduledTasks/ScheduledTasks.sol';
+    ScheduledTasksFacet
+} from '../../../layer_2/scheduledTasks/scheduledTasks/ScheduledTasksFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract ScheduledTasksTimeTravel is ScheduledTasks, TimeTravelStorageWrapper {
+contract ScheduledTasksFacetTimeTravel is
+    ScheduledTasksFacet,
+    TimeTravelStorageWrapper
+{
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SnapshotsTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SnapshotsFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SnapshotsTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SnapshotsFacetTimeTravel.sol
index d650e9e7f..fc4490a8c 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SnapshotsTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SnapshotsFacetTimeTravel.sol
@@ -206,13 +206,13 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.18;
 
-import {Snapshots} from '../../../layer_1/snapshots/Snapshots.sol';
+import {SnapshotsFacet} from '../../../layer_1/snapshots/SnapshotsFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract SnapshotsTimeTravel is Snapshots, TimeTravelStorageWrapper {
+contract SnapshotsFacetTimeTravel is SnapshotsFacet, TimeTravelStorageWrapper {
     function _blockTimestamp()
         internal
         view
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SsiManagement.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SsiManagement.sol
deleted file mode 100644
index b04fc0ba2..000000000
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SsiManagement.sol
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-// SPDX-License-Identifier: BSD-3-Clause-Attribution
-pragma solidity 0.8.18;
-
-import {SsiManagement} from '../../../layer_1/ssi/SsiManagement.sol';
-import {
-    TimeTravelStorageWrapper
-} from '../timeTravel/TimeTravelStorageWrapper.sol';
-import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
-
-contract SsiManagementTimeTravel is SsiManagement, TimeTravelStorageWrapper {
-    function _blockTimestamp()
-        internal
-        view
-        override(LocalContext, TimeTravelStorageWrapper)
-        returns (uint256)
-    {
-        return TimeTravelStorageWrapper._blockTimestamp();
-    }
-
-    function _blockNumber()
-        internal
-        view
-        override(LocalContext, TimeTravelStorageWrapper)
-        returns (uint256)
-    {
-        return TimeTravelStorageWrapper._blockNumber();
-    }
-}
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SsiManagementFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SsiManagementFacetTimeTravel.sol
new file mode 100644
index 000000000..0c2c2d9f3
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SsiManagementFacetTimeTravel.sol
@@ -0,0 +1,236 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+// SPDX-License-Identifier: BSD-3-Clause-Attribution
+pragma solidity 0.8.18;
+
+import {SsiManagementFacet} from '../../../layer_1/ssi/SsiManagementFacet.sol';
+import {
+    TimeTravelStorageWrapper
+} from '../timeTravel/TimeTravelStorageWrapper.sol';
+import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
+
+contract SsiManagementFacetTimeTravel is
+    SsiManagementFacet,
+    TimeTravelStorageWrapper
+{
+    function _blockTimestamp()
+        internal
+        view
+        override(LocalContext, TimeTravelStorageWrapper)
+        returns (uint256)
+    {
+        return TimeTravelStorageWrapper._blockTimestamp();
+    }
+
+    function _blockNumber()
+        internal
+        view
+        override(LocalContext, TimeTravelStorageWrapper)
+        returns (uint256)
+    {
+        return TimeTravelStorageWrapper._blockNumber();
+    }
+}
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/TransferAndLockTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/TransferAndLockFacetTimeTravel.sol
similarity index 98%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/TransferAndLockTimeTravel.sol
rename to packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/TransferAndLockFacetTimeTravel.sol
index 01559bfac..5d3d6e64d 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/TransferAndLockTimeTravel.sol
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/TransferAndLockFacetTimeTravel.sol
@@ -207,15 +207,15 @@
 pragma solidity 0.8.18;
 
 import {
-    TransferAndLock
-} from '../../../layer_3/transferAndLock/TransferAndLock.sol';
+    TransferAndLockFacet
+} from '../../../layer_3/transferAndLock/TransferAndLockFacet.sol';
 import {
     TimeTravelStorageWrapper
 } from '../timeTravel/TimeTravelStorageWrapper.sol';
 import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
 
-contract TransferAndLockTimeTravel is
-    TransferAndLock,
+contract TransferAndLockFacetTimeTravel is
+    TransferAndLockFacet,
     TimeTravelStorageWrapper
 {
     function _blockTimestamp()
diff --git a/packages/ats/contracts/functions.txt b/packages/ats/contracts/functions.txt
index 3b96e34f8..fa197d7cd 100644
--- a/packages/ats/contracts/functions.txt
+++ b/packages/ats/contracts/functions.txt
@@ -1,1649 +1,1641 @@
-Obteniendo firmas de eventos (Ethers v5)...
-contractNames
-[
-  '@openzeppelin/contracts-upgradeable/utils/ArraysUpgradeable.sol:ArraysUpgradeable',
-  '@openzeppelin/contracts-upgradeable/utils/CountersUpgradeable.sol:CountersUpgradeable',
-  '@openzeppelin/contracts-upgradeable/utils/StorageSlotUpgradeable.sol:StorageSlotUpgradeable',
-  '@openzeppelin/contracts-upgradeable/utils/math/MathUpgradeable.sol:MathUpgradeable',
-  '@openzeppelin/contracts/access/Ownable.sol:Ownable',
-  '@openzeppelin/contracts/interfaces/IERC1967.sol:IERC1967',
-  '@openzeppelin/contracts/interfaces/draft-IERC1822.sol:IERC1822Proxiable',
-  '@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy',
-  '@openzeppelin/contracts/proxy/ERC1967/ERC1967Upgrade.sol:ERC1967Upgrade',
-  '@openzeppelin/contracts/proxy/Proxy.sol:Proxy',
-  '@openzeppelin/contracts/proxy/beacon/IBeacon.sol:IBeacon',
-  '@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol:ProxyAdmin',
-  '@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol:ITransparentUpgradeableProxy',
-  '@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol:TransparentUpgradeableProxy',
-  '@openzeppelin/contracts/utils/Address.sol:Address',
-  '@openzeppelin/contracts/utils/Context.sol:Context',
-  '@openzeppelin/contracts/utils/StorageSlot.sol:StorageSlot',
-  '@openzeppelin/contracts/utils/Strings.sol:Strings',
-  '@openzeppelin/contracts/utils/introspection/IERC165.sol:IERC165',
-  '@openzeppelin/contracts/utils/math/Math.sol:Math',
-  '@openzeppelin/contracts/utils/math/SignedMath.sol:SignedMath',
-  '@openzeppelin/contracts/utils/structs/EnumerableSet.sol:EnumerableSet',
-  'contracts/factory/Factory.sol:Factory',
-  'contracts/interfaces/factory/IFactory.sol:IFactory',
-  'contracts/interfaces/resolver/IBusinessLogicResolver.sol:IBusinessLogicResolver',
-  'contracts/interfaces/resolver/IBusinessLogicResolverWrapper.sol:IBusinessLogicResolverWrapper',
-  'contracts/interfaces/resolver/diamondCutManager/IDiamondCutManager.sol:IDiamondCutManager',
-  'contracts/interfaces/resolver/resolverProxy/IDiamond.sol:IDiamond',
-  'contracts/interfaces/resolver/resolverProxy/IDiamondCut.sol:IDiamondCut',
-  'contracts/interfaces/resolver/resolverProxy/IDiamondLoupe.sol:IDiamondLoupe',
-  'contracts/interfaces/resolver/resolverProxy/IERC173.sol:IERC173',
-  'contracts/interfaces/resolver/resolverProxy/IResolverProxy.sol:IResolverProxy',
-  'contracts/interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol:IStaticFunctionSelectors',
-  'contracts/layer_0/ERC1400/ERC1410/ERC1410BasicStorageWrapper.sol:ERC1410BasicStorageWrapper',
-  'contracts/layer_0/ERC1400/ERC1410/ERC1410BasicStorageWrapperRead.sol:ERC1410BasicStorageWrapperRead',
-  'contracts/layer_0/ERC1400/ERC1410/ERC1410OperatorStorageWrapper.sol:ERC1410OperatorStorageWrapper',
-  'contracts/layer_0/ERC1400/ERC1410/ERC1410ProtectedPartitionsStorageWrapper.sol:ERC1410ProtectedPartitionsStorageWrapper',
-  'contracts/layer_0/ERC1400/ERC1410/ERC1410StandardStorageWrapper.sol:ERC1410StandardStorageWrapper',
-  'contracts/layer_0/ERC1400/ERC1410/ERC1410StorageWrapper.sol:ERC1410StorageWrapper',
-  'contracts/layer_0/ERC1400/ERC1594/ERC1594StorageWrapper.sol:ERC1594StorageWrapper',
-  'contracts/layer_0/ERC1400/ERC1644/ERC1644StorageWrapper.sol:ERC1644StorageWrapper',
-  'contracts/layer_0/ERC1400/ERC20/ERC20StorageWrapper1.sol:ERC20StorageWrapper1',
-  'contracts/layer_0/ERC1400/ERC20/ERC20StorageWrapper2.sol:ERC20StorageWrapper2',
-  'contracts/layer_0/ERC3643/ERC3643StorageWrapper1.sol:ERC3643StorageWrapper1',
-  'contracts/layer_0/ERC3643/ERC3643StorageWrapper2.sol:ERC3643StorageWrapper2',
-  'contracts/layer_0/adjustBalances/AdjustBalancesStorageWrapper1.sol:AdjustBalancesStorageWrapper1',
-  'contracts/layer_0/adjustBalances/AdjustBalancesStorageWrapper2.sol:AdjustBalancesStorageWrapper2',
-  'contracts/layer_0/cap/CapStorageWrapper1.sol:CapStorageWrapper1',
-  'contracts/layer_0/cap/CapStorageWrapper2.sol:CapStorageWrapper2',
-  'contracts/layer_0/clearing/ClearingStorageWrapper1.sol:ClearingStorageWrapper1',
-  'contracts/layer_0/clearing/ClearingStorageWrapper2.sol:ClearingStorageWrapper2',
-  'contracts/layer_0/common/libraries/ArrayLib.sol:ArrayLib',
-  'contracts/layer_0/common/libraries/Eip1066Lib.sol:Eip1066Lib',
-  'contracts/layer_0/common/libraries/EnumerableSetBytes4.sol:EnumerableSetBytes4',
-  'contracts/layer_0/common/libraries/LibCommon.sol:LibCommon',
-  'contracts/layer_0/common/libraries/LowLevelCall.sol:LowLevelCall',
-  'contracts/layer_0/constants/eip1066.sol:Eip1066',
-  'contracts/layer_0/context/LocalContext.sol:LocalContext',
-  'contracts/layer_0/core/accessControl/AccessControlStorageWrapper.sol:AccessControlStorageWrapper',
-  'contracts/layer_0/core/controlList/ControlListStorageWrapper.sol:ControlListStorageWrapper',
-  'contracts/layer_0/core/externalControlLists/ExternalControlListManagementStorageWrapper.sol:ExternalControlListManagementStorageWrapper',
-  'contracts/layer_0/core/externalKycLists/ExternalKycListManagementStorageWrapper.sol:ExternalKycListManagementStorageWrapper',
-  'contracts/layer_0/core/externalLists/ExternalListManagementStorageWrapper.sol:ExternalListManagementStorageWrapper',
-  'contracts/layer_0/core/externalPauses/ExternalPauseManagementStorageWrapper.sol:ExternalPauseManagementStorageWrapper',
-  'contracts/layer_0/core/kyc/KycStorageWrapper.sol:KycStorageWrapper',
-  'contracts/layer_0/core/pause/PauseStorageWrapper.sol:PauseStorageWrapper',
-  'contracts/layer_0/core/protectedPartitions/ProtectedPartitionsStorageWrapper.sol:ProtectedPartitionsStorageWrapper',
-  'contracts/layer_0/core/ssi/SsiManagementStorageWrapper.sol:SsiManagementStorageWrapper',
-  'contracts/layer_0/corporateActions/CorporateActionsStorageWrapper1.sol:CorporateActionsStorageWrapper1',
-  'contracts/layer_0/corporateActions/CorporateActionsStorageWrapper2.sol:CorporateActionsStorageWrapper2',
-  'contracts/layer_0/hold/HoldStorageWrapper1.sol:HoldStorageWrapper1',
-  'contracts/layer_0/hold/HoldStorageWrapper2.sol:HoldStorageWrapper2',
-  'contracts/layer_0/lock/LockStorageWrapper1.sol:LockStorageWrapper1',
-  'contracts/layer_0/lock/LockStorageWrapper2.sol:LockStorageWrapper2',
-  'contracts/layer_0/scheduledTasks/ScheduledTasksCommon.sol:ScheduledTasksCommon',
-  'contracts/layer_0/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsStorageWrapper.sol:ScheduledBalanceAdjustmentsStorageWrapper',
-  'contracts/layer_0/scheduledTasks/scheduledSnapshots/ScheduledSnapshotsStorageWrapperRead.sol:ScheduledSnapshotsStorageWrapperRead',
-  'contracts/layer_0/scheduledTasks/scheduledTasks/ScheduledTasksStorageWrapper.sol:ScheduledTasksStorageWrapper',
-  'contracts/layer_0/snapshots/SnapshotsStorageWrapper1.sol:SnapshotsStorageWrapper1',
-  'contracts/layer_0/snapshots/SnapshotsStorageWrapper2.sol:SnapshotsStorageWrapper2',
-  'contracts/layer_1/ERC1400/ERC1410/ERC1410Management.sol:ERC1410Management',
-  'contracts/layer_1/ERC1400/ERC1410/ERC1410ManagementFacet.sol:ERC1410ManagementFacet',
-  'contracts/layer_1/ERC1400/ERC1410/ERC1410Read.sol:ERC1410Read',
-  'contracts/layer_1/ERC1400/ERC1410/ERC1410ReadFacet.sol:ERC1410ReadFacet',
-  'contracts/layer_1/ERC1400/ERC1410/ERC1410TokenHolder.sol:ERC1410TokenHolder',
-  'contracts/layer_1/ERC1400/ERC1410/ERC1410TokenHolderFacet.sol:ERC1410TokenHolderFacet',
-  'contracts/layer_1/ERC1400/ERC1594/ERC1594.sol:ERC1594',
-  'contracts/layer_1/ERC1400/ERC1643/ERC1643.sol:ERC1643',
-  'contracts/layer_1/ERC1400/ERC1644/ERC1644.sol:ERC1644',
-  'contracts/layer_1/ERC1400/ERC20/ERC20.sol:ERC20',
-  'contracts/layer_1/ERC3643/ERC3643.sol:ERC3643',
-  'contracts/layer_1/ERC3643/ERC3643Batch.sol:ERC3643Batch',
-  'contracts/layer_1/ERC3643/ERC3643BatchFacet.sol:ERC3643BatchFacet',
-  'contracts/layer_1/ERC3643/ERC3643Facet.sol:ERC3643Facet',
-  'contracts/layer_1/accessControl/AccessControl.sol:AccessControl',
-  'contracts/layer_1/accessControl/AccessControlFacet.sol:AccessControlFacet',
-  'contracts/layer_1/cap/Cap.sol:Cap',
-  'contracts/layer_1/clearing/ClearingActionsFacet.sol:ClearingActionsFacet',
-  'contracts/layer_1/clearing/ClearingHoldCreationFacet.sol:ClearingHoldCreationFacet',
-  'contracts/layer_1/clearing/ClearingReadFacet.sol:ClearingReadFacet',
-  ... 168 more items
-]
+
 {
-  "Ownable": [
+  "ClaimIssuer": [
     {
-      "name": "owner",
-      "selector": "0x8da5cb5b"
+      "name": "addClaim",
+      "selector": "0xb1a34e0d"
     },
     {
-      "name": "renounceOwnership",
-      "selector": "0x715018a6"
+      "name": "addKey",
+      "selector": "0x1d381240"
     },
     {
-      "name": "transferOwnership",
-      "selector": "0xf2fde38b"
-    }
-  ],
-  "IERC1822Proxiable": [
-    {
-      "name": "proxiableUUID",
-      "selector": "0x52d1902d"
-    }
-  ],
-  "IBeacon": [
-    {
-      "name": "implementation",
-      "selector": "0x5c60da1b"
-    }
-  ],
-  "ProxyAdmin": [
-    {
-      "name": "changeProxyAdmin",
-      "selector": "0x7eff275e"
+      "name": "approve",
+      "selector": "0x747442d3"
     },
     {
-      "name": "getProxyAdmin",
-      "selector": "0xf3b7dead"
+      "name": "execute",
+      "selector": "0xb61d27f6"
     },
     {
-      "name": "getProxyImplementation",
-      "selector": "0x204e1c7a"
+      "name": "getClaim",
+      "selector": "0xc9100bcb"
     },
     {
-      "name": "owner",
-      "selector": "0x8da5cb5b"
+      "name": "getClaimIdsByTopic",
+      "selector": "0x80e9e9e1"
     },
     {
-      "name": "renounceOwnership",
-      "selector": "0x715018a6"
+      "name": "getKey",
+      "selector": "0x12aaac70"
     },
     {
-      "name": "transferOwnership",
-      "selector": "0xf2fde38b"
+      "name": "getKeyPurposes",
+      "selector": "0xfb307b34"
     },
     {
-      "name": "upgrade",
-      "selector": "0x99a88ec4"
+      "name": "getKeysByPurpose",
+      "selector": "0x9010f726"
     },
     {
-      "name": "upgradeAndCall",
-      "selector": "0x9623609d"
-    }
-  ],
-  "ITransparentUpgradeableProxy": [
-    {
-      "name": "admin",
-      "selector": "0xf851a440"
+      "name": "getRecoveredAddress",
+      "selector": "0xc3b129e3"
     },
     {
-      "name": "changeAdmin",
-      "selector": "0x8f283970"
+      "name": "initialize",
+      "selector": "0xc4d66de8"
     },
     {
-      "name": "implementation",
-      "selector": "0x5c60da1b"
+      "name": "isClaimRevoked",
+      "selector": "0x2646b264"
     },
     {
-      "name": "upgradeTo",
-      "selector": "0x3659cfe6"
+      "name": "isClaimValid",
+      "selector": "0xc0969a6e"
     },
     {
-      "name": "upgradeToAndCall",
-      "selector": "0x4f1ef286"
-    }
-  ],
-  "IERC165": [
-    {
-      "name": "supportsInterface",
-      "selector": "0x01ffc9a7"
-    }
-  ],
-  "Factory": [
+      "name": "keyHasPurpose",
+      "selector": "0xd202158d"
+    },
     {
-      "name": "deployBond",
-      "selector": "0xddfc5275"
+      "name": "removeClaim",
+      "selector": "0x4eee424a"
     },
     {
-      "name": "deployEquity",
-      "selector": "0xa18a439e"
+      "name": "removeKey",
+      "selector": "0x53d413c5"
     },
     {
-      "name": "getAppliedRegulationData",
-      "selector": "0x7b5208d0"
-    }
-  ],
-  "IFactory": [
+      "name": "revokeClaim",
+      "selector": "0x73c33708"
+    },
     {
-      "name": "deployBond",
-      "selector": "0xddfc5275"
+      "name": "revokeClaimBySignature",
+      "selector": "0x9f7f9edd"
     },
     {
-      "name": "deployEquity",
-      "selector": "0xa18a439e"
+      "name": "revokedClaims",
+      "selector": "0xd2345249"
     },
     {
-      "name": "getAppliedRegulationData",
-      "selector": "0x7b5208d0"
+      "name": "version",
+      "selector": "0x54fd4d50"
     }
   ],
-  "IBusinessLogicResolver": [
-    {
-      "name": "addSelectorsToBlacklist",
-      "selector": "0xe87c5d71"
-    },
+  "Identity": [
     {
-      "name": "cancelBatchConfiguration",
-      "selector": "0xc5977c1f"
+      "name": "addClaim",
+      "selector": "0xb1a34e0d"
     },
     {
-      "name": "checkResolverProxyConfigurationRegistered",
-      "selector": "0xc595992a"
+      "name": "addKey",
+      "selector": "0x1d381240"
     },
     {
-      "name": "createBatchConfiguration",
-      "selector": "0xf4ec1fe4"
+      "name": "approve",
+      "selector": "0x747442d3"
     },
     {
-      "name": "createConfiguration",
-      "selector": "0xf4d2a095"
+      "name": "execute",
+      "selector": "0xb61d27f6"
     },
     {
-      "name": "getBusinessLogicCount",
-      "selector": "0x8373989d"
+      "name": "getClaim",
+      "selector": "0xc9100bcb"
     },
     {
-      "name": "getBusinessLogicKeys",
-      "selector": "0xe7e936ee"
+      "name": "getClaimIdsByTopic",
+      "selector": "0x80e9e9e1"
     },
     {
-      "name": "getConfigurations",
-      "selector": "0xd826514c"
+      "name": "getKey",
+      "selector": "0x12aaac70"
     },
     {
-      "name": "getConfigurationsLength",
-      "selector": "0x55ff30e3"
+      "name": "getKeyPurposes",
+      "selector": "0xfb307b34"
     },
     {
-      "name": "getFacetAddressByConfigurationIdVersionAndFacetId",
-      "selector": "0xcb17c131"
+      "name": "getKeysByPurpose",
+      "selector": "0x9010f726"
     },
     {
-      "name": "getFacetAddressesByConfigurationIdAndVersion",
-      "selector": "0x10933836"
+      "name": "getRecoveredAddress",
+      "selector": "0xc3b129e3"
     },
     {
-      "name": "getFacetByConfigurationIdVersionAndFacetId",
-      "selector": "0x9e6030d1"
+      "name": "initialize",
+      "selector": "0xc4d66de8"
     },
     {
-      "name": "getFacetIdByConfigurationIdVersionAndSelector",
-      "selector": "0x6204479f"
+      "name": "isClaimValid",
+      "selector": "0xc0969a6e"
     },
     {
-      "name": "getFacetIdsByConfigurationIdAndVersion",
-      "selector": "0xe5ccd17c"
+      "name": "keyHasPurpose",
+      "selector": "0xd202158d"
     },
     {
-      "name": "getFacetSelectorsByConfigurationIdVersionAndFacetId",
-      "selector": "0x45613a52"
+      "name": "removeClaim",
+      "selector": "0x4eee424a"
     },
     {
-      "name": "getFacetSelectorsLengthByConfigurationIdVersionAndFacetId",
-      "selector": "0xf1d3d2f9"
+      "name": "removeKey",
+      "selector": "0x53d413c5"
     },
     {
-      "name": "getFacetsByConfigurationIdAndVersion",
-      "selector": "0x6118ce2b"
-    },
+      "name": "version",
+      "selector": "0x54fd4d50"
+    }
+  ],
+  "IIdFactory": [
     {
-      "name": "getFacetsLengthByConfigurationIdAndVersion",
-      "selector": "0x45348bd8"
+      "name": "addTokenFactory",
+      "selector": "0x9ce19365"
     },
     {
-      "name": "getLatestVersion",
-      "selector": "0x0e6d1de9"
+      "name": "createIdentity",
+      "selector": "0x8e952bfe"
     },
     {
-      "name": "getLatestVersionByConfiguration",
-      "selector": "0x5bf316cf"
+      "name": "createIdentityWithManagementKeys",
+      "selector": "0xfe5cd59a"
     },
     {
-      "name": "getSelectorsBlacklist",
-      "selector": "0xbf3af9ea"
+      "name": "createTokenIdentity",
+      "selector": "0x3d56ff66"
     },
     {
-      "name": "getVersionStatus",
-      "selector": "0x65b24dfc"
+      "name": "getIdentity",
+      "selector": "0x2fea7b81"
     },
     {
-      "name": "initialize_BusinessLogicResolver",
-      "selector": "0xb86ffa1a"
+      "name": "getToken",
+      "selector": "0x59770438"
     },
     {
-      "name": "isResolverProxyConfigurationRegistered",
-      "selector": "0x2b85c192"
+      "name": "getWallets",
+      "selector": "0x422c29a4"
     },
     {
-      "name": "registerBusinessLogics",
-      "selector": "0xb0f57ddb"
+      "name": "implementationAuthority",
+      "selector": "0x2307f882"
     },
     {
-      "name": "removeSelectorsFromBlacklist",
-      "selector": "0xcccae751"
+      "name": "isSaltTaken",
+      "selector": "0x3a500451"
     },
     {
-      "name": "resolveBusinessLogicByVersion",
-      "selector": "0x9f77ad81"
+      "name": "isTokenFactory",
+      "selector": "0x3e3bc3d7"
     },
     {
-      "name": "resolveLatestBusinessLogic",
-      "selector": "0xbbced3bb"
+      "name": "linkWallet",
+      "selector": "0xb8bb8126"
     },
     {
-      "name": "resolveResolverProxyCall",
-      "selector": "0xb9ec2620"
+      "name": "removeTokenFactory",
+      "selector": "0x937529ef"
     },
     {
-      "name": "resolveSupportsInterface",
-      "selector": "0x99ecdbd0"
+      "name": "unlinkWallet",
+      "selector": "0x5027dbe2"
     }
   ],
-  "IDiamondCutManager": [
+  "IClaimIssuer": [
     {
-      "name": "cancelBatchConfiguration",
-      "selector": "0xc5977c1f"
+      "name": "addClaim",
+      "selector": "0xb1a34e0d"
     },
     {
-      "name": "checkResolverProxyConfigurationRegistered",
-      "selector": "0xc595992a"
+      "name": "addKey",
+      "selector": "0x1d381240"
     },
     {
-      "name": "createBatchConfiguration",
-      "selector": "0xf4ec1fe4"
+      "name": "approve",
+      "selector": "0x747442d3"
     },
     {
-      "name": "createConfiguration",
-      "selector": "0xf4d2a095"
+      "name": "execute",
+      "selector": "0xb61d27f6"
     },
     {
-      "name": "getConfigurations",
-      "selector": "0xd826514c"
+      "name": "getClaim",
+      "selector": "0xc9100bcb"
     },
     {
-      "name": "getConfigurationsLength",
-      "selector": "0x55ff30e3"
+      "name": "getClaimIdsByTopic",
+      "selector": "0x80e9e9e1"
     },
     {
-      "name": "getFacetAddressByConfigurationIdVersionAndFacetId",
-      "selector": "0xcb17c131"
+      "name": "getKey",
+      "selector": "0x12aaac70"
     },
     {
-      "name": "getFacetAddressesByConfigurationIdAndVersion",
-      "selector": "0x10933836"
+      "name": "getKeyPurposes",
+      "selector": "0xfb307b34"
     },
     {
-      "name": "getFacetByConfigurationIdVersionAndFacetId",
-      "selector": "0x9e6030d1"
+      "name": "getKeysByPurpose",
+      "selector": "0x9010f726"
     },
     {
-      "name": "getFacetIdByConfigurationIdVersionAndSelector",
-      "selector": "0x6204479f"
+      "name": "isClaimRevoked",
+      "selector": "0x2646b264"
     },
     {
-      "name": "getFacetIdsByConfigurationIdAndVersion",
-      "selector": "0xe5ccd17c"
+      "name": "isClaimValid",
+      "selector": "0xc0969a6e"
     },
     {
-      "name": "getFacetSelectorsByConfigurationIdVersionAndFacetId",
-      "selector": "0x45613a52"
+      "name": "keyHasPurpose",
+      "selector": "0xd202158d"
     },
     {
-      "name": "getFacetSelectorsLengthByConfigurationIdVersionAndFacetId",
-      "selector": "0xf1d3d2f9"
+      "name": "removeClaim",
+      "selector": "0x4eee424a"
     },
     {
-      "name": "getFacetsByConfigurationIdAndVersion",
-      "selector": "0x6118ce2b"
+      "name": "removeKey",
+      "selector": "0x53d413c5"
     },
     {
-      "name": "getFacetsLengthByConfigurationIdAndVersion",
-      "selector": "0x45348bd8"
+      "name": "revokeClaim",
+      "selector": "0x73c33708"
     },
     {
-      "name": "getLatestVersionByConfiguration",
-      "selector": "0x5bf316cf"
-    },
+      "name": "revokeClaimBySignature",
+      "selector": "0x9f7f9edd"
+    }
+  ],
+  "IERC734": [
     {
-      "name": "isResolverProxyConfigurationRegistered",
-      "selector": "0x2b85c192"
+      "name": "addKey",
+      "selector": "0x1d381240"
     },
     {
-      "name": "resolveResolverProxyCall",
-      "selector": "0xb9ec2620"
+      "name": "approve",
+      "selector": "0x747442d3"
     },
     {
-      "name": "resolveSupportsInterface",
-      "selector": "0x99ecdbd0"
-    }
-  ],
-  "IDiamond": [
+      "name": "execute",
+      "selector": "0xb61d27f6"
+    },
     {
-      "name": "getConfigInfo",
-      "selector": "0x78a1bf05"
+      "name": "getKey",
+      "selector": "0x12aaac70"
     },
     {
-      "name": "getFacet",
-      "selector": "0xe317d12f"
+      "name": "getKeyPurposes",
+      "selector": "0xfb307b34"
     },
     {
-      "name": "getFacetAddress",
-      "selector": "0x7a070c2d"
+      "name": "getKeysByPurpose",
+      "selector": "0x9010f726"
     },
     {
-      "name": "getFacetAddresses",
-      "selector": "0x3bed2f49"
+      "name": "keyHasPurpose",
+      "selector": "0xd202158d"
     },
     {
-      "name": "getFacetAddressesByPage",
-      "selector": "0x9fea53e7"
+      "name": "removeKey",
+      "selector": "0x53d413c5"
+    }
+  ],
+  "IERC735": [
+    {
+      "name": "addClaim",
+      "selector": "0xb1a34e0d"
     },
     {
-      "name": "getFacetIdBySelector",
-      "selector": "0xb3fd6894"
+      "name": "getClaim",
+      "selector": "0xc9100bcb"
     },
     {
-      "name": "getFacetIds",
-      "selector": "0xcd25d535"
+      "name": "getClaimIdsByTopic",
+      "selector": "0x80e9e9e1"
     },
     {
-      "name": "getFacetIdsByPage",
-      "selector": "0x20202e6d"
+      "name": "removeClaim",
+      "selector": "0x4eee424a"
+    }
+  ],
+  "IIdentity": [
+    {
+      "name": "addClaim",
+      "selector": "0xb1a34e0d"
     },
     {
-      "name": "getFacetSelectors",
-      "selector": "0x8214de3e"
+      "name": "addKey",
+      "selector": "0x1d381240"
     },
     {
-      "name": "getFacetSelectorsByPage",
-      "selector": "0x39a9e956"
+      "name": "approve",
+      "selector": "0x747442d3"
     },
     {
-      "name": "getFacetSelectorsLength",
-      "selector": "0xca1f70ec"
+      "name": "execute",
+      "selector": "0xb61d27f6"
     },
     {
-      "name": "getFacets",
-      "selector": "0x662ea47d"
+      "name": "getClaim",
+      "selector": "0xc9100bcb"
     },
     {
-      "name": "getFacetsByPage",
-      "selector": "0xbf02c5b9"
+      "name": "getClaimIdsByTopic",
+      "selector": "0x80e9e9e1"
     },
     {
-      "name": "getFacetsLength",
-      "selector": "0x430720f9"
+      "name": "getKey",
+      "selector": "0x12aaac70"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getKeyPurposes",
+      "selector": "0xfb307b34"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getKeysByPurpose",
+      "selector": "0x9010f726"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "isClaimValid",
+      "selector": "0xc0969a6e"
     },
     {
-      "name": "updateConfig",
-      "selector": "0x0b3bad61"
+      "name": "keyHasPurpose",
+      "selector": "0xd202158d"
     },
     {
-      "name": "updateConfigVersion",
-      "selector": "0x002eeb22"
+      "name": "removeClaim",
+      "selector": "0x4eee424a"
     },
     {
-      "name": "updateResolver",
-      "selector": "0xe5d3a872"
+      "name": "removeKey",
+      "selector": "0x53d413c5"
     }
   ],
-  "IDiamondCut": [
+  "Version": [
     {
-      "name": "getConfigInfo",
-      "selector": "0x78a1bf05"
+      "name": "version",
+      "selector": "0x54fd4d50"
+    }
+  ],
+  "OwnableUpgradeable": [
+    {
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
-    },
-    {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
-    },
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
+    }
+  ],
+  "Ownable": [
     {
-      "name": "updateConfig",
-      "selector": "0x0b3bad61"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "updateConfigVersion",
-      "selector": "0x002eeb22"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "updateResolver",
-      "selector": "0xe5d3a872"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     }
   ],
-  "IDiamondLoupe": [
+  "IVotes": [
     {
-      "name": "getFacet",
-      "selector": "0xe317d12f"
+      "name": "delegate",
+      "selector": "0x5c19a95c"
     },
     {
-      "name": "getFacetAddress",
-      "selector": "0x7a070c2d"
+      "name": "delegates",
+      "selector": "0x587cde1e"
     },
     {
-      "name": "getFacetAddresses",
-      "selector": "0x3bed2f49"
+      "name": "getPastTotalSupply",
+      "selector": "0x8e539e8c"
     },
     {
-      "name": "getFacetAddressesByPage",
-      "selector": "0x9fea53e7"
+      "name": "getPastVotes",
+      "selector": "0x3a46b1a8"
     },
     {
-      "name": "getFacetIdBySelector",
-      "selector": "0xb3fd6894"
-    },
+      "name": "getVotes",
+      "selector": "0x9ab24eb0"
+    }
+  ],
+  "IERC5805": [
     {
-      "name": "getFacetIds",
-      "selector": "0xcd25d535"
+      "name": "CLOCK_MODE",
+      "selector": "0x4bf5d7e9"
     },
     {
-      "name": "getFacetIdsByPage",
-      "selector": "0x20202e6d"
+      "name": "clock",
+      "selector": "0x91ddadf4"
     },
     {
-      "name": "getFacetSelectors",
-      "selector": "0x8214de3e"
+      "name": "delegate",
+      "selector": "0x5c19a95c"
     },
     {
-      "name": "getFacetSelectorsByPage",
-      "selector": "0x39a9e956"
+      "name": "delegates",
+      "selector": "0x587cde1e"
     },
     {
-      "name": "getFacetSelectorsLength",
-      "selector": "0xca1f70ec"
+      "name": "getPastTotalSupply",
+      "selector": "0x8e539e8c"
     },
     {
-      "name": "getFacets",
-      "selector": "0x662ea47d"
+      "name": "getPastVotes",
+      "selector": "0x3a46b1a8"
     },
     {
-      "name": "getFacetsByPage",
-      "selector": "0xbf02c5b9"
-    },
+      "name": "getVotes",
+      "selector": "0x9ab24eb0"
+    }
+  ],
+  "IERC6372": [
     {
-      "name": "getFacetsLength",
-      "selector": "0x430720f9"
+      "name": "CLOCK_MODE",
+      "selector": "0x4bf5d7e9"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
-    },
+      "name": "clock",
+      "selector": "0x91ddadf4"
+    }
+  ],
+  "IERC1822Proxiable": [
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
-    },
+      "name": "proxiableUUID",
+      "selector": "0x52d1902d"
+    }
+  ],
+  "IBeacon": [
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "implementation",
+      "selector": "0x5c60da1b"
     }
   ],
-  "IERC173": [
+  "ProxyAdmin": [
+    {
+      "name": "changeProxyAdmin",
+      "selector": "0x7eff275e"
+    },
+    {
+      "name": "getProxyAdmin",
+      "selector": "0xf3b7dead"
+    },
+    {
+      "name": "getProxyImplementation",
+      "selector": "0x204e1c7a"
+    },
     {
       "name": "owner",
       "selector": "0x8da5cb5b"
     },
+    {
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
+    },
     {
       "name": "transferOwnership",
       "selector": "0xf2fde38b"
-    }
-  ],
-  "IStaticFunctionSelectors": [
-    {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "upgrade",
+      "selector": "0x99a88ec4"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "upgradeAndCall",
+      "selector": "0x9623609d"
     }
   ],
-  "Eip1066": [
+  "ITransparentUpgradeableProxy": [
     {
-      "name": "ABOVE_RANGE_OR_OVERFLOW",
-      "selector": "0x031dceba"
+      "name": "admin",
+      "selector": "0xf851a440"
     },
     {
-      "name": "ACCEPTED",
-      "selector": "0x4324efd7"
+      "name": "changeAdmin",
+      "selector": "0x8f283970"
     },
     {
-      "name": "ALLOWED_OR_GO",
-      "selector": "0xe86a14ac"
+      "name": "implementation",
+      "selector": "0x5c60da1b"
     },
     {
-      "name": "ALREADY_DONE",
-      "selector": "0xe405de13"
+      "name": "upgradeTo",
+      "selector": "0x3659cfe6"
     },
     {
-      "name": "ALREADY_SIGNED_OR_NOT_ENCRYPTED",
-      "selector": "0x5599d44c"
+      "name": "upgradeToAndCall",
+      "selector": "0x4f1ef286"
+    }
+  ],
+  "IERC20": [
+    {
+      "name": "allowance",
+      "selector": "0xdd62ed3e"
     },
     {
-      "name": "ALREADY_VOTED",
-      "selector": "0xeb209711"
+      "name": "approve",
+      "selector": "0x095ea7b3"
     },
     {
-      "name": "APP_SPECIFIC_ACCEPTANCE",
-      "selector": "0x12de650a"
+      "name": "decimals",
+      "selector": "0x313ce567"
     },
     {
-      "name": "APP_SPECIFIC_AWAITING_OTHERS",
-      "selector": "0xaf8f39f5"
+      "name": "decimalsAdjusted",
+      "selector": "0xc67f05aa"
     },
     {
-      "name": "APP_SPECIFIC_BELOW_CONDITION",
-      "selector": "0xd386cfc9"
+      "name": "decimalsAdjustedAt",
+      "selector": "0x065dd252"
     },
     {
-      "name": "APP_SPECIFIC_EXPIRY_OR_LIMIT",
-      "selector": "0xa0fc86d3"
+      "name": "decimalsAt",
+      "selector": "0x771918ca"
     },
     {
-      "name": "APP_SPECIFIC_FAILURE",
-      "selector": "0x75ef1a5b"
+      "name": "decreaseAllowance",
+      "selector": "0xa457c2d7"
     },
     {
-      "name": "APP_SPECIFIC_INAPPLICABLE_CONDITION",
-      "selector": "0xa08961b5"
+      "name": "getERC20Metadata",
+      "selector": "0x8e649195"
     },
     {
-      "name": "APP_SPECIFIC_META_OR_INFO",
-      "selector": "0xd273a788"
+      "name": "increaseAllowance",
+      "selector": "0x39509351"
     },
     {
-      "name": "APP_SPECIFIC_RECEIVER_ACTION_REQUESTED",
-      "selector": "0x065e268d"
+      "name": "initialize_ERC20",
+      "selector": "0xe04fb235"
     },
     {
-      "name": "APP_SPECIFIC_SUCCESS",
-      "selector": "0x858a720a"
+      "name": "name",
+      "selector": "0x06fdde03"
     },
     {
-      "name": "AVAILABILITY_RULES_OR_INFO",
-      "selector": "0x6dbfeab7"
+      "name": "symbol",
+      "selector": "0x95d89b41"
     },
     {
-      "name": "AVAILABLE",
-      "selector": "0xa2dc2365"
+      "name": "transfer",
+      "selector": "0xa9059cbb"
     },
     {
-      "name": "AWAITING_MATCH",
-      "selector": "0xd6b41a9c"
+      "name": "transferFrom",
+      "selector": "0x23b872dd"
+    }
+  ],
+  "IERC165": [
+    {
+      "name": "supportsInterface",
+      "selector": "0x01ffc9a7"
+    }
+  ],
+  "BasicCompliance": [
+    {
+      "name": "addAgent",
+      "selector": "0x84e79842"
     },
     {
-      "name": "AWAITING_OFF_CHAIN_PROCESS",
-      "selector": "0x4956ce17"
+      "name": "addTokenAgent",
+      "selector": "0xff3e6954"
     },
     {
-      "name": "AWAITING_OTHERS",
-      "selector": "0x82145143"
+      "name": "bindToken",
+      "selector": "0x3ff5aa02"
     },
     {
-      "name": "AWAITING_OTHERS_PERMISSION",
-      "selector": "0xc0bb3259"
+      "name": "canTransfer",
+      "selector": "0xe46638e6"
     },
     {
-      "name": "AWAITING_OTHER_SIGNATURES_OR_KEYS",
-      "selector": "0x47f9fc33"
+      "name": "created",
+      "selector": "0x5f8dead3"
     },
     {
-      "name": "AWAITING_PAYMENT_FROM_OTHERS",
-      "selector": "0xd1496a4c"
+      "name": "destroyed",
+      "selector": "0x8d2ea772"
     },
     {
-      "name": "AWAITING_RATIFICATION",
-      "selector": "0xe3bcf239"
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
     },
     {
-      "name": "AWAITING_YOUR_AVAILABILITY",
-      "selector": "0x06e57ce9"
+      "name": "isTokenAgent",
+      "selector": "0x346531fa"
     },
     {
-      "name": "BELOW_RANGE_OR_UNDERFLOW",
-      "selector": "0x9c5e6f6a"
+      "name": "isTokenBound",
+      "selector": "0x993e8b95"
     },
     {
-      "name": "CRYPTOGRAPHY_ID_OR_PROOF_METADATA",
-      "selector": "0x3d6bf758"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "DECRYPT_FAILURE",
-      "selector": "0xa4772947"
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
     },
     {
-      "name": "DECRYPT_SUCCESS",
-      "selector": "0xbc9497d3"
+      "name": "removeTokenAgent",
+      "selector": "0xcdde2932"
     },
     {
-      "name": "DISALLOWED_OR_STOP",
-      "selector": "0x51e89942"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "DUPLICATE_CONFLICT_OR_COLLISION",
-      "selector": "0x6b43b9c3"
+      "name": "tokenBound",
+      "selector": "0x93e62f07"
     },
     {
-      "name": "DUPLICATE_OFF_CHAIN_REQUEST",
-      "selector": "0x91284655"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     },
     {
-      "name": "DUPLICATE_UNNECESSARY_OR_INAPPLICABLE",
-      "selector": "0x1a947181"
+      "name": "transferred",
+      "selector": "0x8baf29b4"
     },
     {
-      "name": "EXPIRED",
-      "selector": "0x414ac85b"
+      "name": "unbindToken",
+      "selector": "0x40db3b50"
+    }
+  ],
+  "DefaultCompliance": [
+    {
+      "name": "addAgent",
+      "selector": "0x84e79842"
     },
     {
-      "name": "FAILURE",
-      "selector": "0x6c2c70e8"
+      "name": "addTokenAgent",
+      "selector": "0xff3e6954"
     },
     {
-      "name": "FOUND_EQUAL_OR_IN_RANGE",
-      "selector": "0xbdea7465"
+      "name": "bindToken",
+      "selector": "0x3ff5aa02"
     },
     {
-      "name": "FUNDS_NOT_REQUIRED",
-      "selector": "0x45a0c7d5"
+      "name": "canTransfer",
+      "selector": "0xe46638e6"
     },
     {
-      "name": "FUNDS_REQUESTED",
-      "selector": "0x399bb0be"
+      "name": "created",
+      "selector": "0x5f8dead3"
     },
     {
-      "name": "HOLD_OR_ESCROW",
-      "selector": "0xb0e81631"
+      "name": "destroyed",
+      "selector": "0x8d2ea772"
     },
     {
-      "name": "INFORMATIONAL_OR_METADATA",
-      "selector": "0xdff4682a"
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
     },
     {
-      "name": "INSUFFICIENT_FUNDS",
-      "selector": "0xe7931438"
+      "name": "isTokenAgent",
+      "selector": "0x346531fa"
     },
     {
-      "name": "KNOWN_TO_BE_COMPROMISED",
-      "selector": "0xf47c73a4"
+      "name": "isTokenBound",
+      "selector": "0x993e8b95"
     },
     {
-      "name": "LOWER_LIMIT_OR_INSUFFICIENT",
-      "selector": "0xd3212195"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "MATCHING_META_OR_INFO",
-      "selector": "0x66a96210"
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
     },
     {
-      "name": "MATCH_REQUEST_SENT",
-      "selector": "0x9d9264a8"
+      "name": "removeTokenAgent",
+      "selector": "0xcdde2932"
     },
     {
-      "name": "NEEDS_YOUR_PERMISSION_OR_CONTINUATION",
-      "selector": "0x52bb9f84"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "NEGOTIATION_RULES_OR_PARTICIPATION_INFO",
-      "selector": "0xc9d95841"
+      "name": "tokenBound",
+      "selector": "0x93e62f07"
     },
     {
-      "name": "NOT_APPLICABLE_TO_CURRENT_STATE",
-      "selector": "0x79886ac1"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     },
     {
-      "name": "NOT_AVAILABLE_YET",
-      "selector": "0x463eac49"
+      "name": "transferred",
+      "selector": "0x8baf29b4"
     },
     {
-      "name": "NOT_FOUND_UNEQUAL_OR_OUT_OF_RANGE",
-      "selector": "0x23324216"
-    },
+      "name": "unbindToken",
+      "selector": "0x40db3b50"
+    }
+  ],
+  "ICompliance": [
     {
-      "name": "OFFER_OR_VOTE_LIMIT_REACHED",
-      "selector": "0x6ddf9cd1"
+      "name": "canTransfer",
+      "selector": "0xe46638e6"
     },
     {
-      "name": "OFFER_SENT_OR_VOTED",
-      "selector": "0xa4ba4dc4"
+      "name": "created",
+      "selector": "0x5f8dead3"
     },
     {
-      "name": "OFF_CHAIN_ACTION_REQUIRED",
-      "selector": "0x9547ae58"
+      "name": "destroyed",
+      "selector": "0x8d2ea772"
     },
     {
-      "name": "OFF_CHAIN_EXPIRY_OR_LIMIT_REACHED",
-      "selector": "0xaa870741"
-    },
+      "name": "transferred",
+      "selector": "0x8baf29b4"
+    }
+  ],
+  "IModularCompliance": [
     {
-      "name": "OFF_CHAIN_FAILURE",
-      "selector": "0x349a57c8"
+      "name": "addModule",
+      "selector": "0x1ed86f19"
     },
     {
-      "name": "OFF_CHAIN_INFO_OR_META",
-      "selector": "0x0b029a79"
+      "name": "bindToken",
+      "selector": "0x3ff5aa02"
     },
     {
-      "name": "OFF_CHAIN_PROCESS_STARTED",
-      "selector": "0xf9c683b8"
+      "name": "callModuleFunction",
+      "selector": "0xefb22d33"
     },
     {
-      "name": "OFF_CHAIN_SERVICE_UNREACHABLE",
-      "selector": "0xe753fd71"
+      "name": "canTransfer",
+      "selector": "0xe46638e6"
     },
     {
-      "name": "OFF_CHAIN_SUCCESS",
-      "selector": "0x57de840b"
+      "name": "created",
+      "selector": "0x5f8dead3"
     },
     {
-      "name": "PAUSED",
-      "selector": "0xa9aad58c"
+      "name": "destroyed",
+      "selector": "0x8d2ea772"
     },
     {
-      "name": "PERMISSION_DETAILS_OR_CONTROL_CONDITIONS",
-      "selector": "0x78754e2f"
+      "name": "getModules",
+      "selector": "0xb2494df3"
     },
     {
-      "name": "PERMISSION_REQUESTED",
-      "selector": "0x07b0d8a5"
+      "name": "getTokenBound",
+      "selector": "0x6a3edf28"
     },
     {
-      "name": "QUEUED",
-      "selector": "0xe4906529"
+      "name": "isModuleBound",
+      "selector": "0xa446d49f"
     },
     {
-      "name": "QUORUM_NOT_REACHED",
-      "selector": "0xd0bdaca4"
+      "name": "removeModule",
+      "selector": "0xa0632461"
     },
     {
-      "name": "RECEIVER_ACTION_REQUESTED",
-      "selector": "0x8890fab1"
+      "name": "transferred",
+      "selector": "0x8baf29b4"
     },
     {
-      "name": "RECEIVER_RATIFICATION_REQUESTED",
-      "selector": "0x602b9eed"
-    },
+      "name": "unbindToken",
+      "selector": "0x40db3b50"
+    }
+  ],
+  "ModularCompliance": [
     {
-      "name": "REQUEST_FOR_MATCH",
-      "selector": "0x07757222"
+      "name": "addModule",
+      "selector": "0x1ed86f19"
     },
     {
-      "name": "RESERVED_07",
-      "selector": "0x9cb586e0"
+      "name": "bindToken",
+      "selector": "0x3ff5aa02"
     },
     {
-      "name": "RESERVED_09",
-      "selector": "0x5fe1a328"
+      "name": "callModuleFunction",
+      "selector": "0xefb22d33"
     },
     {
-      "name": "RESERVED_0A",
-      "selector": "0xfbb7319c"
+      "name": "canTransfer",
+      "selector": "0xe46638e6"
     },
     {
-      "name": "RESERVED_0B",
-      "selector": "0x5221aef4"
+      "name": "created",
+      "selector": "0x5f8dead3"
     },
     {
-      "name": "RESERVED_0C",
-      "selector": "0x1c400e4a"
+      "name": "destroyed",
+      "selector": "0x8d2ea772"
     },
     {
-      "name": "RESERVED_0D",
-      "selector": "0xb03ac608"
+      "name": "getModules",
+      "selector": "0xb2494df3"
     },
     {
-      "name": "RESERVED_0E",
-      "selector": "0xa31e1e5d"
+      "name": "getTokenBound",
+      "selector": "0x6a3edf28"
     },
     {
-      "name": "RESERVED_17",
-      "selector": "0xf1a82a9f"
+      "name": "init",
+      "selector": "0xe1c7392a"
     },
     {
-      "name": "RESERVED_19",
-      "selector": "0xa311b475"
+      "name": "isModuleBound",
+      "selector": "0xa446d49f"
     },
     {
-      "name": "RESERVED_1A",
-      "selector": "0x6fcaf8db"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "RESERVED_1B",
-      "selector": "0x7b4cf699"
+      "name": "removeModule",
+      "selector": "0xa0632461"
     },
     {
-      "name": "RESERVED_1C",
-      "selector": "0xffcb2532"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "RESERVED_1D",
-      "selector": "0x7f30811e"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     },
     {
-      "name": "RESERVED_1E",
-      "selector": "0xb734a546"
+      "name": "transferred",
+      "selector": "0x8baf29b4"
     },
     {
-      "name": "RESERVED_27",
-      "selector": "0x03677d79"
-    },
+      "name": "unbindToken",
+      "selector": "0x40db3b50"
+    }
+  ],
+  "IModule": [
     {
-      "name": "RESERVED_29",
-      "selector": "0x25806066"
+      "name": "bindCompliance",
+      "selector": "0x4a932544"
     },
     {
-      "name": "RESERVED_2A",
-      "selector": "0x172fdd47"
+      "name": "canComplianceBind",
+      "selector": "0xbcc21053"
     },
     {
-      "name": "RESERVED_2B",
-      "selector": "0x397e99d1"
+      "name": "isComplianceBound",
+      "selector": "0x4cf4d295"
     },
     {
-      "name": "RESERVED_2C",
-      "selector": "0x41b9eac6"
+      "name": "isPlugAndPlay",
+      "selector": "0xe6f5e807"
     },
     {
-      "name": "RESERVED_2D",
-      "selector": "0x12fd5cda"
+      "name": "moduleBurnAction",
+      "selector": "0x372491a2"
     },
     {
-      "name": "RESERVED_2E",
-      "selector": "0xad4f3dab"
+      "name": "moduleCheck",
+      "selector": "0x013b7ce4"
     },
     {
-      "name": "RESERVED_37",
-      "selector": "0xf193bba1"
+      "name": "moduleMintAction",
+      "selector": "0xf104a8c9"
     },
     {
-      "name": "RESERVED_39",
-      "selector": "0x383eb436"
+      "name": "moduleTransferAction",
+      "selector": "0x2cb7e1ec"
     },
     {
-      "name": "RESERVED_3A",
-      "selector": "0xf91d1081"
+      "name": "name",
+      "selector": "0x06fdde03"
     },
     {
-      "name": "RESERVED_3B",
-      "selector": "0x0f20306d"
-    },
+      "name": "unbindCompliance",
+      "selector": "0x0694a5fb"
+    }
+  ],
+  "ITREXFactory": [
     {
-      "name": "RESERVED_3C",
-      "selector": "0x4479d111"
+      "name": "deployTREXSuite",
+      "selector": "0xcf753d37"
     },
     {
-      "name": "RESERVED_3D",
-      "selector": "0xc985bace"
+      "name": "getIdFactory",
+      "selector": "0x5f2773a5"
     },
     {
-      "name": "RESERVED_3E",
-      "selector": "0x8cd514ac"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_47",
-      "selector": "0x3c06e050"
+      "name": "getToken",
+      "selector": "0xc1733f68"
     },
     {
-      "name": "RESERVED_49",
-      "selector": "0x0b870686"
+      "name": "recoverContractOwnership",
+      "selector": "0x50b01838"
     },
     {
-      "name": "RESERVED_4A",
-      "selector": "0xa9c8e1d9"
+      "name": "setIdFactory",
+      "selector": "0xccd41cce"
     },
     {
-      "name": "RESERVED_4B",
-      "selector": "0x7e44cc0d"
-    },
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "TREXFactory": [
     {
-      "name": "RESERVED_4C",
-      "selector": "0x6961caa0"
+      "name": "deployTREXSuite",
+      "selector": "0xcf753d37"
     },
     {
-      "name": "RESERVED_4D",
-      "selector": "0x7a12b8db"
+      "name": "getIdFactory",
+      "selector": "0x5f2773a5"
     },
     {
-      "name": "RESERVED_4E",
-      "selector": "0x56716b55"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_57",
-      "selector": "0x949d3ec4"
+      "name": "getToken",
+      "selector": "0xc1733f68"
     },
     {
-      "name": "RESERVED_59",
-      "selector": "0xe3f4e1e1"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "RESERVED_5A",
-      "selector": "0x04c75aa7"
+      "name": "recoverContractOwnership",
+      "selector": "0x50b01838"
     },
     {
-      "name": "RESERVED_5B",
-      "selector": "0xf49a159d"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "RESERVED_5C",
-      "selector": "0x0bc950b6"
+      "name": "setIdFactory",
+      "selector": "0xccd41cce"
     },
     {
-      "name": "RESERVED_5D",
-      "selector": "0xaba0a2f0"
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
     },
     {
-      "name": "RESERVED_5E",
-      "selector": "0x6f4c730f"
+      "name": "tokenDeployed",
+      "selector": "0xfb88d79c"
     },
     {
-      "name": "RESERVED_A7",
-      "selector": "0x130afd79"
-    },
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
+    }
+  ],
+  "AbstractProxy": [
     {
-      "name": "RESERVED_A9",
-      "selector": "0x91aa6187"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_AA",
-      "selector": "0xecd1faa9"
-    },
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "ClaimTopicsRegistryProxy": [
     {
-      "name": "RESERVED_AB",
-      "selector": "0x108aefc4"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_AC",
-      "selector": "0xf7a71835"
-    },
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "IdentityRegistryProxy": [
     {
-      "name": "RESERVED_AD",
-      "selector": "0x702b1253"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_AE",
-      "selector": "0xc0a68728"
-    },
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "IdentityRegistryStorageProxy": [
     {
-      "name": "RESERVED_E7",
-      "selector": "0xccc6d289"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_E9",
-      "selector": "0xdb8a3832"
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "ModularComplianceProxy": [
+    {
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_EA",
-      "selector": "0x93bd65df"
-    },
-    {
-      "name": "RESERVED_EB",
-      "selector": "0x41ad8e96"
-    },
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "TokenProxy": [
     {
-      "name": "RESERVED_EC",
-      "selector": "0x14601d88"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_ED",
-      "selector": "0x409e5ecb"
-    },
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "TrustedIssuersRegistryProxy": [
     {
-      "name": "RESERVED_EE",
-      "selector": "0x41124f47"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "RESERVED_F7",
-      "selector": "0x0102e1f4"
-    },
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "IIAFactory": [
     {
-      "name": "RESERVED_F9",
-      "selector": "0xa2b57916"
+      "name": "deployIA",
+      "selector": "0x52f1431b"
     },
     {
-      "name": "RESERVED_FA",
-      "selector": "0xc169022a"
-    },
+      "name": "deployedByFactory",
+      "selector": "0xde87aeeb"
+    }
+  ],
+  "ITREXImplementationAuthority": [
     {
-      "name": "RESERVED_FB",
-      "selector": "0x927c6e22"
+      "name": "addAndUseTREXVersion",
+      "selector": "0x71673bd0"
     },
     {
-      "name": "RESERVED_FC",
-      "selector": "0x91100e75"
+      "name": "addTREXVersion",
+      "selector": "0x9585548a"
     },
     {
-      "name": "RESERVED_FD",
-      "selector": "0x8143db0d"
+      "name": "changeImplementationAuthority",
+      "selector": "0x7f82a5e7"
     },
     {
-      "name": "RESERVED_FE",
-      "selector": "0x6d7400ba"
+      "name": "fetchVersion",
+      "selector": "0x0f3ca8ca"
     },
     {
-      "name": "REVOKED_OR_BANNED",
-      "selector": "0x44550799"
+      "name": "getCTRImplementation",
+      "selector": "0x6ff6e83f"
     },
     {
-      "name": "SENDER_AGREES_OR_YEA",
-      "selector": "0x096d081d"
+      "name": "getContracts",
+      "selector": "0xafce4bea"
     },
     {
-      "name": "SENDER_DISAGREES_OR_NAY",
-      "selector": "0xfba08d19"
+      "name": "getCurrentVersion",
+      "selector": "0xfabec44a"
     },
     {
-      "name": "SIGNATURE_REQUIRED",
-      "selector": "0xf25e376a"
+      "name": "getIRImplementation",
+      "selector": "0x1ee9ce8b"
     },
     {
-      "name": "SIGNED",
-      "selector": "0x9bcae07e"
+      "name": "getIRSImplementation",
+      "selector": "0x9e3e7bb9"
     },
     {
-      "name": "SUCCESS",
-      "selector": "0xd0a6d1a6"
+      "name": "getMCImplementation",
+      "selector": "0x61f89825"
     },
     {
-      "name": "TOKEN_OR_FINANCIAL_INFORMATION",
-      "selector": "0x4be75c97"
+      "name": "getReferenceContract",
+      "selector": "0xcd24be22"
     },
     {
-      "name": "TOO_OPEN_OR_INSECURE",
-      "selector": "0x892b6b5c"
+      "name": "getTIRImplementation",
+      "selector": "0xfedcc052"
     },
     {
-      "name": "TRANSFER_FAILED",
-      "selector": "0x3f4ab80e"
+      "name": "getTREXFactory",
+      "selector": "0x2c5d4f8e"
     },
     {
-      "name": "TRANSFER_SUCCESSFUL",
-      "selector": "0x3bdfc509"
+      "name": "getTokenImplementation",
+      "selector": "0x709bc7f3"
     },
     {
-      "name": "TRANSFER_VOLUME_EXCEEDED",
-      "selector": "0x0f17de64"
+      "name": "isReferenceContract",
+      "selector": "0x1320a65a"
     },
     {
-      "name": "UNAVAILABLE",
-      "selector": "0xce68271d"
+      "name": "setIAFactory",
+      "selector": "0xcf49020e"
     },
     {
-      "name": "UNSIGNED_OR_UNTRUSTED",
-      "selector": "0xed3e3705"
+      "name": "setTREXFactory",
+      "selector": "0x6df23789"
     },
     {
-      "name": "UPPER_LIMIT",
-      "selector": "0x6c8ef9eb"
+      "name": "useTREXVersion",
+      "selector": "0xf38d2491"
     }
   ],
-  "ERC1410Management": [
+  "TREXImplementationAuthority": [
     {
-      "name": "controllerRedeemByPartition",
-      "selector": "0xb84777cc"
+      "name": "addAndUseTREXVersion",
+      "selector": "0x71673bd0"
     },
     {
-      "name": "controllerTransferByPartition",
-      "selector": "0xfb78befa"
+      "name": "addTREXVersion",
+      "selector": "0x9585548a"
     },
     {
-      "name": "initialize_ERC1410",
-      "selector": "0x7b1df196"
+      "name": "changeImplementationAuthority",
+      "selector": "0x7f82a5e7"
     },
     {
-      "name": "issueByPartition",
-      "selector": "0x18180262"
+      "name": "fetchVersion",
+      "selector": "0x0f3ca8ca"
     },
     {
-      "name": "operatorRedeemByPartition",
-      "selector": "0x13d557bc"
+      "name": "getCTRImplementation",
+      "selector": "0x6ff6e83f"
     },
     {
-      "name": "operatorTransferByPartition",
-      "selector": "0x6b9894fe"
+      "name": "getContracts",
+      "selector": "0xafce4bea"
     },
     {
-      "name": "protectedRedeemFromByPartition",
-      "selector": "0xc98d9723"
+      "name": "getCurrentVersion",
+      "selector": "0xfabec44a"
     },
     {
-      "name": "protectedTransferFromByPartition",
-      "selector": "0x12e41c0a"
-    }
-  ],
-  "ERC1410ManagementFacet": [
-    {
-      "name": "controllerRedeemByPartition",
-      "selector": "0xb84777cc"
+      "name": "getIRImplementation",
+      "selector": "0x1ee9ce8b"
     },
     {
-      "name": "controllerTransferByPartition",
-      "selector": "0xfb78befa"
+      "name": "getIRSImplementation",
+      "selector": "0x9e3e7bb9"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getMCImplementation",
+      "selector": "0x61f89825"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getReferenceContract",
+      "selector": "0xcd24be22"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getTIRImplementation",
+      "selector": "0xfedcc052"
     },
     {
-      "name": "initialize_ERC1410",
-      "selector": "0x7b1df196"
+      "name": "getTREXFactory",
+      "selector": "0x2c5d4f8e"
     },
     {
-      "name": "issueByPartition",
-      "selector": "0x18180262"
+      "name": "getTokenImplementation",
+      "selector": "0x709bc7f3"
     },
     {
-      "name": "operatorRedeemByPartition",
-      "selector": "0x13d557bc"
+      "name": "isReferenceContract",
+      "selector": "0x1320a65a"
     },
     {
-      "name": "operatorTransferByPartition",
-      "selector": "0x6b9894fe"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "protectedRedeemFromByPartition",
-      "selector": "0xc98d9723"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "protectedTransferFromByPartition",
-      "selector": "0x12e41c0a"
-    }
-  ],
-  "ERC1410Read": [
-    {
-      "name": "balanceOf",
-      "selector": "0x70a08231"
+      "name": "setIAFactory",
+      "selector": "0xcf49020e"
     },
     {
-      "name": "balanceOfAt",
-      "selector": "0x4ee2cd7e"
+      "name": "setTREXFactory",
+      "selector": "0x6df23789"
     },
     {
-      "name": "balanceOfByPartition",
-      "selector": "0x30e82803"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     },
     {
-      "name": "canRedeemByPartition",
-      "selector": "0x7b7322c4"
+      "name": "useTREXVersion",
+      "selector": "0xf38d2491"
+    }
+  ],
+  "IProxy": [
+    {
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "canTransferByPartition",
-      "selector": "0xa7b518b1"
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
+    }
+  ],
+  "ClaimTopicsRegistry": [
+    {
+      "name": "addClaimTopic",
+      "selector": "0xc7b22551"
     },
     {
-      "name": "isMultiPartition",
-      "selector": "0xbd09cc54"
+      "name": "getClaimTopics",
+      "selector": "0xdf09d604"
     },
     {
-      "name": "isOperator",
-      "selector": "0xb6363cf2"
+      "name": "init",
+      "selector": "0xe1c7392a"
     },
     {
-      "name": "isOperatorForPartition",
-      "selector": "0x6d77cad6"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "partitionsOf",
-      "selector": "0x740ab8f4"
+      "name": "removeClaimTopic",
+      "selector": "0x08297846"
     },
     {
-      "name": "totalSupply",
-      "selector": "0x18160ddd"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "totalSupplyByPartition",
-      "selector": "0xa26734dc"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     }
   ],
-  "ERC1410ReadFacet": [
+  "IdentityRegistry": [
     {
-      "name": "balanceOf",
-      "selector": "0x70a08231"
+      "name": "addAgent",
+      "selector": "0x84e79842"
     },
     {
-      "name": "balanceOfAt",
-      "selector": "0x4ee2cd7e"
+      "name": "batchRegisterIdentity",
+      "selector": "0x653dc9f1"
     },
     {
-      "name": "balanceOfByPartition",
-      "selector": "0x30e82803"
+      "name": "contains",
+      "selector": "0x5dbe47e8"
     },
     {
-      "name": "canRedeemByPartition",
-      "selector": "0x7b7322c4"
+      "name": "deleteIdentity",
+      "selector": "0xa8d29d1d"
     },
     {
-      "name": "canTransferByPartition",
-      "selector": "0xa7b518b1"
+      "name": "identity",
+      "selector": "0xf0eb5e54"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "identityStorage",
+      "selector": "0xf11abfd8"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "init",
+      "selector": "0x184b9559"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "investorCountry",
+      "selector": "0x7e42683b"
     },
     {
-      "name": "isMultiPartition",
-      "selector": "0xbd09cc54"
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
     },
     {
-      "name": "isOperator",
-      "selector": "0xb6363cf2"
+      "name": "isVerified",
+      "selector": "0xb9209e33"
     },
     {
-      "name": "isOperatorForPartition",
-      "selector": "0x6d77cad6"
+      "name": "issuersRegistry",
+      "selector": "0xb4f3fcb7"
     },
     {
-      "name": "partitionsOf",
-      "selector": "0x740ab8f4"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "totalSupply",
-      "selector": "0x18160ddd"
+      "name": "registerIdentity",
+      "selector": "0x454a03e0"
     },
     {
-      "name": "totalSupplyByPartition",
-      "selector": "0xa26734dc"
-    }
-  ],
-  "ERC1410TokenHolder": [
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
+    },
     {
-      "name": "authorizeOperator",
-      "selector": "0x959b8c3f"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "authorizeOperatorByPartition",
-      "selector": "0x103ef9e1"
+      "name": "setClaimTopicsRegistry",
+      "selector": "0x670af6a9"
     },
     {
-      "name": "redeemByPartition",
-      "selector": "0x62eb0068"
+      "name": "setIdentityRegistryStorage",
+      "selector": "0x26d941ae"
     },
     {
-      "name": "revokeOperator",
-      "selector": "0xfad8b32a"
+      "name": "setTrustedIssuersRegistry",
+      "selector": "0xe744d789"
     },
     {
-      "name": "revokeOperatorByPartition",
-      "selector": "0x168ecec5"
+      "name": "topicsRegistry",
+      "selector": "0x3b3e12f4"
     },
     {
-      "name": "transferByPartition",
-      "selector": "0x3bc9bcd8"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     },
     {
-      "name": "triggerAndSyncAll",
-      "selector": "0x6afb79db"
+      "name": "updateCountry",
+      "selector": "0x3b239a7f"
+    },
+    {
+      "name": "updateIdentity",
+      "selector": "0x8e098ca1"
     }
   ],
-  "ERC1410TokenHolderFacet": [
+  "IdentityRegistryStorage": [
     {
-      "name": "authorizeOperator",
-      "selector": "0x959b8c3f"
+      "name": "addAgent",
+      "selector": "0x84e79842"
     },
     {
-      "name": "authorizeOperatorByPartition",
-      "selector": "0x103ef9e1"
+      "name": "addIdentityToStorage",
+      "selector": "0xa53410dd"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "bindIdentityRegistry",
+      "selector": "0x690a49f9"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "init",
+      "selector": "0xe1c7392a"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
     },
     {
-      "name": "redeemByPartition",
-      "selector": "0x62eb0068"
+      "name": "linkedIdentityRegistries",
+      "selector": "0xbf9eb959"
     },
     {
-      "name": "revokeOperator",
-      "selector": "0xfad8b32a"
+      "name": "modifyStoredIdentity",
+      "selector": "0xe805cf86"
     },
     {
-      "name": "revokeOperatorByPartition",
-      "selector": "0x168ecec5"
+      "name": "modifyStoredInvestorCountry",
+      "selector": "0x9f3418d5"
     },
     {
-      "name": "transferByPartition",
-      "selector": "0x3bc9bcd8"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "triggerAndSyncAll",
-      "selector": "0x6afb79db"
-    }
-  ],
-  "ERC1594": [
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
+    },
     {
-      "name": "canTransfer",
-      "selector": "0x1badb25c"
+      "name": "removeIdentityFromStorage",
+      "selector": "0xcf191bcd"
     },
     {
-      "name": "canTransferFrom",
-      "selector": "0x122eb575"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "storedIdentity",
+      "selector": "0x7988d3a5"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "storedInvestorCountry",
+      "selector": "0x727e13bc"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     },
     {
-      "name": "initialize_ERC1594",
-      "selector": "0x9be12cea"
+      "name": "unbindIdentityRegistry",
+      "selector": "0x97a012f7"
+    }
+  ],
+  "TrustedIssuersRegistry": [
+    {
+      "name": "addTrustedIssuer",
+      "selector": "0x9f63ea98"
     },
     {
-      "name": "isIssuable",
-      "selector": "0x2f1cae85"
+      "name": "getTrustedIssuerClaimTopics",
+      "selector": "0xc28fb278"
     },
     {
-      "name": "issue",
-      "selector": "0xbb3acde9"
+      "name": "getTrustedIssuers",
+      "selector": "0xd9dd24c5"
     },
     {
-      "name": "redeem",
-      "selector": "0xe77c646d"
+      "name": "getTrustedIssuersForClaimTopic",
+      "selector": "0x52c111d1"
     },
     {
-      "name": "redeemFrom",
-      "selector": "0x9675193c"
+      "name": "hasClaimTopic",
+      "selector": "0x34a89987"
     },
     {
-      "name": "transferFromWithData",
-      "selector": "0xee532f31"
+      "name": "init",
+      "selector": "0xe1c7392a"
     },
     {
-      "name": "transferWithData",
-      "selector": "0x2535f762"
-    }
-  ],
-  "ERC1643": [
+      "name": "isTrustedIssuer",
+      "selector": "0xef2ed1a4"
+    },
     {
-      "name": "getAllDocuments",
-      "selector": "0x9fa5f50b"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "getDocument",
-      "selector": "0xb10d6b41"
+      "name": "removeTrustedIssuer",
+      "selector": "0xb93d28eb"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "updateIssuerClaimTopics",
+      "selector": "0x04bc7e84"
+    }
+  ],
+  "IClaimTopicsRegistry": [
+    {
+      "name": "addClaimTopic",
+      "selector": "0xc7b22551"
     },
     {
-      "name": "removeDocument",
-      "selector": "0xc3501848"
+      "name": "getClaimTopics",
+      "selector": "0xdf09d604"
     },
     {
-      "name": "setDocument",
-      "selector": "0x010648ca"
+      "name": "removeClaimTopic",
+      "selector": "0x08297846"
     }
   ],
-  "ERC1644": [
+  "IIdentityRegistry": [
     {
-      "name": "controllerRedeem",
-      "selector": "0x2bc6acc3"
+      "name": "isVerified",
+      "selector": "0xb9209e33"
+    }
+  ],
+  "IIdentityRegistryStorage": [
+    {
+      "name": "addIdentityToStorage",
+      "selector": "0xa53410dd"
     },
     {
-      "name": "controllerTransfer",
-      "selector": "0xf282527a"
+      "name": "bindIdentityRegistry",
+      "selector": "0x690a49f9"
     },
     {
-      "name": "finalizeControllable",
-      "selector": "0xa213934f"
+      "name": "linkedIdentityRegistries",
+      "selector": "0xbf9eb959"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "modifyStoredIdentity",
+      "selector": "0xe805cf86"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "modifyStoredInvestorCountry",
+      "selector": "0x9f3418d5"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "removeIdentityFromStorage",
+      "selector": "0xcf191bcd"
     },
     {
-      "name": "initialize_ERC1644",
-      "selector": "0xaa4ea38e"
+      "name": "storedIdentity",
+      "selector": "0x7988d3a5"
     },
     {
-      "name": "isControllable",
-      "selector": "0x4c783bf5"
+      "name": "storedInvestorCountry",
+      "selector": "0x727e13bc"
+    },
+    {
+      "name": "unbindIdentityRegistry",
+      "selector": "0x97a012f7"
     }
   ],
-  "ERC20": [
+  "ITrustedIssuersRegistry": [
     {
-      "name": "allowance",
-      "selector": "0xdd62ed3e"
+      "name": "addTrustedIssuer",
+      "selector": "0x9f63ea98"
     },
     {
-      "name": "approve",
-      "selector": "0x095ea7b3"
+      "name": "getTrustedIssuerClaimTopics",
+      "selector": "0xc28fb278"
     },
     {
-      "name": "decimals",
-      "selector": "0x313ce567"
+      "name": "getTrustedIssuers",
+      "selector": "0xd9dd24c5"
     },
     {
-      "name": "decimalsAdjusted",
-      "selector": "0xc67f05aa"
+      "name": "getTrustedIssuersForClaimTopic",
+      "selector": "0x52c111d1"
     },
     {
-      "name": "decimalsAdjustedAt",
-      "selector": "0x065dd252"
+      "name": "hasClaimTopic",
+      "selector": "0x34a89987"
     },
     {
-      "name": "decimalsAt",
-      "selector": "0x771918ca"
+      "name": "isTrustedIssuer",
+      "selector": "0xef2ed1a4"
     },
     {
-      "name": "decreaseAllowance",
-      "selector": "0xa457c2d7"
+      "name": "removeTrustedIssuer",
+      "selector": "0xb93d28eb"
     },
     {
-      "name": "getERC20Metadata",
-      "selector": "0x8e649195"
+      "name": "updateIssuerClaimTopics",
+      "selector": "0x04bc7e84"
+    }
+  ],
+  "AgentRole": [
+    {
+      "name": "addAgent",
+      "selector": "0x84e79842"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
     },
     {
-      "name": "increaseAllowance",
-      "selector": "0x39509351"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "initialize_ERC20",
-      "selector": "0xe04fb235"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
+    }
+  ],
+  "AgentRoleUpgradeable": [
+    {
+      "name": "addAgent",
+      "selector": "0x84e79842"
     },
     {
-      "name": "name",
-      "selector": "0x06fdde03"
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
     },
     {
-      "name": "symbol",
-      "selector": "0x95d89b41"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "transfer",
-      "selector": "0xa9059cbb"
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
     },
     {
-      "name": "transferFrom",
-      "selector": "0x23b872dd"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
+    },
+    {
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     }
   ],
-  "ERC3643": [
+  "IToken": [
     {
-      "name": "addAgent",
-      "selector": "0x84e79842"
+      "name": "allowance",
+      "selector": "0xdd62ed3e"
+    },
+    {
+      "name": "approve",
+      "selector": "0x095ea7b3"
+    },
+    {
+      "name": "balanceOf",
+      "selector": "0x70a08231"
     },
     {
       "name": "batchBurn",
@@ -1653,14 +1645,26 @@ contractNames
       "name": "batchForcedTransfer",
       "selector": "0x42a47abc"
     },
+    {
+      "name": "batchFreezePartialTokens",
+      "selector": "0xfc7e5fa8"
+    },
     {
       "name": "batchMint",
       "selector": "0x68573107"
     },
+    {
+      "name": "batchSetAddressFrozen",
+      "selector": "0x1a7af379"
+    },
     {
       "name": "batchTransfer",
       "selector": "0x88d695b2"
     },
+    {
+      "name": "batchUnfreezePartialTokens",
+      "selector": "0x4710362d"
+    },
     {
       "name": "burn",
       "selector": "0x9dc29fac"
@@ -1669,41 +1673,57 @@ contractNames
       "name": "compliance",
       "selector": "0x6290865d"
     },
+    {
+      "name": "decimals",
+      "selector": "0x313ce567"
+    },
     {
       "name": "forcedTransfer",
       "selector": "0x9fc1d0e7"
     },
     {
-      "name": "identityRegistry",
-      "selector": "0x134e18f4"
+      "name": "freezePartialTokens",
+      "selector": "0x125c4a33"
     },
     {
-      "name": "initialize_ERC3643",
-      "selector": "0x888d9119"
+      "name": "getFrozenTokens",
+      "selector": "0x158b1a57"
     },
     {
-      "name": "isAddressRecovered",
-      "selector": "0x1b997ec2"
+      "name": "identityRegistry",
+      "selector": "0x134e18f4"
     },
     {
-      "name": "isAgent",
-      "selector": "0x1ffbb064"
+      "name": "isFrozen",
+      "selector": "0xe5839836"
     },
     {
       "name": "mint",
       "selector": "0x40c10f19"
     },
+    {
+      "name": "name",
+      "selector": "0x06fdde03"
+    },
     {
       "name": "onchainID",
       "selector": "0xaba63705"
     },
+    {
+      "name": "pause",
+      "selector": "0x8456cb59"
+    },
+    {
+      "name": "paused",
+      "selector": "0x5c975abb"
+    },
     {
       "name": "recoveryAddress",
       "selector": "0x9285948a"
     },
     {
-      "name": "removeAgent",
-      "selector": "0x97a6278e"
+      "name": "setAddressFrozen",
+      "selector": "0xc69c09cf"
     },
     {
       "name": "setCompliance",
@@ -1726,145 +1746,93 @@ contractNames
       "selector": "0xb84c8246"
     },
     {
-      "name": "version",
-      "selector": "0x54fd4d50"
-    }
-  ],
-  "ERC3643Batch": [
+      "name": "symbol",
+      "selector": "0x95d89b41"
+    },
     {
-      "name": "batchBurn",
-      "selector": "0x4a6cc677"
+      "name": "totalSupply",
+      "selector": "0x18160ddd"
     },
     {
-      "name": "batchForcedTransfer",
-      "selector": "0x42a47abc"
+      "name": "transfer",
+      "selector": "0xa9059cbb"
     },
     {
-      "name": "batchMint",
-      "selector": "0x68573107"
+      "name": "transferFrom",
+      "selector": "0x23b872dd"
     },
     {
-      "name": "batchTransfer",
-      "selector": "0x88d695b2"
+      "name": "unfreezePartialTokens",
+      "selector": "0x1fe56f7d"
+    },
+    {
+      "name": "unpause",
+      "selector": "0x3f4ba83a"
+    },
+    {
+      "name": "version",
+      "selector": "0x54fd4d50"
     }
   ],
-  "ERC3643BatchFacet": [
+  "TREXFactoryAts": [
     {
-      "name": "batchBurn",
-      "selector": "0x4a6cc677"
+      "name": "deployTREXSuite",
+      "selector": "0xcf753d37"
     },
     {
-      "name": "batchForcedTransfer",
-      "selector": "0x42a47abc"
+      "name": "deployTREXSuiteAtsBond",
+      "selector": "0x5897d123"
     },
     {
-      "name": "batchMint",
-      "selector": "0x68573107"
+      "name": "deployTREXSuiteAtsEquity",
+      "selector": "0xe6822e2b"
     },
     {
-      "name": "batchTransfer",
-      "selector": "0x88d695b2"
+      "name": "getIdFactory",
+      "selector": "0x5f2773a5"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getImplementationAuthority",
+      "selector": "0x2d5f1187"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getToken",
+      "selector": "0xc1733f68"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
-    }
-  ],
-  "ERC3643Facet": [
+      "name": "owner",
+      "selector": "0x8da5cb5b"
+    },
     {
-      "name": "addAgent",
-      "selector": "0x84e79842"
+      "name": "recoverContractOwnership",
+      "selector": "0x50b01838"
     },
     {
-      "name": "burn",
-      "selector": "0x9dc29fac"
+      "name": "renounceOwnership",
+      "selector": "0x715018a6"
     },
     {
-      "name": "compliance",
-      "selector": "0x6290865d"
+      "name": "setAtsFactory",
+      "selector": "0x85eb8906"
     },
     {
-      "name": "forcedTransfer",
-      "selector": "0x9fc1d0e7"
+      "name": "setIdFactory",
+      "selector": "0xccd41cce"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "setImplementationAuthority",
+      "selector": "0x92dd9d65"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
-    },
-    {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
-    },
-    {
-      "name": "identityRegistry",
-      "selector": "0x134e18f4"
-    },
-    {
-      "name": "initialize_ERC3643",
-      "selector": "0x888d9119"
-    },
-    {
-      "name": "isAddressRecovered",
-      "selector": "0x1b997ec2"
-    },
-    {
-      "name": "isAgent",
-      "selector": "0x1ffbb064"
-    },
-    {
-      "name": "mint",
-      "selector": "0x40c10f19"
-    },
-    {
-      "name": "onchainID",
-      "selector": "0xaba63705"
-    },
-    {
-      "name": "recoveryAddress",
-      "selector": "0x9285948a"
-    },
-    {
-      "name": "removeAgent",
-      "selector": "0x97a6278e"
-    },
-    {
-      "name": "setCompliance",
-      "selector": "0xf8981789"
-    },
-    {
-      "name": "setIdentityRegistry",
-      "selector": "0xcbf3f861"
-    },
-    {
-      "name": "setName",
-      "selector": "0xc47f0027"
-    },
-    {
-      "name": "setOnchainID",
-      "selector": "0x3d1ddc5b"
-    },
-    {
-      "name": "setSymbol",
-      "selector": "0xb84c8246"
+      "name": "tokenDeployed",
+      "selector": "0xfb88d79c"
     },
     {
-      "name": "version",
-      "selector": "0x54fd4d50"
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
     }
   ],
-  "AccessControl": [
+  "TRexIAccessControl": [
     {
       "name": "applyRoles",
       "selector": "0xfcfffeec"
@@ -1902,403 +1870,395 @@ contractNames
       "selector": "0xd547741f"
     }
   ],
-  "AccessControlFacet": [
-    {
-      "name": "applyRoles",
-      "selector": "0xfcfffeec"
-    },
-    {
-      "name": "getRoleCountFor",
-      "selector": "0x8fa9b4fe"
-    },
+  "TRexIBond": [
     {
-      "name": "getRoleMemberCount",
-      "selector": "0xca15c873"
+      "name": "getBondDetails",
+      "selector": "0x4ce02414"
     },
     {
-      "name": "getRoleMembers",
-      "selector": "0x2a861f57"
+      "name": "getCoupon",
+      "selector": "0x936e3169"
     },
     {
-      "name": "getRolesFor",
-      "selector": "0xa28cf9a9"
+      "name": "getCouponCount",
+      "selector": "0x468bb240"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getCouponDetails",
+      "selector": "0x82c5582a"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getCouponFor",
+      "selector": "0xbba7b56d"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getCouponHolders",
+      "selector": "0xa92e8371"
     },
     {
-      "name": "grantRole",
-      "selector": "0x2f2ff15d"
+      "name": "getTotalCouponHolders",
+      "selector": "0xec116ae3"
     },
     {
-      "name": "hasRole",
-      "selector": "0x91d14854"
+      "name": "redeemAtMaturityByPartition",
+      "selector": "0x8a647211"
     },
     {
-      "name": "renounceRole",
-      "selector": "0x8bb9c5bf"
+      "name": "setCoupon",
+      "selector": "0xb3a6617d"
     },
     {
-      "name": "revokeRole",
-      "selector": "0xd547741f"
+      "name": "updateMaturityDate",
+      "selector": "0xc7a6ca35"
     }
   ],
-  "Cap": [
-    {
-      "name": "getMaxSupply",
-      "selector": "0x4c0f38c2"
-    },
+  "TRexIBondRead": [
     {
-      "name": "getMaxSupplyByPartition",
-      "selector": "0x79f3653f"
+      "name": "getBondDetails",
+      "selector": "0x4ce02414"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getCoupon",
+      "selector": "0x936e3169"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getCouponCount",
+      "selector": "0x468bb240"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getCouponDetails",
+      "selector": "0x82c5582a"
     },
     {
-      "name": "initialize_Cap",
-      "selector": "0x56210c4e"
+      "name": "getCouponFor",
+      "selector": "0xbba7b56d"
     },
     {
-      "name": "setMaxSupply",
-      "selector": "0x6f8b44b0"
+      "name": "getCouponHolders",
+      "selector": "0xa92e8371"
     },
     {
-      "name": "setMaxSupplyByPartition",
-      "selector": "0x99b69647"
+      "name": "getTotalCouponHolders",
+      "selector": "0xec116ae3"
     }
   ],
-  "ClearingActionsFacet": [
+  "TRexIBusinessLogicResolver": [
     {
-      "name": "activateClearing",
-      "selector": "0xab2d18a9"
+      "name": "addSelectorsToBlacklist",
+      "selector": "0xe87c5d71"
     },
     {
-      "name": "approveClearingOperationByPartition",
-      "selector": "0xd849cea2"
+      "name": "getBusinessLogicCount",
+      "selector": "0x8373989d"
     },
     {
-      "name": "cancelClearingOperationByPartition",
-      "selector": "0x679141fb"
+      "name": "getBusinessLogicKeys",
+      "selector": "0xe7e936ee"
     },
     {
-      "name": "deactivateClearing",
-      "selector": "0x65c21860"
+      "name": "getLatestVersion",
+      "selector": "0x0e6d1de9"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getSelectorsBlacklist",
+      "selector": "0xbf3af9ea"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getVersionStatus",
+      "selector": "0x65b24dfc"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "initialize_BusinessLogicResolver",
+      "selector": "0xb86ffa1a"
     },
     {
-      "name": "initializeClearing",
-      "selector": "0x86a0b46a"
+      "name": "registerBusinessLogics",
+      "selector": "0xb0f57ddb"
     },
     {
-      "name": "isClearingActivated",
-      "selector": "0x4b4d8990"
+      "name": "removeSelectorsFromBlacklist",
+      "selector": "0xcccae751"
     },
     {
-      "name": "reclaimClearingOperationByPartition",
-      "selector": "0x67e57fe2"
+      "name": "resolveBusinessLogicByVersion",
+      "selector": "0x9f77ad81"
+    },
+    {
+      "name": "resolveLatestBusinessLogic",
+      "selector": "0xbbced3bb"
     }
   ],
-  "ClearingHoldCreationFacet": [
+  "TRexIDiamondCutManager": [
     {
-      "name": "clearingCreateHoldByPartition",
-      "selector": "0x6ceae590"
+      "name": "cancelBatchConfiguration",
+      "selector": "0xc5977c1f"
     },
     {
-      "name": "clearingCreateHoldFromByPartition",
-      "selector": "0x5f1cf8c9"
+      "name": "checkResolverProxyConfigurationRegistered",
+      "selector": "0xc595992a"
     },
     {
-      "name": "getClearingCreateHoldForByPartition",
-      "selector": "0x190eb09b"
+      "name": "createBatchConfiguration",
+      "selector": "0xf4ec1fe4"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "createConfiguration",
+      "selector": "0xf4d2a095"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getConfigurations",
+      "selector": "0xd826514c"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getConfigurationsLength",
+      "selector": "0x55ff30e3"
     },
     {
-      "name": "operatorClearingCreateHoldByPartition",
-      "selector": "0x7ab0c73f"
+      "name": "getFacetAddressByConfigurationIdVersionAndFacetId",
+      "selector": "0xcb17c131"
     },
     {
-      "name": "protectedClearingCreateHoldByPartition",
-      "selector": "0x9b646ab9"
-    }
-  ],
-  "ClearingReadFacet": [
-    {
-      "name": "getClearedAmountFor",
-      "selector": "0x46f8bc94"
+      "name": "getFacetAddressesByConfigurationIdAndVersion",
+      "selector": "0x10933836"
     },
     {
-      "name": "getClearedAmountForByPartition",
-      "selector": "0xfed5a7d4"
+      "name": "getFacetByConfigurationIdVersionAndFacetId",
+      "selector": "0x9e6030d1"
     },
     {
-      "name": "getClearingCountForByPartition",
-      "selector": "0xcab70f17"
+      "name": "getFacetIdByConfigurationIdVersionAndSelector",
+      "selector": "0x6204479f"
     },
     {
-      "name": "getClearingThirdParty",
-      "selector": "0x2714916d"
+      "name": "getFacetIdsByConfigurationIdAndVersion",
+      "selector": "0xe5ccd17c"
     },
     {
-      "name": "getClearingsIdForByPartition",
-      "selector": "0xcf38dab5"
+      "name": "getFacetSelectorsByConfigurationIdVersionAndFacetId",
+      "selector": "0x45613a52"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getFacetSelectorsLengthByConfigurationIdVersionAndFacetId",
+      "selector": "0xf1d3d2f9"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getFacetsByConfigurationIdAndVersion",
+      "selector": "0x6118ce2b"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
-    }
-  ],
-  "ClearingRedeemFacet": [
-    {
-      "name": "clearingRedeemByPartition",
-      "selector": "0x39921b12"
+      "name": "getFacetsLengthByConfigurationIdAndVersion",
+      "selector": "0x45348bd8"
     },
     {
-      "name": "clearingRedeemFromByPartition",
-      "selector": "0x35114a78"
+      "name": "getLatestVersionByConfiguration",
+      "selector": "0x5bf316cf"
     },
     {
-      "name": "getClearingRedeemForByPartition",
-      "selector": "0x4ac3d940"
+      "name": "isResolverProxyConfigurationRegistered",
+      "selector": "0x2b85c192"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "resolveResolverProxyCall",
+      "selector": "0xb9ec2620"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "resolveSupportsInterface",
+      "selector": "0x99ecdbd0"
+    }
+  ],
+  "TRexIDiamondLoupe": [
+    {
+      "name": "getFacet",
+      "selector": "0xe317d12f"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getFacetAddress",
+      "selector": "0x7a070c2d"
     },
     {
-      "name": "operatorClearingRedeemByPartition",
-      "selector": "0xc1d6d5a0"
+      "name": "getFacetAddresses",
+      "selector": "0x3bed2f49"
     },
     {
-      "name": "protectedClearingRedeemByPartition",
-      "selector": "0x498f1f65"
-    }
-  ],
-  "ClearingTransferFacet": [
+      "name": "getFacetAddressesByPage",
+      "selector": "0x9fea53e7"
+    },
     {
-      "name": "clearingTransferByPartition",
-      "selector": "0xde32aaa8"
+      "name": "getFacetIdBySelector",
+      "selector": "0xb3fd6894"
     },
     {
-      "name": "clearingTransferFromByPartition",
-      "selector": "0x5c829d67"
+      "name": "getFacetIds",
+      "selector": "0xcd25d535"
     },
     {
-      "name": "getClearingTransferForByPartition",
-      "selector": "0x6f438552"
+      "name": "getFacetIdsByPage",
+      "selector": "0x20202e6d"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getFacetSelectors",
+      "selector": "0x8214de3e"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getFacetSelectorsByPage",
+      "selector": "0x39a9e956"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getFacetSelectorsLength",
+      "selector": "0xca1f70ec"
     },
     {
-      "name": "operatorClearingTransferByPartition",
-      "selector": "0x2ba8508d"
+      "name": "getFacets",
+      "selector": "0x662ea47d"
     },
     {
-      "name": "protectedClearingTransferByPartition",
-      "selector": "0x1f4eef27"
+      "name": "getFacetsByPage",
+      "selector": "0xbf02c5b9"
+    },
+    {
+      "name": "getFacetsLength",
+      "selector": "0x430720f9"
     }
   ],
-  "ControlList": [
+  "TRexIERC20": [
     {
-      "name": "addToControlList",
-      "selector": "0xe8204966"
+      "name": "allowance",
+      "selector": "0xdd62ed3e"
     },
     {
-      "name": "getControlListCount",
-      "selector": "0x6b5d2ea5"
+      "name": "approve",
+      "selector": "0x095ea7b3"
     },
     {
-      "name": "getControlListMembers",
-      "selector": "0xcad7e56b"
+      "name": "decimals",
+      "selector": "0x313ce567"
     },
     {
-      "name": "getControlListType",
-      "selector": "0x1d46c292"
+      "name": "decimalsAdjusted",
+      "selector": "0xc67f05aa"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "decimalsAdjustedAt",
+      "selector": "0x065dd252"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "decimalsAt",
+      "selector": "0x771918ca"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "decreaseAllowance",
+      "selector": "0xa457c2d7"
     },
     {
-      "name": "initialize_ControlList",
-      "selector": "0xf88bd9f2"
+      "name": "getERC20Metadata",
+      "selector": "0x8e649195"
     },
     {
-      "name": "isInControlList",
-      "selector": "0xfd5b071b"
+      "name": "increaseAllowance",
+      "selector": "0x39509351"
     },
     {
-      "name": "removeFromControlList",
-      "selector": "0x47b52d3b"
-    }
-  ],
-  "CorporateActions": [
+      "name": "initialize_ERC20",
+      "selector": "0xe04fb235"
+    },
     {
-      "name": "addCorporateAction",
-      "selector": "0xd9e4d92c"
+      "name": "name",
+      "selector": "0x06fdde03"
     },
     {
-      "name": "getCorporateAction",
-      "selector": "0x911181da"
+      "name": "symbol",
+      "selector": "0x95d89b41"
     },
     {
-      "name": "getCorporateActionCount",
-      "selector": "0x8859794c"
+      "name": "transfer",
+      "selector": "0xa9059cbb"
     },
     {
-      "name": "getCorporateActionCountByType",
-      "selector": "0x539b4e0b"
+      "name": "transferFrom",
+      "selector": "0x23b872dd"
+    }
+  ],
+  "TRexIEquity": [
+    {
+      "name": "getDividendHolders",
+      "selector": "0xeba3918e"
     },
     {
-      "name": "getCorporateActionIds",
-      "selector": "0x1b56ea1e"
+      "name": "getDividends",
+      "selector": "0x3837ac88"
     },
     {
-      "name": "getCorporateActionIdsByType",
-      "selector": "0xe73bbddb"
+      "name": "getDividendsCount",
+      "selector": "0x9e676952"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getDividendsFor",
+      "selector": "0x323e22da"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getEquityDetails",
+      "selector": "0xefcdcad8"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
-    }
-  ],
-  "ExternalControlListManagement": [
+      "name": "getScheduledBalanceAdjustment",
+      "selector": "0x3d5338e8"
+    },
     {
-      "name": "addExternalControlList",
-      "selector": "0x995e4649"
+      "name": "getScheduledBalanceAdjustmentCount",
+      "selector": "0x7c62c7fc"
     },
     {
-      "name": "getExternalControlListsCount",
-      "selector": "0x9bec4167"
+      "name": "getTotalDividendHolders",
+      "selector": "0xd61a022b"
     },
     {
-      "name": "getExternalControlListsMembers",
-      "selector": "0xc4aa9df3"
+      "name": "getTotalVotingHolders",
+      "selector": "0x92c51818"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getVoting",
+      "selector": "0x3afc7282"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getVotingCount",
+      "selector": "0x9c2aab5e"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getVotingFor",
+      "selector": "0x7633eccf"
     },
     {
-      "name": "initialize_ExternalControlLists",
-      "selector": "0x0a0a114f"
+      "name": "getVotingHolders",
+      "selector": "0x009f64ac"
     },
     {
-      "name": "isExternalControlList",
-      "selector": "0x07c44711"
+      "name": "setDividends",
+      "selector": "0x054d2b88"
     },
     {
-      "name": "removeExternalControlList",
-      "selector": "0xb8913387"
+      "name": "setScheduledBalanceAdjustment",
+      "selector": "0xd1661084"
     },
     {
-      "name": "updateExternalControlLists",
-      "selector": "0x0ba2b922"
+      "name": "setVoting",
+      "selector": "0x5adaa49e"
     }
   ],
-  "ExternalKycListManagement": [
+  "TRexIFactory": [
     {
-      "name": "addExternalKycList",
-      "selector": "0x7570e044"
+      "name": "deployBond",
+      "selector": "0xe711865a"
     },
     {
-      "name": "getExternalKycListsCount",
-      "selector": "0xd17e889e"
+      "name": "deployEquity",
+      "selector": "0x50d71072"
     },
     {
-      "name": "getExternalKycListsMembers",
-      "selector": "0x999a2459"
-    },
+      "name": "getAppliedRegulationData",
+      "selector": "0x7b5208d0"
+    }
+  ],
+  "TRexIStaticFunctionSelectors": [
     {
       "name": "getStaticFunctionSelectors",
       "selector": "0xc1f0d742"
@@ -2310,312 +2270,292 @@ contractNames
     {
       "name": "getStaticResolverKey",
       "selector": "0x1ef2fdc8"
-    },
+    }
+  ],
+  "Factory": [
     {
-      "name": "initialize_ExternalKycLists",
-      "selector": "0x3ac7fadc"
+      "name": "deployBond",
+      "selector": "0xe711865a"
     },
     {
-      "name": "isExternalKycList",
-      "selector": "0x20991e17"
+      "name": "deployEquity",
+      "selector": "0x50d71072"
     },
     {
-      "name": "isExternallyGranted",
-      "selector": "0x1d7d5749"
+      "name": "getAppliedRegulationData",
+      "selector": "0x7b5208d0"
+    }
+  ],
+  "IFactory": [
+    {
+      "name": "deployBond",
+      "selector": "0xe711865a"
     },
     {
-      "name": "removeExternalKycList",
-      "selector": "0x16c94d54"
+      "name": "deployEquity",
+      "selector": "0x50d71072"
     },
     {
-      "name": "updateExternalKycLists",
-      "selector": "0xc391576d"
+      "name": "getAppliedRegulationData",
+      "selector": "0x7b5208d0"
     }
   ],
-  "ExternalPauseManagement": [
+  "IBusinessLogicResolver": [
     {
-      "name": "addExternalPause",
-      "selector": "0xd438cff1"
+      "name": "addSelectorsToBlacklist",
+      "selector": "0xe87c5d71"
     },
     {
-      "name": "getExternalPausesCount",
-      "selector": "0x1e2bc3a6"
+      "name": "cancelBatchConfiguration",
+      "selector": "0xc5977c1f"
     },
     {
-      "name": "getExternalPausesMembers",
-      "selector": "0x5b175a35"
+      "name": "checkResolverProxyConfigurationRegistered",
+      "selector": "0xc595992a"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "createBatchConfiguration",
+      "selector": "0xf4ec1fe4"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "createConfiguration",
+      "selector": "0xf4d2a095"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
-    },
-    {
-      "name": "initialize_ExternalPauses",
-      "selector": "0x8f88d0d5"
-    },
-    {
-      "name": "isExternalPause",
-      "selector": "0xe26e35be"
+      "name": "getBusinessLogicCount",
+      "selector": "0x8373989d"
     },
     {
-      "name": "removeExternalPause",
-      "selector": "0x9648d912"
+      "name": "getBusinessLogicKeys",
+      "selector": "0xe7e936ee"
     },
     {
-      "name": "updateExternalPauses",
-      "selector": "0x361d714a"
-    }
-  ],
-  "Freeze": [
-    {
-      "name": "batchFreezePartialTokens",
-      "selector": "0xfc7e5fa8"
+      "name": "getConfigurations",
+      "selector": "0xd826514c"
     },
     {
-      "name": "batchSetAddressFrozen",
-      "selector": "0x1a7af379"
+      "name": "getConfigurationsLength",
+      "selector": "0x55ff30e3"
     },
     {
-      "name": "batchUnfreezePartialTokens",
-      "selector": "0x4710362d"
+      "name": "getFacetAddressByConfigurationIdVersionAndFacetId",
+      "selector": "0xcb17c131"
     },
     {
-      "name": "freezePartialTokens",
-      "selector": "0x125c4a33"
+      "name": "getFacetAddressesByConfigurationIdAndVersion",
+      "selector": "0x10933836"
     },
     {
-      "name": "getFrozenTokens",
-      "selector": "0x158b1a57"
+      "name": "getFacetByConfigurationIdVersionAndFacetId",
+      "selector": "0x9e6030d1"
     },
     {
-      "name": "setAddressFrozen",
-      "selector": "0xc69c09cf"
+      "name": "getFacetIdByConfigurationIdVersionAndSelector",
+      "selector": "0x6204479f"
     },
     {
-      "name": "unfreezePartialTokens",
-      "selector": "0x1fe56f7d"
-    }
-  ],
-  "FreezeFacet": [
-    {
-      "name": "batchFreezePartialTokens",
-      "selector": "0xfc7e5fa8"
+      "name": "getFacetIdsByConfigurationIdAndVersion",
+      "selector": "0xe5ccd17c"
     },
     {
-      "name": "batchSetAddressFrozen",
-      "selector": "0x1a7af379"
+      "name": "getFacetSelectorsByConfigurationIdVersionAndFacetId",
+      "selector": "0x45613a52"
     },
     {
-      "name": "batchUnfreezePartialTokens",
-      "selector": "0x4710362d"
+      "name": "getFacetSelectorsLengthByConfigurationIdVersionAndFacetId",
+      "selector": "0xf1d3d2f9"
     },
     {
-      "name": "freezePartialTokens",
-      "selector": "0x125c4a33"
+      "name": "getFacetsByConfigurationIdAndVersion",
+      "selector": "0x6118ce2b"
     },
     {
-      "name": "getFrozenTokens",
-      "selector": "0x158b1a57"
+      "name": "getFacetsLengthByConfigurationIdAndVersion",
+      "selector": "0x45348bd8"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getLatestVersion",
+      "selector": "0x0e6d1de9"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getLatestVersionByConfiguration",
+      "selector": "0x5bf316cf"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getSelectorsBlacklist",
+      "selector": "0xbf3af9ea"
     },
     {
-      "name": "setAddressFrozen",
-      "selector": "0xc69c09cf"
+      "name": "getVersionStatus",
+      "selector": "0x65b24dfc"
     },
     {
-      "name": "unfreezePartialTokens",
-      "selector": "0x1fe56f7d"
-    }
-  ],
-  "Hold": [
-    {
-      "name": "controllerCreateHoldByPartition",
-      "selector": "0x5f3d8171"
+      "name": "initialize_BusinessLogicResolver",
+      "selector": "0xb86ffa1a"
     },
     {
-      "name": "createHoldByPartition",
-      "selector": "0x5d23449e"
+      "name": "isResolverProxyConfigurationRegistered",
+      "selector": "0x2b85c192"
     },
     {
-      "name": "createHoldFromByPartition",
-      "selector": "0x2361f007"
+      "name": "registerBusinessLogics",
+      "selector": "0xb0f57ddb"
     },
     {
-      "name": "executeHoldByPartition",
-      "selector": "0x25fe8720"
+      "name": "removeSelectorsFromBlacklist",
+      "selector": "0xcccae751"
     },
     {
-      "name": "operatorCreateHoldByPartition",
-      "selector": "0xc6062c3c"
+      "name": "resolveBusinessLogicByVersion",
+      "selector": "0x9f77ad81"
     },
     {
-      "name": "protectedCreateHoldByPartition",
-      "selector": "0xc17f3554"
+      "name": "resolveLatestBusinessLogic",
+      "selector": "0xbbced3bb"
     },
     {
-      "name": "reclaimHoldByPartition",
-      "selector": "0xb437969e"
+      "name": "resolveResolverProxyCall",
+      "selector": "0xb9ec2620"
     },
     {
-      "name": "releaseHoldByPartition",
-      "selector": "0xf8bafc1c"
+      "name": "resolveSupportsInterface",
+      "selector": "0x99ecdbd0"
     }
   ],
-  "HoldFacet": [
+  "IDiamondCutManager": [
     {
-      "name": "controllerCreateHoldByPartition",
-      "selector": "0x5f3d8171"
+      "name": "cancelBatchConfiguration",
+      "selector": "0xc5977c1f"
     },
     {
-      "name": "createHoldByPartition",
-      "selector": "0x5d23449e"
+      "name": "checkResolverProxyConfigurationRegistered",
+      "selector": "0xc595992a"
     },
     {
-      "name": "createHoldFromByPartition",
-      "selector": "0x2361f007"
+      "name": "createBatchConfiguration",
+      "selector": "0xf4ec1fe4"
     },
     {
-      "name": "executeHoldByPartition",
-      "selector": "0x25fe8720"
+      "name": "createConfiguration",
+      "selector": "0xf4d2a095"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getConfigurations",
+      "selector": "0xd826514c"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getConfigurationsLength",
+      "selector": "0x55ff30e3"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getFacetAddressByConfigurationIdVersionAndFacetId",
+      "selector": "0xcb17c131"
     },
     {
-      "name": "operatorCreateHoldByPartition",
-      "selector": "0xc6062c3c"
+      "name": "getFacetAddressesByConfigurationIdAndVersion",
+      "selector": "0x10933836"
     },
     {
-      "name": "protectedCreateHoldByPartition",
-      "selector": "0xc17f3554"
+      "name": "getFacetByConfigurationIdVersionAndFacetId",
+      "selector": "0x9e6030d1"
     },
     {
-      "name": "reclaimHoldByPartition",
-      "selector": "0xb437969e"
+      "name": "getFacetIdByConfigurationIdVersionAndSelector",
+      "selector": "0x6204479f"
     },
     {
-      "name": "releaseHoldByPartition",
-      "selector": "0xf8bafc1c"
-    }
-  ],
-  "HoldManagement": [
-    {
-      "name": "controllerCreateHoldByPartition",
-      "selector": "0x5f3d8171"
+      "name": "getFacetIdsByConfigurationIdAndVersion",
+      "selector": "0xe5ccd17c"
     },
     {
-      "name": "operatorCreateHoldByPartition",
-      "selector": "0xc6062c3c"
+      "name": "getFacetSelectorsByConfigurationIdVersionAndFacetId",
+      "selector": "0x45613a52"
     },
     {
-      "name": "protectedCreateHoldByPartition",
-      "selector": "0xc17f3554"
-    }
-  ],
-  "HoldManagementFacet": [
+      "name": "getFacetSelectorsLengthByConfigurationIdVersionAndFacetId",
+      "selector": "0xf1d3d2f9"
+    },
     {
-      "name": "controllerCreateHoldByPartition",
-      "selector": "0x5f3d8171"
+      "name": "getFacetsByConfigurationIdAndVersion",
+      "selector": "0x6118ce2b"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getFacetsLengthByConfigurationIdAndVersion",
+      "selector": "0x45348bd8"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getLatestVersionByConfiguration",
+      "selector": "0x5bf316cf"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "isResolverProxyConfigurationRegistered",
+      "selector": "0x2b85c192"
     },
     {
-      "name": "operatorCreateHoldByPartition",
-      "selector": "0xc6062c3c"
+      "name": "resolveResolverProxyCall",
+      "selector": "0xb9ec2620"
     },
     {
-      "name": "protectedCreateHoldByPartition",
-      "selector": "0xc17f3554"
+      "name": "resolveSupportsInterface",
+      "selector": "0x99ecdbd0"
     }
   ],
-  "HoldRead": [
+  "IDiamond": [
     {
-      "name": "getHeldAmountFor",
-      "selector": "0x8493aabb"
+      "name": "getConfigInfo",
+      "selector": "0x78a1bf05"
     },
     {
-      "name": "getHeldAmountForByPartition",
-      "selector": "0x4d60fdc5"
+      "name": "getFacet",
+      "selector": "0xe317d12f"
     },
     {
-      "name": "getHoldCountForByPartition",
-      "selector": "0xcecb3899"
+      "name": "getFacetAddress",
+      "selector": "0x7a070c2d"
     },
     {
-      "name": "getHoldForByPartition",
-      "selector": "0x8d41523d"
+      "name": "getFacetAddresses",
+      "selector": "0x3bed2f49"
     },
     {
-      "name": "getHoldThirdParty",
-      "selector": "0x3c36a695"
+      "name": "getFacetAddressesByPage",
+      "selector": "0x9fea53e7"
     },
     {
-      "name": "getHoldsIdForByPartition",
-      "selector": "0xeb89899d"
-    }
-  ],
-  "HoldReadFacet": [
+      "name": "getFacetIdBySelector",
+      "selector": "0xb3fd6894"
+    },
     {
-      "name": "getHeldAmountFor",
-      "selector": "0x8493aabb"
+      "name": "getFacetIds",
+      "selector": "0xcd25d535"
     },
     {
-      "name": "getHeldAmountForByPartition",
-      "selector": "0x4d60fdc5"
+      "name": "getFacetIdsByPage",
+      "selector": "0x20202e6d"
     },
     {
-      "name": "getHoldCountForByPartition",
-      "selector": "0xcecb3899"
+      "name": "getFacetSelectors",
+      "selector": "0x8214de3e"
     },
     {
-      "name": "getHoldForByPartition",
-      "selector": "0x8d41523d"
+      "name": "getFacetSelectorsByPage",
+      "selector": "0x39a9e956"
     },
     {
-      "name": "getHoldThirdParty",
-      "selector": "0x3c36a695"
+      "name": "getFacetSelectorsLength",
+      "selector": "0xca1f70ec"
     },
     {
-      "name": "getHoldsIdForByPartition",
-      "selector": "0xeb89899d"
+      "name": "getFacets",
+      "selector": "0x662ea47d"
+    },
+    {
+      "name": "getFacetsByPage",
+      "selector": "0xbf02c5b9"
+    },
+    {
+      "name": "getFacetsLength",
+      "selector": "0x430720f9"
     },
     {
       "name": "getStaticFunctionSelectors",
@@ -2628,42 +2568,24 @@ contractNames
     {
       "name": "getStaticResolverKey",
       "selector": "0x1ef2fdc8"
-    }
-  ],
-  "HoldTokenHolder": [
-    {
-      "name": "createHoldByPartition",
-      "selector": "0x5d23449e"
-    },
-    {
-      "name": "createHoldFromByPartition",
-      "selector": "0x2361f007"
     },
     {
-      "name": "executeHoldByPartition",
-      "selector": "0x25fe8720"
+      "name": "updateConfig",
+      "selector": "0x0b3bad61"
     },
     {
-      "name": "reclaimHoldByPartition",
-      "selector": "0xb437969e"
+      "name": "updateConfigVersion",
+      "selector": "0x002eeb22"
     },
     {
-      "name": "releaseHoldByPartition",
-      "selector": "0xf8bafc1c"
+      "name": "updateResolver",
+      "selector": "0xe5d3a872"
     }
   ],
-  "HoldTokenHolderFacet": [
-    {
-      "name": "createHoldByPartition",
-      "selector": "0x5d23449e"
-    },
-    {
-      "name": "createHoldFromByPartition",
-      "selector": "0x2361f007"
-    },
+  "IDiamondCut": [
     {
-      "name": "executeHoldByPartition",
-      "selector": "0x25fe8720"
+      "name": "getConfigInfo",
+      "selector": "0x78a1bf05"
     },
     {
       "name": "getStaticFunctionSelectors",
@@ -2678,498 +2600,2792 @@ contractNames
       "selector": "0x1ef2fdc8"
     },
     {
-      "name": "reclaimHoldByPartition",
-      "selector": "0xb437969e"
+      "name": "updateConfig",
+      "selector": "0x0b3bad61"
     },
     {
-      "name": "releaseHoldByPartition",
-      "selector": "0xf8bafc1c"
+      "name": "updateConfigVersion",
+      "selector": "0x002eeb22"
+    },
+    {
+      "name": "updateResolver",
+      "selector": "0xe5d3a872"
     }
   ],
-  "IERC1410": [
+  "IDiamondLoupe": [
     {
-      "name": "authorizeOperator",
-      "selector": "0x959b8c3f"
+      "name": "getFacet",
+      "selector": "0xe317d12f"
     },
     {
-      "name": "authorizeOperatorByPartition",
-      "selector": "0x103ef9e1"
+      "name": "getFacetAddress",
+      "selector": "0x7a070c2d"
     },
     {
-      "name": "balanceOf",
-      "selector": "0x70a08231"
+      "name": "getFacetAddresses",
+      "selector": "0x3bed2f49"
     },
     {
-      "name": "balanceOfAt",
-      "selector": "0x4ee2cd7e"
+      "name": "getFacetAddressesByPage",
+      "selector": "0x9fea53e7"
     },
     {
-      "name": "balanceOfAtSnapshot",
-      "selector": "0x8e00ae2e"
+      "name": "getFacetIdBySelector",
+      "selector": "0xb3fd6894"
     },
     {
-      "name": "balanceOfAtSnapshotByPartition",
-      "selector": "0xe002bcdf"
+      "name": "getFacetIds",
+      "selector": "0xcd25d535"
     },
     {
-      "name": "balanceOfByPartition",
-      "selector": "0x30e82803"
+      "name": "getFacetIdsByPage",
+      "selector": "0x20202e6d"
     },
     {
-      "name": "canRedeemByPartition",
-      "selector": "0x7b7322c4"
+      "name": "getFacetSelectors",
+      "selector": "0x8214de3e"
     },
     {
-      "name": "canTransferByPartition",
-      "selector": "0xa7b518b1"
+      "name": "getFacetSelectorsByPage",
+      "selector": "0x39a9e956"
     },
     {
-      "name": "controllerRedeemByPartition",
-      "selector": "0xb84777cc"
+      "name": "getFacetSelectorsLength",
+      "selector": "0xca1f70ec"
     },
     {
-      "name": "controllerTransferByPartition",
-      "selector": "0xfb78befa"
+      "name": "getFacets",
+      "selector": "0x662ea47d"
     },
     {
-      "name": "decimalsAtSnapshot",
-      "selector": "0x69ed346f"
+      "name": "getFacetsByPage",
+      "selector": "0xbf02c5b9"
     },
     {
-      "name": "initialize_ERC1410",
-      "selector": "0x7b1df196"
+      "name": "getFacetsLength",
+      "selector": "0x430720f9"
     },
     {
-      "name": "isMultiPartition",
-      "selector": "0xbd09cc54"
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
     },
     {
-      "name": "isOperator",
-      "selector": "0xb6363cf2"
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
     },
     {
-      "name": "isOperatorForPartition",
-      "selector": "0x6d77cad6"
-    },
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    }
+  ],
+  "IERC173": [
     {
-      "name": "isPaused",
-      "selector": "0xb187bd26"
+      "name": "owner",
+      "selector": "0x8da5cb5b"
     },
     {
-      "name": "issueByPartition",
-      "selector": "0x18180262"
-    },
+      "name": "transferOwnership",
+      "selector": "0xf2fde38b"
+    }
+  ],
+  "IStaticFunctionSelectors": [
     {
-      "name": "lockedBalanceOfAtSnapshot",
-      "selector": "0xd9e6f164"
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
     },
     {
-      "name": "lockedBalanceOfAtSnapshotByPartition",
-      "selector": "0x4a13f5d0"
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
     },
     {
-      "name": "operatorRedeemByPartition",
-      "selector": "0x13d557bc"
-    },
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    }
+  ],
+  "Eip1066": [
     {
-      "name": "operatorTransferByPartition",
-      "selector": "0x6b9894fe"
+      "name": "ABOVE_RANGE_OR_OVERFLOW",
+      "selector": "0x031dceba"
     },
     {
-      "name": "partitionsOf",
-      "selector": "0x740ab8f4"
+      "name": "ACCEPTED",
+      "selector": "0x4324efd7"
     },
     {
-      "name": "partitionsOfAtSnapshot",
-      "selector": "0x09e84301"
+      "name": "ALLOWED_OR_GO",
+      "selector": "0xe86a14ac"
     },
     {
-      "name": "pause",
-      "selector": "0x8456cb59"
+      "name": "ALREADY_DONE",
+      "selector": "0xe405de13"
     },
     {
-      "name": "protectedRedeemFromByPartition",
-      "selector": "0xc98d9723"
+      "name": "ALREADY_SIGNED_OR_NOT_ENCRYPTED",
+      "selector": "0x5599d44c"
     },
     {
-      "name": "protectedTransferFromByPartition",
-      "selector": "0x12e41c0a"
+      "name": "ALREADY_VOTED",
+      "selector": "0xeb209711"
     },
     {
-      "name": "redeemByPartition",
-      "selector": "0x62eb0068"
+      "name": "APP_SPECIFIC_ACCEPTANCE",
+      "selector": "0x12de650a"
     },
     {
-      "name": "revokeOperator",
-      "selector": "0xfad8b32a"
+      "name": "APP_SPECIFIC_AWAITING_OTHERS",
+      "selector": "0xaf8f39f5"
     },
     {
-      "name": "revokeOperatorByPartition",
-      "selector": "0x168ecec5"
+      "name": "APP_SPECIFIC_BELOW_CONDITION",
+      "selector": "0xd386cfc9"
     },
     {
-      "name": "takeSnapshot",
-      "selector": "0xb3d3d37e"
+      "name": "APP_SPECIFIC_EXPIRY_OR_LIMIT",
+      "selector": "0xa0fc86d3"
     },
     {
-      "name": "totalSupply",
-      "selector": "0x18160ddd"
+      "name": "APP_SPECIFIC_FAILURE",
+      "selector": "0x75ef1a5b"
     },
     {
-      "name": "totalSupplyAtSnapshot",
-      "selector": "0xda35f8f6"
+      "name": "APP_SPECIFIC_INAPPLICABLE_CONDITION",
+      "selector": "0xa08961b5"
     },
     {
-      "name": "totalSupplyAtSnapshotByPartition",
-      "selector": "0x9657ddb9"
+      "name": "APP_SPECIFIC_META_OR_INFO",
+      "selector": "0xd273a788"
     },
     {
-      "name": "totalSupplyByPartition",
-      "selector": "0xa26734dc"
+      "name": "APP_SPECIFIC_RECEIVER_ACTION_REQUESTED",
+      "selector": "0x065e268d"
     },
     {
-      "name": "transferByPartition",
-      "selector": "0x3bc9bcd8"
+      "name": "APP_SPECIFIC_SUCCESS",
+      "selector": "0x858a720a"
     },
     {
-      "name": "triggerAndSyncAll",
-      "selector": "0x6afb79db"
+      "name": "AVAILABILITY_RULES_OR_INFO",
+      "selector": "0x6dbfeab7"
     },
     {
-      "name": "unpause",
-      "selector": "0x3f4ba83a"
-    }
-  ],
-  "IERC1410Controller": [
-    {
-      "name": "canTransferByPartition",
-      "selector": "0xa7b518b1"
+      "name": "AVAILABLE",
+      "selector": "0xa2dc2365"
     },
     {
-      "name": "controllerRedeemByPartition",
-      "selector": "0xb84777cc"
+      "name": "AWAITING_MATCH",
+      "selector": "0xd6b41a9c"
     },
     {
-      "name": "controllerTransferByPartition",
-      "selector": "0xfb78befa"
-    }
-  ],
-  "IERC1410Management": [
-    {
-      "name": "controllerRedeemByPartition",
-      "selector": "0xb84777cc"
+      "name": "AWAITING_OFF_CHAIN_PROCESS",
+      "selector": "0x4956ce17"
     },
     {
-      "name": "controllerTransferByPartition",
-      "selector": "0xfb78befa"
+      "name": "AWAITING_OTHERS",
+      "selector": "0x82145143"
     },
     {
-      "name": "initialize_ERC1410",
-      "selector": "0x7b1df196"
+      "name": "AWAITING_OTHERS_PERMISSION",
+      "selector": "0xc0bb3259"
+    },
+    {
+      "name": "AWAITING_OTHER_SIGNATURES_OR_KEYS",
+      "selector": "0x47f9fc33"
+    },
+    {
+      "name": "AWAITING_PAYMENT_FROM_OTHERS",
+      "selector": "0xd1496a4c"
+    },
+    {
+      "name": "AWAITING_RATIFICATION",
+      "selector": "0xe3bcf239"
+    },
+    {
+      "name": "AWAITING_YOUR_AVAILABILITY",
+      "selector": "0x06e57ce9"
+    },
+    {
+      "name": "BELOW_RANGE_OR_UNDERFLOW",
+      "selector": "0x9c5e6f6a"
+    },
+    {
+      "name": "CRYPTOGRAPHY_ID_OR_PROOF_METADATA",
+      "selector": "0x3d6bf758"
+    },
+    {
+      "name": "DECRYPT_FAILURE",
+      "selector": "0xa4772947"
+    },
+    {
+      "name": "DECRYPT_SUCCESS",
+      "selector": "0xbc9497d3"
+    },
+    {
+      "name": "DISALLOWED_OR_STOP",
+      "selector": "0x51e89942"
+    },
+    {
+      "name": "DUPLICATE_CONFLICT_OR_COLLISION",
+      "selector": "0x6b43b9c3"
+    },
+    {
+      "name": "DUPLICATE_OFF_CHAIN_REQUEST",
+      "selector": "0x91284655"
+    },
+    {
+      "name": "DUPLICATE_UNNECESSARY_OR_INAPPLICABLE",
+      "selector": "0x1a947181"
+    },
+    {
+      "name": "EXPIRED",
+      "selector": "0x414ac85b"
+    },
+    {
+      "name": "FAILURE",
+      "selector": "0x6c2c70e8"
+    },
+    {
+      "name": "FOUND_EQUAL_OR_IN_RANGE",
+      "selector": "0xbdea7465"
+    },
+    {
+      "name": "FUNDS_NOT_REQUIRED",
+      "selector": "0x45a0c7d5"
+    },
+    {
+      "name": "FUNDS_REQUESTED",
+      "selector": "0x399bb0be"
+    },
+    {
+      "name": "HOLD_OR_ESCROW",
+      "selector": "0xb0e81631"
+    },
+    {
+      "name": "INFORMATIONAL_OR_METADATA",
+      "selector": "0xdff4682a"
+    },
+    {
+      "name": "INSUFFICIENT_FUNDS",
+      "selector": "0xe7931438"
+    },
+    {
+      "name": "KNOWN_TO_BE_COMPROMISED",
+      "selector": "0xf47c73a4"
+    },
+    {
+      "name": "LOWER_LIMIT_OR_INSUFFICIENT",
+      "selector": "0xd3212195"
+    },
+    {
+      "name": "MATCHING_META_OR_INFO",
+      "selector": "0x66a96210"
+    },
+    {
+      "name": "MATCH_REQUEST_SENT",
+      "selector": "0x9d9264a8"
+    },
+    {
+      "name": "NEEDS_YOUR_PERMISSION_OR_CONTINUATION",
+      "selector": "0x52bb9f84"
+    },
+    {
+      "name": "NEGOTIATION_RULES_OR_PARTICIPATION_INFO",
+      "selector": "0xc9d95841"
+    },
+    {
+      "name": "NOT_APPLICABLE_TO_CURRENT_STATE",
+      "selector": "0x79886ac1"
+    },
+    {
+      "name": "NOT_AVAILABLE_YET",
+      "selector": "0x463eac49"
+    },
+    {
+      "name": "NOT_FOUND_UNEQUAL_OR_OUT_OF_RANGE",
+      "selector": "0x23324216"
+    },
+    {
+      "name": "OFFER_OR_VOTE_LIMIT_REACHED",
+      "selector": "0x6ddf9cd1"
+    },
+    {
+      "name": "OFFER_SENT_OR_VOTED",
+      "selector": "0xa4ba4dc4"
+    },
+    {
+      "name": "OFF_CHAIN_ACTION_REQUIRED",
+      "selector": "0x9547ae58"
+    },
+    {
+      "name": "OFF_CHAIN_EXPIRY_OR_LIMIT_REACHED",
+      "selector": "0xaa870741"
+    },
+    {
+      "name": "OFF_CHAIN_FAILURE",
+      "selector": "0x349a57c8"
+    },
+    {
+      "name": "OFF_CHAIN_INFO_OR_META",
+      "selector": "0x0b029a79"
+    },
+    {
+      "name": "OFF_CHAIN_PROCESS_STARTED",
+      "selector": "0xf9c683b8"
+    },
+    {
+      "name": "OFF_CHAIN_SERVICE_UNREACHABLE",
+      "selector": "0xe753fd71"
+    },
+    {
+      "name": "OFF_CHAIN_SUCCESS",
+      "selector": "0x57de840b"
+    },
+    {
+      "name": "PAUSED",
+      "selector": "0xa9aad58c"
+    },
+    {
+      "name": "PERMISSION_DETAILS_OR_CONTROL_CONDITIONS",
+      "selector": "0x78754e2f"
+    },
+    {
+      "name": "PERMISSION_REQUESTED",
+      "selector": "0x07b0d8a5"
+    },
+    {
+      "name": "QUEUED",
+      "selector": "0xe4906529"
+    },
+    {
+      "name": "QUORUM_NOT_REACHED",
+      "selector": "0xd0bdaca4"
+    },
+    {
+      "name": "RECEIVER_ACTION_REQUESTED",
+      "selector": "0x8890fab1"
+    },
+    {
+      "name": "RECEIVER_RATIFICATION_REQUESTED",
+      "selector": "0x602b9eed"
+    },
+    {
+      "name": "REQUEST_FOR_MATCH",
+      "selector": "0x07757222"
+    },
+    {
+      "name": "RESERVED_07",
+      "selector": "0x9cb586e0"
+    },
+    {
+      "name": "RESERVED_09",
+      "selector": "0x5fe1a328"
+    },
+    {
+      "name": "RESERVED_0A",
+      "selector": "0xfbb7319c"
+    },
+    {
+      "name": "RESERVED_0B",
+      "selector": "0x5221aef4"
+    },
+    {
+      "name": "RESERVED_0C",
+      "selector": "0x1c400e4a"
+    },
+    {
+      "name": "RESERVED_0D",
+      "selector": "0xb03ac608"
+    },
+    {
+      "name": "RESERVED_0E",
+      "selector": "0xa31e1e5d"
+    },
+    {
+      "name": "RESERVED_17",
+      "selector": "0xf1a82a9f"
+    },
+    {
+      "name": "RESERVED_19",
+      "selector": "0xa311b475"
+    },
+    {
+      "name": "RESERVED_1A",
+      "selector": "0x6fcaf8db"
+    },
+    {
+      "name": "RESERVED_1B",
+      "selector": "0x7b4cf699"
+    },
+    {
+      "name": "RESERVED_1C",
+      "selector": "0xffcb2532"
+    },
+    {
+      "name": "RESERVED_1D",
+      "selector": "0x7f30811e"
+    },
+    {
+      "name": "RESERVED_1E",
+      "selector": "0xb734a546"
+    },
+    {
+      "name": "RESERVED_27",
+      "selector": "0x03677d79"
+    },
+    {
+      "name": "RESERVED_29",
+      "selector": "0x25806066"
+    },
+    {
+      "name": "RESERVED_2A",
+      "selector": "0x172fdd47"
+    },
+    {
+      "name": "RESERVED_2B",
+      "selector": "0x397e99d1"
+    },
+    {
+      "name": "RESERVED_2C",
+      "selector": "0x41b9eac6"
+    },
+    {
+      "name": "RESERVED_2D",
+      "selector": "0x12fd5cda"
+    },
+    {
+      "name": "RESERVED_2E",
+      "selector": "0xad4f3dab"
+    },
+    {
+      "name": "RESERVED_37",
+      "selector": "0xf193bba1"
+    },
+    {
+      "name": "RESERVED_39",
+      "selector": "0x383eb436"
+    },
+    {
+      "name": "RESERVED_3A",
+      "selector": "0xf91d1081"
+    },
+    {
+      "name": "RESERVED_3B",
+      "selector": "0x0f20306d"
+    },
+    {
+      "name": "RESERVED_3C",
+      "selector": "0x4479d111"
+    },
+    {
+      "name": "RESERVED_3D",
+      "selector": "0xc985bace"
+    },
+    {
+      "name": "RESERVED_3E",
+      "selector": "0x8cd514ac"
+    },
+    {
+      "name": "RESERVED_47",
+      "selector": "0x3c06e050"
+    },
+    {
+      "name": "RESERVED_49",
+      "selector": "0x0b870686"
+    },
+    {
+      "name": "RESERVED_4A",
+      "selector": "0xa9c8e1d9"
+    },
+    {
+      "name": "RESERVED_4B",
+      "selector": "0x7e44cc0d"
+    },
+    {
+      "name": "RESERVED_4C",
+      "selector": "0x6961caa0"
+    },
+    {
+      "name": "RESERVED_4D",
+      "selector": "0x7a12b8db"
+    },
+    {
+      "name": "RESERVED_4E",
+      "selector": "0x56716b55"
+    },
+    {
+      "name": "RESERVED_57",
+      "selector": "0x949d3ec4"
+    },
+    {
+      "name": "RESERVED_59",
+      "selector": "0xe3f4e1e1"
+    },
+    {
+      "name": "RESERVED_5A",
+      "selector": "0x04c75aa7"
+    },
+    {
+      "name": "RESERVED_5B",
+      "selector": "0xf49a159d"
+    },
+    {
+      "name": "RESERVED_5C",
+      "selector": "0x0bc950b6"
+    },
+    {
+      "name": "RESERVED_5D",
+      "selector": "0xaba0a2f0"
+    },
+    {
+      "name": "RESERVED_5E",
+      "selector": "0x6f4c730f"
+    },
+    {
+      "name": "RESERVED_A7",
+      "selector": "0x130afd79"
+    },
+    {
+      "name": "RESERVED_A9",
+      "selector": "0x91aa6187"
+    },
+    {
+      "name": "RESERVED_AA",
+      "selector": "0xecd1faa9"
+    },
+    {
+      "name": "RESERVED_AB",
+      "selector": "0x108aefc4"
+    },
+    {
+      "name": "RESERVED_AC",
+      "selector": "0xf7a71835"
+    },
+    {
+      "name": "RESERVED_AD",
+      "selector": "0x702b1253"
+    },
+    {
+      "name": "RESERVED_AE",
+      "selector": "0xc0a68728"
+    },
+    {
+      "name": "RESERVED_E7",
+      "selector": "0xccc6d289"
+    },
+    {
+      "name": "RESERVED_E9",
+      "selector": "0xdb8a3832"
+    },
+    {
+      "name": "RESERVED_EA",
+      "selector": "0x93bd65df"
+    },
+    {
+      "name": "RESERVED_EB",
+      "selector": "0x41ad8e96"
+    },
+    {
+      "name": "RESERVED_EC",
+      "selector": "0x14601d88"
+    },
+    {
+      "name": "RESERVED_ED",
+      "selector": "0x409e5ecb"
+    },
+    {
+      "name": "RESERVED_EE",
+      "selector": "0x41124f47"
+    },
+    {
+      "name": "RESERVED_F7",
+      "selector": "0x0102e1f4"
+    },
+    {
+      "name": "RESERVED_F9",
+      "selector": "0xa2b57916"
+    },
+    {
+      "name": "RESERVED_FA",
+      "selector": "0xc169022a"
+    },
+    {
+      "name": "RESERVED_FB",
+      "selector": "0x927c6e22"
+    },
+    {
+      "name": "RESERVED_FC",
+      "selector": "0x91100e75"
+    },
+    {
+      "name": "RESERVED_FD",
+      "selector": "0x8143db0d"
+    },
+    {
+      "name": "RESERVED_FE",
+      "selector": "0x6d7400ba"
+    },
+    {
+      "name": "REVOKED_OR_BANNED",
+      "selector": "0x44550799"
+    },
+    {
+      "name": "SENDER_AGREES_OR_YEA",
+      "selector": "0x096d081d"
+    },
+    {
+      "name": "SENDER_DISAGREES_OR_NAY",
+      "selector": "0xfba08d19"
+    },
+    {
+      "name": "SIGNATURE_REQUIRED",
+      "selector": "0xf25e376a"
+    },
+    {
+      "name": "SIGNED",
+      "selector": "0x9bcae07e"
+    },
+    {
+      "name": "SUCCESS",
+      "selector": "0xd0a6d1a6"
+    },
+    {
+      "name": "TOKEN_OR_FINANCIAL_INFORMATION",
+      "selector": "0x4be75c97"
+    },
+    {
+      "name": "TOO_OPEN_OR_INSECURE",
+      "selector": "0x892b6b5c"
+    },
+    {
+      "name": "TRANSFER_FAILED",
+      "selector": "0x3f4ab80e"
+    },
+    {
+      "name": "TRANSFER_SUCCESSFUL",
+      "selector": "0x3bdfc509"
+    },
+    {
+      "name": "TRANSFER_VOLUME_EXCEEDED",
+      "selector": "0x0f17de64"
+    },
+    {
+      "name": "UNAVAILABLE",
+      "selector": "0xce68271d"
+    },
+    {
+      "name": "UNSIGNED_OR_UNTRUSTED",
+      "selector": "0xed3e3705"
+    },
+    {
+      "name": "UPPER_LIMIT",
+      "selector": "0x6c8ef9eb"
+    }
+  ],
+  "ERC1410Management": [
+    {
+      "name": "controllerRedeemByPartition",
+      "selector": "0xb84777cc"
+    },
+    {
+      "name": "controllerTransferByPartition",
+      "selector": "0xfb78befa"
+    },
+    {
+      "name": "initialize_ERC1410",
+      "selector": "0x7b1df196"
+    },
+    {
+      "name": "issueByPartition",
+      "selector": "0x18180262"
+    },
+    {
+      "name": "operatorRedeemByPartition",
+      "selector": "0x13d557bc"
+    },
+    {
+      "name": "operatorTransferByPartition",
+      "selector": "0x6b9894fe"
+    },
+    {
+      "name": "protectedRedeemFromByPartition",
+      "selector": "0xc98d9723"
+    },
+    {
+      "name": "protectedTransferFromByPartition",
+      "selector": "0x12e41c0a"
+    }
+  ],
+  "ERC1410ManagementFacet": [
+    {
+      "name": "controllerRedeemByPartition",
+      "selector": "0xb84777cc"
+    },
+    {
+      "name": "controllerTransferByPartition",
+      "selector": "0xfb78befa"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ERC1410",
+      "selector": "0x7b1df196"
     },
     {
       "name": "issueByPartition",
       "selector": "0x18180262"
     },
     {
-      "name": "operatorRedeemByPartition",
-      "selector": "0x13d557bc"
+      "name": "operatorRedeemByPartition",
+      "selector": "0x13d557bc"
+    },
+    {
+      "name": "operatorTransferByPartition",
+      "selector": "0x6b9894fe"
+    },
+    {
+      "name": "protectedRedeemFromByPartition",
+      "selector": "0xc98d9723"
+    },
+    {
+      "name": "protectedTransferFromByPartition",
+      "selector": "0x12e41c0a"
+    }
+  ],
+  "ERC1410Read": [
+    {
+      "name": "balanceOf",
+      "selector": "0x70a08231"
+    },
+    {
+      "name": "balanceOfAt",
+      "selector": "0x4ee2cd7e"
+    },
+    {
+      "name": "balanceOfByPartition",
+      "selector": "0x30e82803"
+    },
+    {
+      "name": "canRedeemByPartition",
+      "selector": "0x7b7322c4"
+    },
+    {
+      "name": "canTransferByPartition",
+      "selector": "0xa7b518b1"
+    },
+    {
+      "name": "isMultiPartition",
+      "selector": "0xbd09cc54"
+    },
+    {
+      "name": "isOperator",
+      "selector": "0xb6363cf2"
+    },
+    {
+      "name": "isOperatorForPartition",
+      "selector": "0x6d77cad6"
+    },
+    {
+      "name": "partitionsOf",
+      "selector": "0x740ab8f4"
+    },
+    {
+      "name": "totalSupply",
+      "selector": "0x18160ddd"
+    },
+    {
+      "name": "totalSupplyByPartition",
+      "selector": "0xa26734dc"
+    }
+  ],
+  "ERC1410ReadFacet": [
+    {
+      "name": "balanceOf",
+      "selector": "0x70a08231"
+    },
+    {
+      "name": "balanceOfAt",
+      "selector": "0x4ee2cd7e"
+    },
+    {
+      "name": "balanceOfByPartition",
+      "selector": "0x30e82803"
+    },
+    {
+      "name": "canRedeemByPartition",
+      "selector": "0x7b7322c4"
+    },
+    {
+      "name": "canTransferByPartition",
+      "selector": "0xa7b518b1"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "isMultiPartition",
+      "selector": "0xbd09cc54"
+    },
+    {
+      "name": "isOperator",
+      "selector": "0xb6363cf2"
+    },
+    {
+      "name": "isOperatorForPartition",
+      "selector": "0x6d77cad6"
+    },
+    {
+      "name": "partitionsOf",
+      "selector": "0x740ab8f4"
+    },
+    {
+      "name": "totalSupply",
+      "selector": "0x18160ddd"
+    },
+    {
+      "name": "totalSupplyByPartition",
+      "selector": "0xa26734dc"
+    }
+  ],
+  "ERC1410TokenHolder": [
+    {
+      "name": "authorizeOperator",
+      "selector": "0x959b8c3f"
+    },
+    {
+      "name": "authorizeOperatorByPartition",
+      "selector": "0x103ef9e1"
+    },
+    {
+      "name": "redeemByPartition",
+      "selector": "0x62eb0068"
+    },
+    {
+      "name": "revokeOperator",
+      "selector": "0xfad8b32a"
+    },
+    {
+      "name": "revokeOperatorByPartition",
+      "selector": "0x168ecec5"
+    },
+    {
+      "name": "transferByPartition",
+      "selector": "0x3bc9bcd8"
+    },
+    {
+      "name": "triggerAndSyncAll",
+      "selector": "0x6afb79db"
+    }
+  ],
+  "ERC1410TokenHolderFacet": [
+    {
+      "name": "authorizeOperator",
+      "selector": "0x959b8c3f"
+    },
+    {
+      "name": "authorizeOperatorByPartition",
+      "selector": "0x103ef9e1"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "redeemByPartition",
+      "selector": "0x62eb0068"
+    },
+    {
+      "name": "revokeOperator",
+      "selector": "0xfad8b32a"
+    },
+    {
+      "name": "revokeOperatorByPartition",
+      "selector": "0x168ecec5"
+    },
+    {
+      "name": "transferByPartition",
+      "selector": "0x3bc9bcd8"
+    },
+    {
+      "name": "triggerAndSyncAll",
+      "selector": "0x6afb79db"
+    }
+  ],
+  "ERC1594": [
+    {
+      "name": "canTransfer",
+      "selector": "0x1badb25c"
+    },
+    {
+      "name": "canTransferFrom",
+      "selector": "0x122eb575"
+    },
+    {
+      "name": "initialize_ERC1594",
+      "selector": "0x9be12cea"
+    },
+    {
+      "name": "isIssuable",
+      "selector": "0x2f1cae85"
+    },
+    {
+      "name": "issue",
+      "selector": "0xbb3acde9"
+    },
+    {
+      "name": "redeem",
+      "selector": "0xe77c646d"
+    },
+    {
+      "name": "redeemFrom",
+      "selector": "0x9675193c"
+    },
+    {
+      "name": "transferFromWithData",
+      "selector": "0xee532f31"
+    },
+    {
+      "name": "transferWithData",
+      "selector": "0x2535f762"
+    }
+  ],
+  "ERC1594Facet": [
+    {
+      "name": "canTransfer",
+      "selector": "0x1badb25c"
+    },
+    {
+      "name": "canTransferFrom",
+      "selector": "0x122eb575"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ERC1594",
+      "selector": "0x9be12cea"
+    },
+    {
+      "name": "isIssuable",
+      "selector": "0x2f1cae85"
+    },
+    {
+      "name": "issue",
+      "selector": "0xbb3acde9"
+    },
+    {
+      "name": "redeem",
+      "selector": "0xe77c646d"
+    },
+    {
+      "name": "redeemFrom",
+      "selector": "0x9675193c"
+    },
+    {
+      "name": "transferFromWithData",
+      "selector": "0xee532f31"
+    },
+    {
+      "name": "transferWithData",
+      "selector": "0x2535f762"
+    }
+  ],
+  "ERC1643": [
+    {
+      "name": "getAllDocuments",
+      "selector": "0x9fa5f50b"
+    },
+    {
+      "name": "getDocument",
+      "selector": "0xb10d6b41"
+    },
+    {
+      "name": "removeDocument",
+      "selector": "0xc3501848"
+    },
+    {
+      "name": "setDocument",
+      "selector": "0x010648ca"
+    }
+  ],
+  "ERC1643Facet": [
+    {
+      "name": "getAllDocuments",
+      "selector": "0x9fa5f50b"
+    },
+    {
+      "name": "getDocument",
+      "selector": "0xb10d6b41"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "removeDocument",
+      "selector": "0xc3501848"
+    },
+    {
+      "name": "setDocument",
+      "selector": "0x010648ca"
+    }
+  ],
+  "ERC1644": [
+    {
+      "name": "controllerRedeem",
+      "selector": "0x2bc6acc3"
+    },
+    {
+      "name": "controllerTransfer",
+      "selector": "0xf282527a"
+    },
+    {
+      "name": "finalizeControllable",
+      "selector": "0xa213934f"
+    },
+    {
+      "name": "initialize_ERC1644",
+      "selector": "0xaa4ea38e"
+    },
+    {
+      "name": "isControllable",
+      "selector": "0x4c783bf5"
+    }
+  ],
+  "ERC1644Facet": [
+    {
+      "name": "controllerRedeem",
+      "selector": "0x2bc6acc3"
+    },
+    {
+      "name": "controllerTransfer",
+      "selector": "0xf282527a"
+    },
+    {
+      "name": "finalizeControllable",
+      "selector": "0xa213934f"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ERC1644",
+      "selector": "0xaa4ea38e"
+    },
+    {
+      "name": "isControllable",
+      "selector": "0x4c783bf5"
+    }
+  ],
+  "ERC20": [
+    {
+      "name": "allowance",
+      "selector": "0xdd62ed3e"
+    },
+    {
+      "name": "approve",
+      "selector": "0x095ea7b3"
+    },
+    {
+      "name": "decimals",
+      "selector": "0x313ce567"
+    },
+    {
+      "name": "decimalsAdjusted",
+      "selector": "0xc67f05aa"
+    },
+    {
+      "name": "decimalsAdjustedAt",
+      "selector": "0x065dd252"
+    },
+    {
+      "name": "decimalsAt",
+      "selector": "0x771918ca"
+    },
+    {
+      "name": "decreaseAllowance",
+      "selector": "0xa457c2d7"
+    },
+    {
+      "name": "getERC20Metadata",
+      "selector": "0x8e649195"
+    },
+    {
+      "name": "increaseAllowance",
+      "selector": "0x39509351"
+    },
+    {
+      "name": "initialize_ERC20",
+      "selector": "0xe04fb235"
+    },
+    {
+      "name": "name",
+      "selector": "0x06fdde03"
+    },
+    {
+      "name": "symbol",
+      "selector": "0x95d89b41"
+    },
+    {
+      "name": "transfer",
+      "selector": "0xa9059cbb"
+    },
+    {
+      "name": "transferFrom",
+      "selector": "0x23b872dd"
+    }
+  ],
+  "ERC20Facet": [
+    {
+      "name": "allowance",
+      "selector": "0xdd62ed3e"
+    },
+    {
+      "name": "approve",
+      "selector": "0x095ea7b3"
+    },
+    {
+      "name": "decimals",
+      "selector": "0x313ce567"
+    },
+    {
+      "name": "decimalsAdjusted",
+      "selector": "0xc67f05aa"
+    },
+    {
+      "name": "decimalsAdjustedAt",
+      "selector": "0x065dd252"
+    },
+    {
+      "name": "decimalsAt",
+      "selector": "0x771918ca"
+    },
+    {
+      "name": "decreaseAllowance",
+      "selector": "0xa457c2d7"
+    },
+    {
+      "name": "getERC20Metadata",
+      "selector": "0x8e649195"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "increaseAllowance",
+      "selector": "0x39509351"
+    },
+    {
+      "name": "initialize_ERC20",
+      "selector": "0xe04fb235"
+    },
+    {
+      "name": "name",
+      "selector": "0x06fdde03"
+    },
+    {
+      "name": "symbol",
+      "selector": "0x95d89b41"
+    },
+    {
+      "name": "transfer",
+      "selector": "0xa9059cbb"
+    },
+    {
+      "name": "transferFrom",
+      "selector": "0x23b872dd"
+    }
+  ],
+  "ERC20Permit": [
+    {
+      "name": "DOMAIN_SEPARATOR",
+      "selector": "0x3644e515"
+    },
+    {
+      "name": "initialize_ERC20Permit",
+      "selector": "0x70d162dc"
+    },
+    {
+      "name": "nonces",
+      "selector": "0x7ecebe00"
+    },
+    {
+      "name": "permit",
+      "selector": "0xd505accf"
+    }
+  ],
+  "ERC20PermitFacet": [
+    {
+      "name": "DOMAIN_SEPARATOR",
+      "selector": "0x3644e515"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ERC20Permit",
+      "selector": "0x70d162dc"
+    },
+    {
+      "name": "nonces",
+      "selector": "0x7ecebe00"
+    },
+    {
+      "name": "permit",
+      "selector": "0xd505accf"
+    }
+  ],
+  "ERC20Votes": [
+    {
+      "name": "CLOCK_MODE",
+      "selector": "0x4bf5d7e9"
+    },
+    {
+      "name": "checkpoints",
+      "selector": "0x0cdfebfa"
+    },
+    {
+      "name": "clock",
+      "selector": "0x91ddadf4"
+    },
+    {
+      "name": "delegate",
+      "selector": "0x5c19a95c"
+    },
+    {
+      "name": "delegates",
+      "selector": "0x587cde1e"
+    },
+    {
+      "name": "getPastTotalSupply",
+      "selector": "0x8e539e8c"
+    },
+    {
+      "name": "getPastVotes",
+      "selector": "0x3a46b1a8"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "getVotes",
+      "selector": "0x9ab24eb0"
+    },
+    {
+      "name": "initialize_ERC20Votes",
+      "selector": "0x65fa0b29"
+    },
+    {
+      "name": "isActivated",
+      "selector": "0x4a8c1fb4"
+    },
+    {
+      "name": "numCheckpoints",
+      "selector": "0x6fcfff45"
+    }
+  ],
+  "ERC3643Management": [
+    {
+      "name": "addAgent",
+      "selector": "0x84e79842"
+    },
+    {
+      "name": "initialize_ERC3643",
+      "selector": "0xc047bb6c"
+    },
+    {
+      "name": "recoveryAddress",
+      "selector": "0x9285948a"
+    },
+    {
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
+    },
+    {
+      "name": "setCompliance",
+      "selector": "0xf8981789"
+    },
+    {
+      "name": "setIdentityRegistry",
+      "selector": "0xcbf3f861"
+    },
+    {
+      "name": "setName",
+      "selector": "0xc47f0027"
+    },
+    {
+      "name": "setOnchainID",
+      "selector": "0x3d1ddc5b"
+    },
+    {
+      "name": "setSymbol",
+      "selector": "0xb84c8246"
+    }
+  ],
+  "ERC3643Batch": [
+    {
+      "name": "batchBurn",
+      "selector": "0x4a6cc677"
+    },
+    {
+      "name": "batchForcedTransfer",
+      "selector": "0x42a47abc"
+    },
+    {
+      "name": "batchMint",
+      "selector": "0x68573107"
+    },
+    {
+      "name": "batchTransfer",
+      "selector": "0x88d695b2"
+    }
+  ],
+  "ERC3643BatchFacet": [
+    {
+      "name": "batchBurn",
+      "selector": "0x4a6cc677"
+    },
+    {
+      "name": "batchForcedTransfer",
+      "selector": "0x42a47abc"
+    },
+    {
+      "name": "batchMint",
+      "selector": "0x68573107"
+    },
+    {
+      "name": "batchTransfer",
+      "selector": "0x88d695b2"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    }
+  ],
+  "ERC3643ManagementFacet": [
+    {
+      "name": "addAgent",
+      "selector": "0x84e79842"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ERC3643",
+      "selector": "0xc047bb6c"
+    },
+    {
+      "name": "recoveryAddress",
+      "selector": "0x9285948a"
+    },
+    {
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
+    },
+    {
+      "name": "setCompliance",
+      "selector": "0xf8981789"
+    },
+    {
+      "name": "setIdentityRegistry",
+      "selector": "0xcbf3f861"
+    },
+    {
+      "name": "setName",
+      "selector": "0xc47f0027"
+    },
+    {
+      "name": "setOnchainID",
+      "selector": "0x3d1ddc5b"
+    },
+    {
+      "name": "setSymbol",
+      "selector": "0xb84c8246"
+    }
+  ],
+  "ERC3643Operations": [
+    {
+      "name": "burn",
+      "selector": "0x9dc29fac"
+    },
+    {
+      "name": "forcedTransfer",
+      "selector": "0x9fc1d0e7"
+    },
+    {
+      "name": "mint",
+      "selector": "0x40c10f19"
+    }
+  ],
+  "ERC3643OperationsFacet": [
+    {
+      "name": "burn",
+      "selector": "0x9dc29fac"
+    },
+    {
+      "name": "forcedTransfer",
+      "selector": "0x9fc1d0e7"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "mint",
+      "selector": "0x40c10f19"
+    }
+  ],
+  "ERC3643Read": [
+    {
+      "name": "compliance",
+      "selector": "0x6290865d"
+    },
+    {
+      "name": "identityRegistry",
+      "selector": "0x134e18f4"
+    },
+    {
+      "name": "isAddressRecovered",
+      "selector": "0x1b997ec2"
+    },
+    {
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
+    },
+    {
+      "name": "onchainID",
+      "selector": "0xaba63705"
+    },
+    {
+      "name": "version",
+      "selector": "0x54fd4d50"
+    }
+  ],
+  "ERC3643ReadFacet": [
+    {
+      "name": "compliance",
+      "selector": "0x6290865d"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "identityRegistry",
+      "selector": "0x134e18f4"
+    },
+    {
+      "name": "isAddressRecovered",
+      "selector": "0x1b997ec2"
+    },
+    {
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
+    },
+    {
+      "name": "onchainID",
+      "selector": "0xaba63705"
+    },
+    {
+      "name": "version",
+      "selector": "0x54fd4d50"
+    }
+  ],
+  "AccessControl": [
+    {
+      "name": "applyRoles",
+      "selector": "0xfcfffeec"
+    },
+    {
+      "name": "getRoleCountFor",
+      "selector": "0x8fa9b4fe"
+    },
+    {
+      "name": "getRoleMemberCount",
+      "selector": "0xca15c873"
+    },
+    {
+      "name": "getRoleMembers",
+      "selector": "0x2a861f57"
+    },
+    {
+      "name": "getRolesFor",
+      "selector": "0xa28cf9a9"
+    },
+    {
+      "name": "grantRole",
+      "selector": "0x2f2ff15d"
+    },
+    {
+      "name": "hasRole",
+      "selector": "0x91d14854"
+    },
+    {
+      "name": "renounceRole",
+      "selector": "0x8bb9c5bf"
+    },
+    {
+      "name": "revokeRole",
+      "selector": "0xd547741f"
+    }
+  ],
+  "AccessControlFacet": [
+    {
+      "name": "applyRoles",
+      "selector": "0xfcfffeec"
+    },
+    {
+      "name": "getRoleCountFor",
+      "selector": "0x8fa9b4fe"
+    },
+    {
+      "name": "getRoleMemberCount",
+      "selector": "0xca15c873"
+    },
+    {
+      "name": "getRoleMembers",
+      "selector": "0x2a861f57"
+    },
+    {
+      "name": "getRolesFor",
+      "selector": "0xa28cf9a9"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "grantRole",
+      "selector": "0x2f2ff15d"
+    },
+    {
+      "name": "hasRole",
+      "selector": "0x91d14854"
+    },
+    {
+      "name": "renounceRole",
+      "selector": "0x8bb9c5bf"
+    },
+    {
+      "name": "revokeRole",
+      "selector": "0xd547741f"
+    }
+  ],
+  "Cap": [
+    {
+      "name": "getMaxSupply",
+      "selector": "0x4c0f38c2"
+    },
+    {
+      "name": "getMaxSupplyByPartition",
+      "selector": "0x79f3653f"
+    },
+    {
+      "name": "initialize_Cap",
+      "selector": "0x56210c4e"
+    },
+    {
+      "name": "setMaxSupply",
+      "selector": "0x6f8b44b0"
+    },
+    {
+      "name": "setMaxSupplyByPartition",
+      "selector": "0x99b69647"
+    }
+  ],
+  "CapFacet": [
+    {
+      "name": "getMaxSupply",
+      "selector": "0x4c0f38c2"
+    },
+    {
+      "name": "getMaxSupplyByPartition",
+      "selector": "0x79f3653f"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_Cap",
+      "selector": "0x56210c4e"
+    },
+    {
+      "name": "setMaxSupply",
+      "selector": "0x6f8b44b0"
+    },
+    {
+      "name": "setMaxSupplyByPartition",
+      "selector": "0x99b69647"
+    }
+  ],
+  "ClearingActions": [
+    {
+      "name": "activateClearing",
+      "selector": "0xab2d18a9"
+    },
+    {
+      "name": "approveClearingOperationByPartition",
+      "selector": "0xd849cea2"
+    },
+    {
+      "name": "cancelClearingOperationByPartition",
+      "selector": "0x679141fb"
+    },
+    {
+      "name": "deactivateClearing",
+      "selector": "0x65c21860"
+    },
+    {
+      "name": "initializeClearing",
+      "selector": "0x86a0b46a"
+    },
+    {
+      "name": "isClearingActivated",
+      "selector": "0x4b4d8990"
+    },
+    {
+      "name": "reclaimClearingOperationByPartition",
+      "selector": "0x67e57fe2"
+    }
+  ],
+  "ClearingActionsFacet": [
+    {
+      "name": "activateClearing",
+      "selector": "0xab2d18a9"
+    },
+    {
+      "name": "approveClearingOperationByPartition",
+      "selector": "0xd849cea2"
+    },
+    {
+      "name": "cancelClearingOperationByPartition",
+      "selector": "0x679141fb"
+    },
+    {
+      "name": "deactivateClearing",
+      "selector": "0x65c21860"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initializeClearing",
+      "selector": "0x86a0b46a"
+    },
+    {
+      "name": "isClearingActivated",
+      "selector": "0x4b4d8990"
+    },
+    {
+      "name": "reclaimClearingOperationByPartition",
+      "selector": "0x67e57fe2"
+    }
+  ],
+  "ClearingHoldCreation": [
+    {
+      "name": "clearingCreateHoldByPartition",
+      "selector": "0x6ceae590"
+    },
+    {
+      "name": "clearingCreateHoldFromByPartition",
+      "selector": "0x5f1cf8c9"
+    },
+    {
+      "name": "getClearingCreateHoldForByPartition",
+      "selector": "0x190eb09b"
+    },
+    {
+      "name": "operatorClearingCreateHoldByPartition",
+      "selector": "0x7ab0c73f"
+    },
+    {
+      "name": "protectedClearingCreateHoldByPartition",
+      "selector": "0x9b646ab9"
+    }
+  ],
+  "ClearingHoldCreationFacet": [
+    {
+      "name": "clearingCreateHoldByPartition",
+      "selector": "0x6ceae590"
+    },
+    {
+      "name": "clearingCreateHoldFromByPartition",
+      "selector": "0x5f1cf8c9"
+    },
+    {
+      "name": "getClearingCreateHoldForByPartition",
+      "selector": "0x190eb09b"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "operatorClearingCreateHoldByPartition",
+      "selector": "0x7ab0c73f"
+    },
+    {
+      "name": "protectedClearingCreateHoldByPartition",
+      "selector": "0x9b646ab9"
+    }
+  ],
+  "ClearingRead": [
+    {
+      "name": "getClearedAmountFor",
+      "selector": "0x46f8bc94"
+    },
+    {
+      "name": "getClearedAmountForByPartition",
+      "selector": "0xfed5a7d4"
+    },
+    {
+      "name": "getClearingCountForByPartition",
+      "selector": "0xcab70f17"
+    },
+    {
+      "name": "getClearingThirdParty",
+      "selector": "0x2714916d"
+    },
+    {
+      "name": "getClearingsIdForByPartition",
+      "selector": "0xcf38dab5"
+    }
+  ],
+  "ClearingReadFacet": [
+    {
+      "name": "getClearedAmountFor",
+      "selector": "0x46f8bc94"
+    },
+    {
+      "name": "getClearedAmountForByPartition",
+      "selector": "0xfed5a7d4"
+    },
+    {
+      "name": "getClearingCountForByPartition",
+      "selector": "0xcab70f17"
+    },
+    {
+      "name": "getClearingThirdParty",
+      "selector": "0x2714916d"
+    },
+    {
+      "name": "getClearingsIdForByPartition",
+      "selector": "0xcf38dab5"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    }
+  ],
+  "ClearingRedeem": [
+    {
+      "name": "clearingRedeemByPartition",
+      "selector": "0x39921b12"
+    },
+    {
+      "name": "clearingRedeemFromByPartition",
+      "selector": "0x35114a78"
+    },
+    {
+      "name": "getClearingRedeemForByPartition",
+      "selector": "0x4ac3d940"
+    },
+    {
+      "name": "operatorClearingRedeemByPartition",
+      "selector": "0xc1d6d5a0"
+    },
+    {
+      "name": "protectedClearingRedeemByPartition",
+      "selector": "0x498f1f65"
+    }
+  ],
+  "ClearingRedeemFacet": [
+    {
+      "name": "clearingRedeemByPartition",
+      "selector": "0x39921b12"
+    },
+    {
+      "name": "clearingRedeemFromByPartition",
+      "selector": "0x35114a78"
+    },
+    {
+      "name": "getClearingRedeemForByPartition",
+      "selector": "0x4ac3d940"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "operatorClearingRedeemByPartition",
+      "selector": "0xc1d6d5a0"
+    },
+    {
+      "name": "protectedClearingRedeemByPartition",
+      "selector": "0x498f1f65"
+    }
+  ],
+  "ClearingTransfer": [
+    {
+      "name": "clearingTransferByPartition",
+      "selector": "0xde32aaa8"
+    },
+    {
+      "name": "clearingTransferFromByPartition",
+      "selector": "0x5c829d67"
+    },
+    {
+      "name": "getClearingTransferForByPartition",
+      "selector": "0x6f438552"
+    },
+    {
+      "name": "operatorClearingTransferByPartition",
+      "selector": "0x2ba8508d"
+    },
+    {
+      "name": "protectedClearingTransferByPartition",
+      "selector": "0x1f4eef27"
+    }
+  ],
+  "ClearingTransferFacet": [
+    {
+      "name": "clearingTransferByPartition",
+      "selector": "0xde32aaa8"
+    },
+    {
+      "name": "clearingTransferFromByPartition",
+      "selector": "0x5c829d67"
+    },
+    {
+      "name": "getClearingTransferForByPartition",
+      "selector": "0x6f438552"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "operatorClearingTransferByPartition",
+      "selector": "0x2ba8508d"
+    },
+    {
+      "name": "protectedClearingTransferByPartition",
+      "selector": "0x1f4eef27"
+    }
+  ],
+  "ControlList": [
+    {
+      "name": "addToControlList",
+      "selector": "0xe8204966"
+    },
+    {
+      "name": "getControlListCount",
+      "selector": "0x6b5d2ea5"
+    },
+    {
+      "name": "getControlListMembers",
+      "selector": "0xcad7e56b"
+    },
+    {
+      "name": "getControlListType",
+      "selector": "0x1d46c292"
+    },
+    {
+      "name": "initialize_ControlList",
+      "selector": "0xf88bd9f2"
+    },
+    {
+      "name": "isInControlList",
+      "selector": "0xfd5b071b"
+    },
+    {
+      "name": "removeFromControlList",
+      "selector": "0x47b52d3b"
+    }
+  ],
+  "ControlListFacet": [
+    {
+      "name": "addToControlList",
+      "selector": "0xe8204966"
+    },
+    {
+      "name": "getControlListCount",
+      "selector": "0x6b5d2ea5"
+    },
+    {
+      "name": "getControlListMembers",
+      "selector": "0xcad7e56b"
+    },
+    {
+      "name": "getControlListType",
+      "selector": "0x1d46c292"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ControlList",
+      "selector": "0xf88bd9f2"
+    },
+    {
+      "name": "isInControlList",
+      "selector": "0xfd5b071b"
+    },
+    {
+      "name": "removeFromControlList",
+      "selector": "0x47b52d3b"
+    }
+  ],
+  "CorporateActions": [
+    {
+      "name": "addCorporateAction",
+      "selector": "0xd9e4d92c"
+    },
+    {
+      "name": "getCorporateAction",
+      "selector": "0x911181da"
+    },
+    {
+      "name": "getCorporateActionCount",
+      "selector": "0x8859794c"
+    },
+    {
+      "name": "getCorporateActionCountByType",
+      "selector": "0x539b4e0b"
+    },
+    {
+      "name": "getCorporateActionIds",
+      "selector": "0x1b56ea1e"
+    },
+    {
+      "name": "getCorporateActionIdsByType",
+      "selector": "0xe73bbddb"
+    }
+  ],
+  "CorporateActionsFacet": [
+    {
+      "name": "addCorporateAction",
+      "selector": "0xd9e4d92c"
+    },
+    {
+      "name": "getCorporateAction",
+      "selector": "0x911181da"
+    },
+    {
+      "name": "getCorporateActionCount",
+      "selector": "0x8859794c"
+    },
+    {
+      "name": "getCorporateActionCountByType",
+      "selector": "0x539b4e0b"
+    },
+    {
+      "name": "getCorporateActionIds",
+      "selector": "0x1b56ea1e"
+    },
+    {
+      "name": "getCorporateActionIdsByType",
+      "selector": "0xe73bbddb"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    }
+  ],
+  "ExternalControlListManagement": [
+    {
+      "name": "addExternalControlList",
+      "selector": "0x995e4649"
+    },
+    {
+      "name": "getExternalControlListsCount",
+      "selector": "0x9bec4167"
+    },
+    {
+      "name": "getExternalControlListsMembers",
+      "selector": "0xc4aa9df3"
+    },
+    {
+      "name": "initialize_ExternalControlLists",
+      "selector": "0x0a0a114f"
+    },
+    {
+      "name": "isExternalControlList",
+      "selector": "0x07c44711"
+    },
+    {
+      "name": "removeExternalControlList",
+      "selector": "0xb8913387"
+    },
+    {
+      "name": "updateExternalControlLists",
+      "selector": "0x0ba2b922"
+    }
+  ],
+  "ExternalControlListManagementFacet": [
+    {
+      "name": "addExternalControlList",
+      "selector": "0x995e4649"
+    },
+    {
+      "name": "getExternalControlListsCount",
+      "selector": "0x9bec4167"
+    },
+    {
+      "name": "getExternalControlListsMembers",
+      "selector": "0xc4aa9df3"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ExternalControlLists",
+      "selector": "0x0a0a114f"
+    },
+    {
+      "name": "isExternalControlList",
+      "selector": "0x07c44711"
+    },
+    {
+      "name": "removeExternalControlList",
+      "selector": "0xb8913387"
+    },
+    {
+      "name": "updateExternalControlLists",
+      "selector": "0x0ba2b922"
+    }
+  ],
+  "ExternalKycListManagement": [
+    {
+      "name": "addExternalKycList",
+      "selector": "0x7570e044"
+    },
+    {
+      "name": "getExternalKycListsCount",
+      "selector": "0xd17e889e"
+    },
+    {
+      "name": "getExternalKycListsMembers",
+      "selector": "0x999a2459"
+    },
+    {
+      "name": "initialize_ExternalKycLists",
+      "selector": "0x3ac7fadc"
+    },
+    {
+      "name": "isExternalKycList",
+      "selector": "0x20991e17"
+    },
+    {
+      "name": "isExternallyGranted",
+      "selector": "0x1d7d5749"
+    },
+    {
+      "name": "removeExternalKycList",
+      "selector": "0x16c94d54"
+    },
+    {
+      "name": "updateExternalKycLists",
+      "selector": "0xc391576d"
+    }
+  ],
+  "ExternalKycListManagementFacet": [
+    {
+      "name": "addExternalKycList",
+      "selector": "0x7570e044"
+    },
+    {
+      "name": "getExternalKycListsCount",
+      "selector": "0xd17e889e"
+    },
+    {
+      "name": "getExternalKycListsMembers",
+      "selector": "0x999a2459"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ExternalKycLists",
+      "selector": "0x3ac7fadc"
+    },
+    {
+      "name": "isExternalKycList",
+      "selector": "0x20991e17"
+    },
+    {
+      "name": "isExternallyGranted",
+      "selector": "0x1d7d5749"
+    },
+    {
+      "name": "removeExternalKycList",
+      "selector": "0x16c94d54"
+    },
+    {
+      "name": "updateExternalKycLists",
+      "selector": "0xc391576d"
+    }
+  ],
+  "ExternalPauseManagement": [
+    {
+      "name": "addExternalPause",
+      "selector": "0xd438cff1"
+    },
+    {
+      "name": "getExternalPausesCount",
+      "selector": "0x1e2bc3a6"
+    },
+    {
+      "name": "getExternalPausesMembers",
+      "selector": "0x5b175a35"
+    },
+    {
+      "name": "initialize_ExternalPauses",
+      "selector": "0x8f88d0d5"
+    },
+    {
+      "name": "isExternalPause",
+      "selector": "0xe26e35be"
+    },
+    {
+      "name": "removeExternalPause",
+      "selector": "0x9648d912"
+    },
+    {
+      "name": "updateExternalPauses",
+      "selector": "0x361d714a"
+    }
+  ],
+  "ExternalPauseManagementFacet": [
+    {
+      "name": "addExternalPause",
+      "selector": "0xd438cff1"
+    },
+    {
+      "name": "getExternalPausesCount",
+      "selector": "0x1e2bc3a6"
+    },
+    {
+      "name": "getExternalPausesMembers",
+      "selector": "0x5b175a35"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ExternalPauses",
+      "selector": "0x8f88d0d5"
+    },
+    {
+      "name": "isExternalPause",
+      "selector": "0xe26e35be"
+    },
+    {
+      "name": "removeExternalPause",
+      "selector": "0x9648d912"
     },
     {
-      "name": "operatorTransferByPartition",
-      "selector": "0x6b9894fe"
+      "name": "updateExternalPauses",
+      "selector": "0x361d714a"
+    }
+  ],
+  "Freeze": [
+    {
+      "name": "batchFreezePartialTokens",
+      "selector": "0xfc7e5fa8"
     },
     {
-      "name": "protectedRedeemFromByPartition",
-      "selector": "0xc98d9723"
+      "name": "batchSetAddressFrozen",
+      "selector": "0x1a7af379"
     },
     {
-      "name": "protectedTransferFromByPartition",
-      "selector": "0x12e41c0a"
+      "name": "batchUnfreezePartialTokens",
+      "selector": "0x4710362d"
+    },
+    {
+      "name": "freezePartialTokens",
+      "selector": "0x125c4a33"
+    },
+    {
+      "name": "getFrozenTokens",
+      "selector": "0x158b1a57"
+    },
+    {
+      "name": "setAddressFrozen",
+      "selector": "0xc69c09cf"
+    },
+    {
+      "name": "unfreezePartialTokens",
+      "selector": "0x1fe56f7d"
     }
   ],
-  "IERC1410Read": [
+  "FreezeFacet": [
     {
-      "name": "balanceOf",
-      "selector": "0x70a08231"
+      "name": "batchFreezePartialTokens",
+      "selector": "0xfc7e5fa8"
     },
     {
-      "name": "balanceOfAt",
-      "selector": "0x4ee2cd7e"
+      "name": "batchSetAddressFrozen",
+      "selector": "0x1a7af379"
     },
     {
-      "name": "balanceOfByPartition",
-      "selector": "0x30e82803"
+      "name": "batchUnfreezePartialTokens",
+      "selector": "0x4710362d"
     },
     {
-      "name": "canRedeemByPartition",
-      "selector": "0x7b7322c4"
+      "name": "freezePartialTokens",
+      "selector": "0x125c4a33"
     },
     {
-      "name": "canTransferByPartition",
-      "selector": "0xa7b518b1"
+      "name": "getFrozenTokens",
+      "selector": "0x158b1a57"
     },
     {
-      "name": "isMultiPartition",
-      "selector": "0xbd09cc54"
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
     },
     {
-      "name": "isOperator",
-      "selector": "0xb6363cf2"
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
     },
     {
-      "name": "isOperatorForPartition",
-      "selector": "0x6d77cad6"
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
     },
     {
-      "name": "partitionsOf",
-      "selector": "0x740ab8f4"
+      "name": "setAddressFrozen",
+      "selector": "0xc69c09cf"
     },
     {
-      "name": "totalSupply",
-      "selector": "0x18160ddd"
+      "name": "unfreezePartialTokens",
+      "selector": "0x1fe56f7d"
+    }
+  ],
+  "HoldManagement": [
+    {
+      "name": "controllerCreateHoldByPartition",
+      "selector": "0x5f3d8171"
     },
     {
-      "name": "totalSupplyByPartition",
-      "selector": "0xa26734dc"
+      "name": "operatorCreateHoldByPartition",
+      "selector": "0xc6062c3c"
+    },
+    {
+      "name": "protectedCreateHoldByPartition",
+      "selector": "0xc17f3554"
     }
   ],
-  "IERC1410TokenHolder": [
+  "HoldManagementFacet": [
     {
-      "name": "authorizeOperator",
-      "selector": "0x959b8c3f"
+      "name": "controllerCreateHoldByPartition",
+      "selector": "0x5f3d8171"
     },
     {
-      "name": "authorizeOperatorByPartition",
-      "selector": "0x103ef9e1"
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
     },
     {
-      "name": "redeemByPartition",
-      "selector": "0x62eb0068"
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
     },
     {
-      "name": "revokeOperator",
-      "selector": "0xfad8b32a"
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
     },
     {
-      "name": "revokeOperatorByPartition",
-      "selector": "0x168ecec5"
+      "name": "operatorCreateHoldByPartition",
+      "selector": "0xc6062c3c"
     },
     {
-      "name": "transferByPartition",
-      "selector": "0x3bc9bcd8"
+      "name": "protectedCreateHoldByPartition",
+      "selector": "0xc17f3554"
+    }
+  ],
+  "HoldRead": [
+    {
+      "name": "getHeldAmountFor",
+      "selector": "0x8493aabb"
     },
     {
-      "name": "triggerAndSyncAll",
-      "selector": "0x6afb79db"
+      "name": "getHeldAmountForByPartition",
+      "selector": "0x4d60fdc5"
+    },
+    {
+      "name": "getHoldCountForByPartition",
+      "selector": "0xcecb3899"
+    },
+    {
+      "name": "getHoldForByPartition",
+      "selector": "0x8d41523d"
+    },
+    {
+      "name": "getHoldThirdParty",
+      "selector": "0x3c36a695"
+    },
+    {
+      "name": "getHoldsIdForByPartition",
+      "selector": "0xeb89899d"
     }
   ],
-  "IERC1594": [
+  "HoldReadFacet": [
     {
-      "name": "canTransfer",
-      "selector": "0x1badb25c"
+      "name": "getHeldAmountFor",
+      "selector": "0x8493aabb"
     },
     {
-      "name": "canTransferFrom",
-      "selector": "0x122eb575"
+      "name": "getHeldAmountForByPartition",
+      "selector": "0x4d60fdc5"
     },
     {
-      "name": "initialize_ERC1594",
-      "selector": "0x9be12cea"
+      "name": "getHoldCountForByPartition",
+      "selector": "0xcecb3899"
     },
     {
-      "name": "isIssuable",
-      "selector": "0x2f1cae85"
+      "name": "getHoldForByPartition",
+      "selector": "0x8d41523d"
     },
     {
-      "name": "issue",
-      "selector": "0xbb3acde9"
+      "name": "getHoldThirdParty",
+      "selector": "0x3c36a695"
     },
     {
-      "name": "redeem",
-      "selector": "0xe77c646d"
+      "name": "getHoldsIdForByPartition",
+      "selector": "0xeb89899d"
     },
     {
-      "name": "redeemFrom",
-      "selector": "0x9675193c"
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
     },
     {
-      "name": "transferFromWithData",
-      "selector": "0xee532f31"
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
     },
     {
-      "name": "transferWithData",
-      "selector": "0x2535f762"
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
     }
   ],
-  "IERC1643": [
+  "HoldTokenHolder": [
     {
-      "name": "getAllDocuments",
-      "selector": "0x9fa5f50b"
+      "name": "createHoldByPartition",
+      "selector": "0x5d23449e"
     },
     {
-      "name": "getDocument",
-      "selector": "0xb10d6b41"
+      "name": "createHoldFromByPartition",
+      "selector": "0x2361f007"
     },
     {
-      "name": "removeDocument",
-      "selector": "0xc3501848"
+      "name": "executeHoldByPartition",
+      "selector": "0x25fe8720"
     },
     {
-      "name": "setDocument",
-      "selector": "0x010648ca"
+      "name": "reclaimHoldByPartition",
+      "selector": "0xb437969e"
+    },
+    {
+      "name": "releaseHoldByPartition",
+      "selector": "0xf8bafc1c"
     }
   ],
-  "IERC1644": [
+  "HoldTokenHolderFacet": [
+    {
+      "name": "createHoldByPartition",
+      "selector": "0x5d23449e"
+    },
+    {
+      "name": "createHoldFromByPartition",
+      "selector": "0x2361f007"
+    },
+    {
+      "name": "executeHoldByPartition",
+      "selector": "0x25fe8720"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "reclaimHoldByPartition",
+      "selector": "0xb437969e"
+    },
+    {
+      "name": "releaseHoldByPartition",
+      "selector": "0xf8bafc1c"
+    }
+  ],
+  "IERC1410": [
+    {
+      "name": "authorizeOperator",
+      "selector": "0x959b8c3f"
+    },
+    {
+      "name": "authorizeOperatorByPartition",
+      "selector": "0x103ef9e1"
+    },
+    {
+      "name": "balanceOf",
+      "selector": "0x70a08231"
+    },
     {
-      "name": "controllerRedeem",
-      "selector": "0x2bc6acc3"
+      "name": "balanceOfAt",
+      "selector": "0x4ee2cd7e"
     },
     {
-      "name": "controllerTransfer",
-      "selector": "0xf282527a"
+      "name": "balanceOfByPartition",
+      "selector": "0x30e82803"
     },
     {
-      "name": "finalizeControllable",
-      "selector": "0xa213934f"
+      "name": "canRedeemByPartition",
+      "selector": "0x7b7322c4"
     },
     {
-      "name": "initialize_ERC1644",
-      "selector": "0xaa4ea38e"
+      "name": "canTransferByPartition",
+      "selector": "0xa7b518b1"
     },
     {
-      "name": "isControllable",
-      "selector": "0x4c783bf5"
-    }
-  ],
-  "IERC20": [
+      "name": "controllerRedeemByPartition",
+      "selector": "0xb84777cc"
+    },
     {
-      "name": "allowance",
-      "selector": "0xdd62ed3e"
+      "name": "controllerTransferByPartition",
+      "selector": "0xfb78befa"
     },
     {
-      "name": "approve",
-      "selector": "0x095ea7b3"
+      "name": "initialize_ERC1410",
+      "selector": "0x7b1df196"
     },
     {
-      "name": "decimals",
-      "selector": "0x313ce567"
+      "name": "isMultiPartition",
+      "selector": "0xbd09cc54"
     },
     {
-      "name": "decimalsAdjusted",
-      "selector": "0xc67f05aa"
+      "name": "isOperator",
+      "selector": "0xb6363cf2"
     },
     {
-      "name": "decimalsAdjustedAt",
-      "selector": "0x065dd252"
+      "name": "isOperatorForPartition",
+      "selector": "0x6d77cad6"
     },
     {
-      "name": "decimalsAt",
-      "selector": "0x771918ca"
+      "name": "issueByPartition",
+      "selector": "0x18180262"
     },
     {
-      "name": "decreaseAllowance",
-      "selector": "0xa457c2d7"
+      "name": "operatorRedeemByPartition",
+      "selector": "0x13d557bc"
     },
     {
-      "name": "getERC20Metadata",
-      "selector": "0x8e649195"
+      "name": "operatorTransferByPartition",
+      "selector": "0x6b9894fe"
     },
     {
-      "name": "increaseAllowance",
-      "selector": "0x39509351"
+      "name": "partitionsOf",
+      "selector": "0x740ab8f4"
     },
     {
-      "name": "initialize_ERC20",
-      "selector": "0xe04fb235"
+      "name": "protectedRedeemFromByPartition",
+      "selector": "0xc98d9723"
     },
     {
-      "name": "name",
-      "selector": "0x06fdde03"
+      "name": "protectedTransferFromByPartition",
+      "selector": "0x12e41c0a"
     },
     {
-      "name": "symbol",
-      "selector": "0x95d89b41"
+      "name": "redeemByPartition",
+      "selector": "0x62eb0068"
     },
     {
-      "name": "transfer",
-      "selector": "0xa9059cbb"
+      "name": "revokeOperator",
+      "selector": "0xfad8b32a"
     },
     {
-      "name": "transferFrom",
-      "selector": "0x23b872dd"
-    }
-  ],
-  "ICompliance": [
+      "name": "revokeOperatorByPartition",
+      "selector": "0x168ecec5"
+    },
     {
-      "name": "canTransfer",
-      "selector": "0xe46638e6"
+      "name": "totalSupply",
+      "selector": "0x18160ddd"
     },
     {
-      "name": "created",
-      "selector": "0x5f8dead3"
+      "name": "totalSupplyByPartition",
+      "selector": "0xa26734dc"
     },
     {
-      "name": "destroyed",
-      "selector": "0x8d2ea772"
+      "name": "transferByPartition",
+      "selector": "0x3bc9bcd8"
     },
     {
-      "name": "transferred",
-      "selector": "0x8baf29b4"
+      "name": "triggerAndSyncAll",
+      "selector": "0x6afb79db"
     }
   ],
-  "IERC3643": [
-    {
-      "name": "addAgent",
-      "selector": "0x84e79842"
-    },
-    {
-      "name": "authorizeOperator",
-      "selector": "0x959b8c3f"
-    },
+  "IERC1410Management": [
     {
-      "name": "authorizeOperatorByPartition",
-      "selector": "0x103ef9e1"
+      "name": "controllerRedeemByPartition",
+      "selector": "0xb84777cc"
     },
     {
-      "name": "balanceOf",
-      "selector": "0x70a08231"
+      "name": "controllerTransferByPartition",
+      "selector": "0xfb78befa"
     },
     {
-      "name": "balanceOfAt",
-      "selector": "0x4ee2cd7e"
+      "name": "initialize_ERC1410",
+      "selector": "0x7b1df196"
     },
     {
-      "name": "balanceOfAtSnapshot",
-      "selector": "0x8e00ae2e"
+      "name": "issueByPartition",
+      "selector": "0x18180262"
     },
     {
-      "name": "balanceOfAtSnapshotByPartition",
-      "selector": "0xe002bcdf"
+      "name": "operatorRedeemByPartition",
+      "selector": "0x13d557bc"
     },
     {
-      "name": "balanceOfByPartition",
-      "selector": "0x30e82803"
+      "name": "operatorTransferByPartition",
+      "selector": "0x6b9894fe"
     },
     {
-      "name": "batchBurn",
-      "selector": "0x4a6cc677"
+      "name": "protectedRedeemFromByPartition",
+      "selector": "0xc98d9723"
     },
     {
-      "name": "batchForcedTransfer",
-      "selector": "0x42a47abc"
-    },
+      "name": "protectedTransferFromByPartition",
+      "selector": "0x12e41c0a"
+    }
+  ],
+  "IERC1410Read": [
     {
-      "name": "batchMint",
-      "selector": "0x68573107"
+      "name": "balanceOf",
+      "selector": "0x70a08231"
     },
     {
-      "name": "batchTransfer",
-      "selector": "0x88d695b2"
+      "name": "balanceOfAt",
+      "selector": "0x4ee2cd7e"
     },
     {
-      "name": "burn",
-      "selector": "0x9dc29fac"
+      "name": "balanceOfByPartition",
+      "selector": "0x30e82803"
     },
     {
       "name": "canRedeemByPartition",
@@ -3180,191 +5396,223 @@ contractNames
       "selector": "0xa7b518b1"
     },
     {
-      "name": "compliance",
-      "selector": "0x6290865d"
+      "name": "isMultiPartition",
+      "selector": "0xbd09cc54"
     },
     {
-      "name": "controllerRedeemByPartition",
-      "selector": "0xb84777cc"
+      "name": "isOperator",
+      "selector": "0xb6363cf2"
     },
     {
-      "name": "controllerTransferByPartition",
-      "selector": "0xfb78befa"
+      "name": "isOperatorForPartition",
+      "selector": "0x6d77cad6"
     },
     {
-      "name": "decimalsAtSnapshot",
-      "selector": "0x69ed346f"
+      "name": "partitionsOf",
+      "selector": "0x740ab8f4"
     },
     {
-      "name": "forcedTransfer",
-      "selector": "0x9fc1d0e7"
+      "name": "totalSupply",
+      "selector": "0x18160ddd"
     },
     {
-      "name": "identityRegistry",
-      "selector": "0x134e18f4"
-    },
+      "name": "totalSupplyByPartition",
+      "selector": "0xa26734dc"
+    }
+  ],
+  "IERC1410TokenHolder": [
     {
-      "name": "initialize_ERC1410",
-      "selector": "0x7b1df196"
+      "name": "authorizeOperator",
+      "selector": "0x959b8c3f"
     },
     {
-      "name": "initialize_ERC3643",
-      "selector": "0x888d9119"
+      "name": "authorizeOperatorByPartition",
+      "selector": "0x103ef9e1"
     },
     {
-      "name": "isAddressRecovered",
-      "selector": "0x1b997ec2"
+      "name": "redeemByPartition",
+      "selector": "0x62eb0068"
     },
     {
-      "name": "isAgent",
-      "selector": "0x1ffbb064"
+      "name": "revokeOperator",
+      "selector": "0xfad8b32a"
     },
     {
-      "name": "isMultiPartition",
-      "selector": "0xbd09cc54"
+      "name": "revokeOperatorByPartition",
+      "selector": "0x168ecec5"
     },
     {
-      "name": "isOperator",
-      "selector": "0xb6363cf2"
+      "name": "transferByPartition",
+      "selector": "0x3bc9bcd8"
     },
     {
-      "name": "isOperatorForPartition",
-      "selector": "0x6d77cad6"
-    },
+      "name": "triggerAndSyncAll",
+      "selector": "0x6afb79db"
+    }
+  ],
+  "IERC1594": [
     {
-      "name": "isPaused",
-      "selector": "0xb187bd26"
+      "name": "canTransfer",
+      "selector": "0x1badb25c"
     },
     {
-      "name": "issueByPartition",
-      "selector": "0x18180262"
+      "name": "canTransferFrom",
+      "selector": "0x122eb575"
     },
     {
-      "name": "lockedBalanceOfAtSnapshot",
-      "selector": "0xd9e6f164"
+      "name": "initialize_ERC1594",
+      "selector": "0x9be12cea"
     },
     {
-      "name": "lockedBalanceOfAtSnapshotByPartition",
-      "selector": "0x4a13f5d0"
+      "name": "isIssuable",
+      "selector": "0x2f1cae85"
     },
     {
-      "name": "mint",
-      "selector": "0x40c10f19"
+      "name": "issue",
+      "selector": "0xbb3acde9"
     },
     {
-      "name": "onchainID",
-      "selector": "0xaba63705"
+      "name": "redeem",
+      "selector": "0xe77c646d"
     },
     {
-      "name": "operatorRedeemByPartition",
-      "selector": "0x13d557bc"
+      "name": "redeemFrom",
+      "selector": "0x9675193c"
     },
     {
-      "name": "operatorTransferByPartition",
-      "selector": "0x6b9894fe"
+      "name": "transferFromWithData",
+      "selector": "0xee532f31"
     },
     {
-      "name": "partitionsOf",
-      "selector": "0x740ab8f4"
+      "name": "transferWithData",
+      "selector": "0x2535f762"
+    }
+  ],
+  "IERC1643": [
+    {
+      "name": "getAllDocuments",
+      "selector": "0x9fa5f50b"
     },
     {
-      "name": "partitionsOfAtSnapshot",
-      "selector": "0x09e84301"
+      "name": "getDocument",
+      "selector": "0xb10d6b41"
     },
     {
-      "name": "pause",
-      "selector": "0x8456cb59"
+      "name": "removeDocument",
+      "selector": "0xc3501848"
     },
     {
-      "name": "protectedRedeemFromByPartition",
-      "selector": "0xc98d9723"
-    },
+      "name": "setDocument",
+      "selector": "0x010648ca"
+    }
+  ],
+  "IERC1644": [
     {
-      "name": "protectedTransferFromByPartition",
-      "selector": "0x12e41c0a"
+      "name": "controllerRedeem",
+      "selector": "0x2bc6acc3"
     },
     {
-      "name": "recoveryAddress",
-      "selector": "0x9285948a"
+      "name": "controllerTransfer",
+      "selector": "0xf282527a"
     },
     {
-      "name": "redeemByPartition",
-      "selector": "0x62eb0068"
+      "name": "finalizeControllable",
+      "selector": "0xa213934f"
     },
     {
-      "name": "removeAgent",
-      "selector": "0x97a6278e"
+      "name": "initialize_ERC1644",
+      "selector": "0xaa4ea38e"
     },
     {
-      "name": "revokeOperator",
-      "selector": "0xfad8b32a"
-    },
+      "name": "isControllable",
+      "selector": "0x4c783bf5"
+    }
+  ],
+  "IERC20Permit": [
     {
-      "name": "revokeOperatorByPartition",
-      "selector": "0x168ecec5"
+      "name": "DOMAIN_SEPARATOR",
+      "selector": "0x3644e515"
     },
     {
-      "name": "setCompliance",
-      "selector": "0xf8981789"
+      "name": "initialize_ERC20Permit",
+      "selector": "0x70d162dc"
     },
     {
-      "name": "setIdentityRegistry",
-      "selector": "0xcbf3f861"
+      "name": "nonces",
+      "selector": "0x7ecebe00"
     },
     {
-      "name": "setName",
-      "selector": "0xc47f0027"
-    },
+      "name": "permit",
+      "selector": "0xd505accf"
+    }
+  ],
+  "IERC20Votes": [
     {
-      "name": "setOnchainID",
-      "selector": "0x3d1ddc5b"
+      "name": "CLOCK_MODE",
+      "selector": "0x4bf5d7e9"
     },
     {
-      "name": "setSymbol",
-      "selector": "0xb84c8246"
+      "name": "checkpoints",
+      "selector": "0x0cdfebfa"
     },
     {
-      "name": "takeSnapshot",
-      "selector": "0xb3d3d37e"
+      "name": "clock",
+      "selector": "0x91ddadf4"
     },
     {
-      "name": "totalSupply",
-      "selector": "0x18160ddd"
+      "name": "delegate",
+      "selector": "0x5c19a95c"
     },
     {
-      "name": "totalSupplyAtSnapshot",
-      "selector": "0xda35f8f6"
+      "name": "delegates",
+      "selector": "0x587cde1e"
     },
     {
-      "name": "totalSupplyAtSnapshotByPartition",
-      "selector": "0x9657ddb9"
+      "name": "getPastTotalSupply",
+      "selector": "0x8e539e8c"
     },
     {
-      "name": "totalSupplyByPartition",
-      "selector": "0xa26734dc"
+      "name": "getPastVotes",
+      "selector": "0x3a46b1a8"
     },
     {
-      "name": "transferByPartition",
-      "selector": "0x3bc9bcd8"
+      "name": "getVotes",
+      "selector": "0x9ab24eb0"
     },
     {
-      "name": "triggerAndSyncAll",
-      "selector": "0x6afb79db"
+      "name": "initialize_ERC20Votes",
+      "selector": "0x65fa0b29"
     },
     {
-      "name": "unpause",
-      "selector": "0x3f4ba83a"
+      "name": "isActivated",
+      "selector": "0x4a8c1fb4"
     },
     {
-      "name": "version",
-      "selector": "0x54fd4d50"
+      "name": "numCheckpoints",
+      "selector": "0x6fcfff45"
     }
   ],
-  "IERC3643Basic": [
+  "IERC3643": [
     {
       "name": "addAgent",
       "selector": "0x84e79842"
     },
+    {
+      "name": "batchBurn",
+      "selector": "0x4a6cc677"
+    },
+    {
+      "name": "batchForcedTransfer",
+      "selector": "0x42a47abc"
+    },
+    {
+      "name": "batchMint",
+      "selector": "0x68573107"
+    },
+    {
+      "name": "batchTransfer",
+      "selector": "0x88d695b2"
+    },
     {
       "name": "burn",
       "selector": "0x9dc29fac"
@@ -3383,7 +5631,7 @@ contractNames
     },
     {
       "name": "initialize_ERC3643",
-      "selector": "0x888d9119"
+      "selector": "0xc047bb6c"
     },
     {
       "name": "isAddressRecovered",
@@ -3434,6 +5682,44 @@ contractNames
       "selector": "0x54fd4d50"
     }
   ],
+  "IERC3643Management": [
+    {
+      "name": "addAgent",
+      "selector": "0x84e79842"
+    },
+    {
+      "name": "initialize_ERC3643",
+      "selector": "0xc047bb6c"
+    },
+    {
+      "name": "recoveryAddress",
+      "selector": "0x9285948a"
+    },
+    {
+      "name": "removeAgent",
+      "selector": "0x97a6278e"
+    },
+    {
+      "name": "setCompliance",
+      "selector": "0xf8981789"
+    },
+    {
+      "name": "setIdentityRegistry",
+      "selector": "0xcbf3f861"
+    },
+    {
+      "name": "setName",
+      "selector": "0xc47f0027"
+    },
+    {
+      "name": "setOnchainID",
+      "selector": "0x3d1ddc5b"
+    },
+    {
+      "name": "setSymbol",
+      "selector": "0xb84c8246"
+    }
+  ],
   "IERC3643Batch": [
     {
       "name": "batchBurn",
@@ -3452,6 +5738,64 @@ contractNames
       "selector": "0x88d695b2"
     }
   ],
+  "IERC3643Operations": [
+    {
+      "name": "burn",
+      "selector": "0x9dc29fac"
+    },
+    {
+      "name": "forcedTransfer",
+      "selector": "0x9fc1d0e7"
+    },
+    {
+      "name": "mint",
+      "selector": "0x40c10f19"
+    }
+  ],
+  "IERC3643Read": [
+    {
+      "name": "compliance",
+      "selector": "0x6290865d"
+    },
+    {
+      "name": "identityRegistry",
+      "selector": "0x134e18f4"
+    },
+    {
+      "name": "isAddressRecovered",
+      "selector": "0x1b997ec2"
+    },
+    {
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
+    },
+    {
+      "name": "onchainID",
+      "selector": "0xaba63705"
+    },
+    {
+      "name": "version",
+      "selector": "0x54fd4d50"
+    }
+  ],
+  "IFreeze": [
+    {
+      "name": "freezePartialTokens",
+      "selector": "0x125c4a33"
+    },
+    {
+      "name": "getFrozenTokens",
+      "selector": "0x158b1a57"
+    },
+    {
+      "name": "setAddressFrozen",
+      "selector": "0xc69c09cf"
+    },
+    {
+      "name": "unfreezePartialTokens",
+      "selector": "0x1fe56f7d"
+    }
+  ],
   "IAccessControl": [
     {
       "name": "applyRoles",
@@ -3798,24 +6142,6 @@ contractNames
       "selector": "0x361d714a"
     }
   ],
-  "IFreeze": [
-    {
-      "name": "freezePartialTokens",
-      "selector": "0x125c4a33"
-    },
-    {
-      "name": "getFrozenTokens",
-      "selector": "0x158b1a57"
-    },
-    {
-      "name": "setAddressFrozen",
-      "selector": "0xc69c09cf"
-    },
-    {
-      "name": "unfreezePartialTokens",
-      "selector": "0x1fe56f7d"
-    }
-  ],
   "IHold": [
     {
       "name": "applyRoles",
@@ -3837,14 +6163,6 @@ contractNames
       "name": "balanceOfAt",
       "selector": "0x4ee2cd7e"
     },
-    {
-      "name": "balanceOfAtSnapshot",
-      "selector": "0x8e00ae2e"
-    },
-    {
-      "name": "balanceOfAtSnapshotByPartition",
-      "selector": "0xe002bcdf"
-    },
     {
       "name": "balanceOfByPartition",
       "selector": "0x30e82803"
@@ -3877,10 +6195,6 @@ contractNames
       "name": "createHoldFromByPartition",
       "selector": "0x2361f007"
     },
-    {
-      "name": "decimalsAtSnapshot",
-      "selector": "0x69ed346f"
-    },
     {
       "name": "executeHoldByPartition",
       "selector": "0x25fe8720"
@@ -3949,22 +6263,10 @@ contractNames
       "name": "isOperatorForPartition",
       "selector": "0x6d77cad6"
     },
-    {
-      "name": "isPaused",
-      "selector": "0xb187bd26"
-    },
     {
       "name": "issueByPartition",
       "selector": "0x18180262"
     },
-    {
-      "name": "lockedBalanceOfAtSnapshot",
-      "selector": "0xd9e6f164"
-    },
-    {
-      "name": "lockedBalanceOfAtSnapshotByPartition",
-      "selector": "0x4a13f5d0"
-    },
     {
       "name": "operatorCreateHoldByPartition",
       "selector": "0xc6062c3c"
@@ -3981,14 +6283,6 @@ contractNames
       "name": "partitionsOf",
       "selector": "0x740ab8f4"
     },
-    {
-      "name": "partitionsOfAtSnapshot",
-      "selector": "0x09e84301"
-    },
-    {
-      "name": "pause",
-      "selector": "0x8456cb59"
-    },
     {
       "name": "protectedCreateHoldByPartition",
       "selector": "0xc17f3554"
@@ -4029,22 +6323,10 @@ contractNames
       "name": "revokeRole",
       "selector": "0xd547741f"
     },
-    {
-      "name": "takeSnapshot",
-      "selector": "0xb3d3d37e"
-    },
     {
       "name": "totalSupply",
       "selector": "0x18160ddd"
     },
-    {
-      "name": "totalSupplyAtSnapshot",
-      "selector": "0xda35f8f6"
-    },
-    {
-      "name": "totalSupplyAtSnapshotByPartition",
-      "selector": "0x9657ddb9"
-    },
     {
       "name": "totalSupplyByPartition",
       "selector": "0xa26734dc"
@@ -4056,10 +6338,6 @@ contractNames
     {
       "name": "triggerAndSyncAll",
       "selector": "0x6afb79db"
-    },
-    {
-      "name": "unpause",
-      "selector": "0x3f4ba83a"
     }
   ],
   "IHoldManagement": [
@@ -4272,8 +6550,16 @@ contractNames
       "selector": "0xe002bcdf"
     },
     {
-      "name": "decimalsAtSnapshot",
-      "selector": "0x69ed346f"
+      "name": "decimalsAtSnapshot",
+      "selector": "0x69ed346f"
+    },
+    {
+      "name": "getTokenHoldersAtSnapshot",
+      "selector": "0xd22a73df"
+    },
+    {
+      "name": "getTotalTokenHoldersAtSnapshot",
+      "selector": "0x867126e1"
     },
     {
       "name": "lockedBalanceOfAtSnapshot",
@@ -4331,6 +6617,48 @@ contractNames
     }
   ],
   "Kyc": [
+    {
+      "name": "activateInternalKyc",
+      "selector": "0xfbb08f50"
+    },
+    {
+      "name": "deactivateInternalKyc",
+      "selector": "0x4a5df31d"
+    },
+    {
+      "name": "getKycAccountsCount",
+      "selector": "0x5b712c4b"
+    },
+    {
+      "name": "getKycAccountsData",
+      "selector": "0x00497afb"
+    },
+    {
+      "name": "getKycFor",
+      "selector": "0x41322840"
+    },
+    {
+      "name": "getKycStatusFor",
+      "selector": "0xe788a736"
+    },
+    {
+      "name": "grantKyc",
+      "selector": "0x81bea54d"
+    },
+    {
+      "name": "initializeInternalKyc",
+      "selector": "0xdf353624"
+    },
+    {
+      "name": "isInternalKycActivated",
+      "selector": "0x90b6c798"
+    },
+    {
+      "name": "revokeKyc",
+      "selector": "0x12283191"
+    }
+  ],
+  "KycFacet": [
     {
       "name": "activateInternalKyc",
       "selector": "0xfbb08f50"
@@ -4385,6 +6713,56 @@ contractNames
     }
   ],
   "Lock": [
+    {
+      "name": "getLockCountFor",
+      "selector": "0x4f131ba4"
+    },
+    {
+      "name": "getLockCountForByPartition",
+      "selector": "0x3b193d92"
+    },
+    {
+      "name": "getLockFor",
+      "selector": "0x6f14b024"
+    },
+    {
+      "name": "getLockForByPartition",
+      "selector": "0xa9acfccb"
+    },
+    {
+      "name": "getLockedAmountFor",
+      "selector": "0x36e74467"
+    },
+    {
+      "name": "getLockedAmountForByPartition",
+      "selector": "0x6e1c55ba"
+    },
+    {
+      "name": "getLocksIdFor",
+      "selector": "0xd2d2b9fc"
+    },
+    {
+      "name": "getLocksIdForByPartition",
+      "selector": "0x3ea8b59d"
+    },
+    {
+      "name": "lock",
+      "selector": "0xcf27cfc4"
+    },
+    {
+      "name": "lockByPartition",
+      "selector": "0x7a87884e"
+    },
+    {
+      "name": "release",
+      "selector": "0x8124fea6"
+    },
+    {
+      "name": "releaseByPartition",
+      "selector": "0xdc6a3e75"
+    }
+  ],
+  "LockFacet": [
     {
       "name": "getLockCountFor",
       "selector": "0x4f131ba4"
@@ -4487,6 +6865,32 @@ contractNames
     }
   ],
   "ProtectedPartitions": [
+    {
+      "name": "arePartitionsProtected",
+      "selector": "0xa151c19f"
+    },
+    {
+      "name": "calculateRoleForPartition",
+      "selector": "0xcb4da6fc"
+    },
+    {
+      "name": "getNounceFor",
+      "selector": "0x9f6b67c2"
+    },
+    {
+      "name": "initialize_ProtectedPartitions",
+      "selector": "0x90c032cc"
+    },
+    {
+      "name": "protectPartitions",
+      "selector": "0x6c5fde55"
+    },
+    {
+      "name": "unprotectPartitions",
+      "selector": "0x1277b323"
+    }
+  ],
+  "ProtectedPartitionsFacet": [
     {
       "name": "arePartitionsProtected",
       "selector": "0xa151c19f"
@@ -4525,6 +6929,68 @@ contractNames
     }
   ],
   "Snapshots": [
+    {
+      "name": "balanceOfAtSnapshot",
+      "selector": "0x8e00ae2e"
+    },
+    {
+      "name": "balanceOfAtSnapshotByPartition",
+      "selector": "0xe002bcdf"
+    },
+    {
+      "name": "clearedBalanceOfAtSnapshot",
+      "selector": "0x2bc16e9b"
+    },
+    {
+      "name": "clearedBalanceOfAtSnapshotByPartition",
+      "selector": "0x386e1405"
+    },
+    {
+      "name": "decimalsAtSnapshot",
+      "selector": "0x69ed346f"
+    },
+    {
+      "name": "getTokenHoldersAtSnapshot",
+      "selector": "0xd22a73df"
+    },
+    {
+      "name": "getTotalTokenHoldersAtSnapshot",
+      "selector": "0x867126e1"
+    },
+    {
+      "name": "heldBalanceOfAtSnapshot",
+      "selector": "0xb52e39aa"
+    },
+    {
+      "name": "heldBalanceOfAtSnapshotByPartition",
+      "selector": "0x977a3a71"
+    },
+    {
+      "name": "lockedBalanceOfAtSnapshot",
+      "selector": "0xd9e6f164"
+    },
+    {
+      "name": "lockedBalanceOfAtSnapshotByPartition",
+      "selector": "0x4a13f5d0"
+    },
+    {
+      "name": "partitionsOfAtSnapshot",
+      "selector": "0x09e84301"
+    },
+    {
+      "name": "takeSnapshot",
+      "selector": "0xb3d3d37e"
+    },
+    {
+      "name": "totalSupplyAtSnapshot",
+      "selector": "0xda35f8f6"
+    },
+    {
+      "name": "totalSupplyAtSnapshotByPartition",
+      "selector": "0x9657ddb9"
+    }
+  ],
+  "SnapshotsFacet": [
     {
       "name": "balanceOfAtSnapshot",
       "selector": "0x8e00ae2e"
@@ -4557,6 +7023,14 @@ contractNames
       "name": "getStaticResolverKey",
       "selector": "0x1ef2fdc8"
     },
+    {
+      "name": "getTokenHoldersAtSnapshot",
+      "selector": "0xd22a73df"
+    },
+    {
+      "name": "getTotalTokenHoldersAtSnapshot",
+      "selector": "0x867126e1"
+    },
     {
       "name": "heldBalanceOfAtSnapshot",
       "selector": "0xb52e39aa"
@@ -4591,6 +7065,36 @@ contractNames
     }
   ],
   "SsiManagement": [
+    {
+      "name": "addIssuer",
+      "selector": "0x20694db0"
+    },
+    {
+      "name": "getIssuerListCount",
+      "selector": "0x600b2940"
+    },
+    {
+      "name": "getIssuerListMembers",
+      "selector": "0x25ab0545"
+    },
+    {
+      "name": "getRevocationRegistryAddress",
+      "selector": "0x12023976"
+    },
+    {
+      "name": "isIssuer",
+      "selector": "0x877b9a67"
+    },
+    {
+      "name": "removeIssuer",
+      "selector": "0x47bc7093"
+    },
+    {
+      "name": "setRevocationRegistryAddress",
+      "selector": "0xbb3daeaf"
+    }
+  ],
+  "SsiManagementFacet": [
     {
       "name": "addIssuer",
       "selector": "0x20694db0"
@@ -4633,6 +7137,12 @@ contractNames
     }
   ],
   "AdjustBalances": [
+    {
+      "name": "adjustBalances",
+      "selector": "0xe2d77e44"
+    }
+  ],
+  "AdjustBalancesFacet": [
     {
       "name": "adjustBalances",
       "selector": "0xe2d77e44"
@@ -4651,6 +7161,20 @@ contractNames
     }
   ],
   "Bond": [
+    {
+      "name": "redeemAtMaturityByPartition",
+      "selector": "0x8a647211"
+    },
+    {
+      "name": "setCoupon",
+      "selector": "0xb3a6617d"
+    },
+    {
+      "name": "updateMaturityDate",
+      "selector": "0xc7a6ca35"
+    }
+  ],
+  "BondRead": [
     {
       "name": "getBondDetails",
       "selector": "0x4ce02414"
@@ -4671,6 +7195,10 @@ contractNames
       "name": "getCouponFor",
       "selector": "0xbba7b56d"
     },
+    {
+      "name": "getCouponHolders",
+      "selector": "0xa92e8371"
+    },
     {
       "name": "getStaticFunctionSelectors",
       "selector": "0xc1f0d742"
@@ -4684,15 +7212,15 @@ contractNames
       "selector": "0x1ef2fdc8"
     },
     {
-      "name": "setCoupon",
-      "selector": "0xb3a6617d"
-    },
-    {
-      "name": "updateMaturityDate",
-      "selector": "0xc7a6ca35"
+      "name": "getTotalCouponHolders",
+      "selector": "0xec116ae3"
     }
   ],
   "Equity": [
+    {
+      "name": "getDividendHolders",
+      "selector": "0xeba3918e"
+    },
     {
       "name": "getDividends",
       "selector": "0x3837ac88"
@@ -4718,16 +7246,12 @@ contractNames
       "selector": "0x7c62c7fc"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
-    },
-    {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getTotalDividendHolders",
+      "selector": "0xd61a022b"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getTotalVotingHolders",
+      "selector": "0x92c51818"
     },
     {
       "name": "getVoting",
@@ -4741,6 +7265,10 @@ contractNames
       "name": "getVotingFor",
       "selector": "0x7633eccf"
     },
+    {
+      "name": "getVotingHolders",
+      "selector": "0x009f64ac"
+    },
     {
       "name": "setDividends",
       "selector": "0x054d2b88"
@@ -4756,11 +7284,25 @@ contractNames
   ],
   "IAdjustBalances": [
     {
-      "name": "adjustBalances",
-      "selector": "0xe2d77e44"
+      "name": "adjustBalances",
+      "selector": "0xe2d77e44"
+    }
+  ],
+  "IBond": [
+    {
+      "name": "redeemAtMaturityByPartition",
+      "selector": "0x8a647211"
+    },
+    {
+      "name": "setCoupon",
+      "selector": "0xb3a6617d"
+    },
+    {
+      "name": "updateMaturityDate",
+      "selector": "0xc7a6ca35"
     }
   ],
-  "IBond": [
+  "IBondRead": [
     {
       "name": "getBondDetails",
       "selector": "0x4ce02414"
@@ -4782,15 +7324,19 @@ contractNames
       "selector": "0xbba7b56d"
     },
     {
-      "name": "setCoupon",
-      "selector": "0xb3a6617d"
+      "name": "getCouponHolders",
+      "selector": "0xa92e8371"
     },
     {
-      "name": "updateMaturityDate",
-      "selector": "0xc7a6ca35"
+      "name": "getTotalCouponHolders",
+      "selector": "0xec116ae3"
     }
   ],
   "IEquity": [
+    {
+      "name": "getDividendHolders",
+      "selector": "0xeba3918e"
+    },
     {
       "name": "getDividends",
       "selector": "0x3837ac88"
@@ -4815,6 +7361,14 @@ contractNames
       "name": "getScheduledBalanceAdjustmentCount",
       "selector": "0x7c62c7fc"
     },
+    {
+      "name": "getTotalDividendHolders",
+      "selector": "0xd61a022b"
+    },
+    {
+      "name": "getTotalVotingHolders",
+      "selector": "0x92c51818"
+    },
     {
       "name": "getVoting",
       "selector": "0x3afc7282"
@@ -4827,6 +7381,10 @@ contractNames
       "name": "getVotingFor",
       "selector": "0x7633eccf"
     },
+    {
+      "name": "getVotingHolders",
+      "selector": "0x009f64ac"
+    },
     {
       "name": "setDividends",
       "selector": "0x054d2b88"
@@ -4891,6 +7449,20 @@ contractNames
     }
   ],
   "ScheduledBalanceAdjustments": [
+    {
+      "name": "getScheduledBalanceAdjustments",
+      "selector": "0xcb884d41"
+    },
+    {
+      "name": "onScheduledBalanceAdjustmentTriggered",
+      "selector": "0xd300de7a"
+    },
+    {
+      "name": "scheduledBalanceAdjustmentCount",
+      "selector": "0x2de241e3"
+    }
+  ],
+  "ScheduledBalanceAdjustmentsFacet": [
     {
       "name": "getScheduledBalanceAdjustments",
       "selector": "0xcb884d41"
@@ -4917,6 +7489,20 @@ contractNames
     }
   ],
   "ScheduledSnapshots": [
+    {
+      "name": "getScheduledSnapshots",
+      "selector": "0xca21c53a"
+    },
+    {
+      "name": "onScheduledSnapshotTriggered",
+      "selector": "0x8e51d755"
+    },
+    {
+      "name": "scheduledSnapshotCount",
+      "selector": "0xa19e91fe"
+    }
+  ],
+  "ScheduledSnapshotsFacet": [
     {
       "name": "getScheduledSnapshots",
       "selector": "0xca21c53a"
@@ -4943,6 +7529,28 @@ contractNames
     }
   ],
   "ScheduledTasks": [
+    {
+      "name": "getScheduledTasks",
+      "selector": "0xdcff09ba"
+    },
+    {
+      "name": "onScheduledTaskTriggered",
+      "selector": "0xdf1eb071"
+    },
+    {
+      "name": "scheduledTaskCount",
+      "selector": "0x6dfe790e"
+    },
+    {
+      "name": "triggerPendingScheduledTasks",
+      "selector": "0x1507f2a4"
+    },
+    {
+      "name": "triggerScheduledTasks",
+      "selector": "0x28a5d769"
+    }
+  ],
+  "ScheduledTasksFacet": [
     {
       "name": "getScheduledTasks",
       "selector": "0xdcff09ba"
@@ -4981,6 +7589,50 @@ contractNames
       "name": "_initialize_bondUSA",
       "selector": "0xfe8d48bf"
     },
+    {
+      "name": "redeemAtMaturityByPartition",
+      "selector": "0x8a647211"
+    },
+    {
+      "name": "setCoupon",
+      "selector": "0xb3a6617d"
+    },
+    {
+      "name": "updateMaturityDate",
+      "selector": "0xc7a6ca35"
+    }
+  ],
+  "BondUSAFacet": [
+    {
+      "name": "_initialize_bondUSA",
+      "selector": "0xfe8d48bf"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "redeemAtMaturityByPartition",
+      "selector": "0x8a647211"
+    },
+    {
+      "name": "setCoupon",
+      "selector": "0xb3a6617d"
+    },
+    {
+      "name": "updateMaturityDate",
+      "selector": "0xc7a6ca35"
+    }
+  ],
+  "BondUSARead": [
     {
       "name": "getBondDetails",
       "selector": "0x4ce02414"
@@ -5001,6 +7653,14 @@ contractNames
       "name": "getCouponFor",
       "selector": "0xbba7b56d"
     },
+    {
+      "name": "getCouponHolders",
+      "selector": "0xa92e8371"
+    },
+    {
+      "name": "getSecurityHolders",
+      "selector": "0x81438d2f"
+    },
     {
       "name": "getSecurityRegulationData",
       "selector": "0x8fda5afe"
@@ -5018,12 +7678,12 @@ contractNames
       "selector": "0x1ef2fdc8"
     },
     {
-      "name": "setCoupon",
-      "selector": "0xb3a6617d"
+      "name": "getTotalCouponHolders",
+      "selector": "0xec116ae3"
     },
     {
-      "name": "updateMaturityDate",
-      "selector": "0xc7a6ca35"
+      "name": "getTotalSecurityHolders",
+      "selector": "0xbd007c8f"
     }
   ],
   "EquityUSA": [
@@ -5031,6 +7691,10 @@ contractNames
       "name": "_initialize_equityUSA",
       "selector": "0xd34090aa"
     },
+    {
+      "name": "getDividendHolders",
+      "selector": "0xeba3918e"
+    },
     {
       "name": "getDividends",
       "selector": "0x3837ac88"
@@ -5055,21 +7719,25 @@ contractNames
       "name": "getScheduledBalanceAdjustmentCount",
       "selector": "0x7c62c7fc"
     },
+    {
+      "name": "getSecurityHolders",
+      "selector": "0x81438d2f"
+    },
     {
       "name": "getSecurityRegulationData",
       "selector": "0x8fda5afe"
     },
     {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
+      "name": "getTotalDividendHolders",
+      "selector": "0xd61a022b"
     },
     {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
+      "name": "getTotalSecurityHolders",
+      "selector": "0xbd007c8f"
     },
     {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
+      "name": "getTotalVotingHolders",
+      "selector": "0x92c51818"
     },
     {
       "name": "getVoting",
@@ -5083,6 +7751,10 @@ contractNames
       "name": "getVotingFor",
       "selector": "0x7633eccf"
     },
+    {
+      "name": "getVotingHolders",
+      "selector": "0x009f64ac"
+    },
     {
       "name": "setDividends",
       "selector": "0x054d2b88"
@@ -5096,35 +7768,109 @@ contractNames
       "selector": "0x5adaa49e"
     }
   ],
-  "IBondUSA": [
+  "EquityUSAFacet": [
     {
-      "name": "_initialize_bondUSA",
-      "selector": "0xfe8d48bf"
+      "name": "_initialize_equityUSA",
+      "selector": "0xd34090aa"
     },
     {
-      "name": "getBondDetails",
-      "selector": "0x4ce02414"
+      "name": "getDividendHolders",
+      "selector": "0xeba3918e"
     },
     {
-      "name": "getCoupon",
-      "selector": "0x936e3169"
+      "name": "getDividends",
+      "selector": "0x3837ac88"
     },
     {
-      "name": "getCouponCount",
-      "selector": "0x468bb240"
+      "name": "getDividendsCount",
+      "selector": "0x9e676952"
     },
     {
-      "name": "getCouponDetails",
-      "selector": "0x82c5582a"
+      "name": "getDividendsFor",
+      "selector": "0x323e22da"
     },
     {
-      "name": "getCouponFor",
-      "selector": "0xbba7b56d"
+      "name": "getEquityDetails",
+      "selector": "0xefcdcad8"
+    },
+    {
+      "name": "getScheduledBalanceAdjustment",
+      "selector": "0x3d5338e8"
+    },
+    {
+      "name": "getScheduledBalanceAdjustmentCount",
+      "selector": "0x7c62c7fc"
+    },
+    {
+      "name": "getSecurityHolders",
+      "selector": "0x81438d2f"
     },
     {
       "name": "getSecurityRegulationData",
       "selector": "0x8fda5afe"
     },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "getTotalDividendHolders",
+      "selector": "0xd61a022b"
+    },
+    {
+      "name": "getTotalSecurityHolders",
+      "selector": "0xbd007c8f"
+    },
+    {
+      "name": "getTotalVotingHolders",
+      "selector": "0x92c51818"
+    },
+    {
+      "name": "getVoting",
+      "selector": "0x3afc7282"
+    },
+    {
+      "name": "getVotingCount",
+      "selector": "0x9c2aab5e"
+    },
+    {
+      "name": "getVotingFor",
+      "selector": "0x7633eccf"
+    },
+    {
+      "name": "getVotingHolders",
+      "selector": "0x009f64ac"
+    },
+    {
+      "name": "setDividends",
+      "selector": "0x054d2b88"
+    },
+    {
+      "name": "setScheduledBalanceAdjustment",
+      "selector": "0xd1661084"
+    },
+    {
+      "name": "setVoting",
+      "selector": "0x5adaa49e"
+    }
+  ],
+  "IBondUSA": [
+    {
+      "name": "_initialize_bondUSA",
+      "selector": "0xfe8d48bf"
+    },
+    {
+      "name": "redeemAtMaturityByPartition",
+      "selector": "0x8a647211"
+    },
     {
       "name": "setCoupon",
       "selector": "0xb3a6617d"
@@ -5139,6 +7885,10 @@ contractNames
       "name": "_initialize_equityUSA",
       "selector": "0xd34090aa"
     },
+    {
+      "name": "getDividendHolders",
+      "selector": "0xeba3918e"
+    },
     {
       "name": "getDividends",
       "selector": "0x3837ac88"
@@ -5163,10 +7913,26 @@ contractNames
       "name": "getScheduledBalanceAdjustmentCount",
       "selector": "0x7c62c7fc"
     },
+    {
+      "name": "getSecurityHolders",
+      "selector": "0x81438d2f"
+    },
     {
       "name": "getSecurityRegulationData",
       "selector": "0x8fda5afe"
     },
+    {
+      "name": "getTotalDividendHolders",
+      "selector": "0xd61a022b"
+    },
+    {
+      "name": "getTotalSecurityHolders",
+      "selector": "0xbd007c8f"
+    },
+    {
+      "name": "getTotalVotingHolders",
+      "selector": "0x92c51818"
+    },
     {
       "name": "getVoting",
       "selector": "0x3afc7282"
@@ -5179,6 +7945,10 @@ contractNames
       "name": "getVotingFor",
       "selector": "0x7633eccf"
     },
+    {
+      "name": "getVotingHolders",
+      "selector": "0x009f64ac"
+    },
     {
       "name": "setDividends",
       "selector": "0x054d2b88"
@@ -5193,9 +7963,17 @@ contractNames
     }
   ],
   "ISecurity": [
+    {
+      "name": "getSecurityHolders",
+      "selector": "0x81438d2f"
+    },
     {
       "name": "getSecurityRegulationData",
       "selector": "0x8fda5afe"
+    },
+    {
+      "name": "getTotalSecurityHolders",
+      "selector": "0xbd007c8f"
     }
   ],
   "ITransferAndLock": [
@@ -5217,24 +7995,20 @@ contractNames
     }
   ],
   "Security": [
+    {
+      "name": "getSecurityHolders",
+      "selector": "0x81438d2f"
+    },
     {
       "name": "getSecurityRegulationData",
       "selector": "0x8fda5afe"
+    },
+    {
+      "name": "getTotalSecurityHolders",
+      "selector": "0xbd007c8f"
     }
   ],
   "TransferAndLock": [
-    {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
-    },
-    {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
-    },
-    {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
-    },
     {
       "name": "protectedTransferAndLock",
       "selector": "0xe2e20e05"
@@ -5247,12 +8021,24 @@ contractNames
       "name": "transferAndLock",
       "selector": "0x0e92b90b"
     },
-    {
-      "name": "transferAndLockByPartition",
-      "selector": "0x3bd407b9"
-    }
-  ],
-  "TransferAndLockStorageWrapper": [
+    {
+      "name": "transferAndLockByPartition",
+      "selector": "0x3bd407b9"
+    }
+  ],
+  "TransferAndLockFacet": [
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
     {
       "name": "protectedTransferAndLock",
       "selector": "0xe2e20e05"
@@ -5921,6 +8707,10 @@ contractNames
       "name": "setFlags",
       "selector": "0xc1194e7e"
     },
+    {
+      "name": "setFlagsByMethod",
+      "selector": "0xe98940a1"
+    },
     {
       "name": "transferred",
       "selector": "0x8baf29b4"
@@ -5930,6 +8720,16 @@ contractNames
       "selector": "0x5a61e0a5"
     }
   ],
+  "IdentityRegistryMock": [
+    {
+      "name": "isVerified",
+      "selector": "0xb9209e33"
+    },
+    {
+      "name": "setFlags",
+      "selector": "0xc1194e7e"
+    }
+  ],
   "AccessControlFacetTimeTravel": [
     {
       "name": "applyRoles",
@@ -5980,7 +8780,7 @@ contractNames
       "selector": "0xd547741f"
     }
   ],
-  "AdjustBalancesTimeTravel": [
+  "AdjustBalancesFacetTimeTravel": [
     {
       "name": "adjustBalances",
       "selector": "0xe2d77e44"
@@ -5998,11 +8798,37 @@ contractNames
       "selector": "0x1ef2fdc8"
     }
   ],
-  "BondUSATimeTravel": [
+  "BondUSAFacetTimeTravel": [
     {
       "name": "_initialize_bondUSA",
       "selector": "0xfe8d48bf"
     },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "redeemAtMaturityByPartition",
+      "selector": "0x8a647211"
+    },
+    {
+      "name": "setCoupon",
+      "selector": "0xb3a6617d"
+    },
+    {
+      "name": "updateMaturityDate",
+      "selector": "0xc7a6ca35"
+    }
+  ],
+  "BondUSAReadTimeTravel": [
     {
       "name": "getBondDetails",
       "selector": "0x4ce02414"
@@ -6023,6 +8849,14 @@ contractNames
       "name": "getCouponFor",
       "selector": "0xbba7b56d"
     },
+    {
+      "name": "getCouponHolders",
+      "selector": "0xa92e8371"
+    },
+    {
+      "name": "getSecurityHolders",
+      "selector": "0x81438d2f"
+    },
     {
       "name": "getSecurityRegulationData",
       "selector": "0x8fda5afe"
@@ -6040,15 +8874,15 @@ contractNames
       "selector": "0x1ef2fdc8"
     },
     {
-      "name": "setCoupon",
-      "selector": "0xb3a6617d"
+      "name": "getTotalCouponHolders",
+      "selector": "0xec116ae3"
     },
     {
-      "name": "updateMaturityDate",
-      "selector": "0xc7a6ca35"
+      "name": "getTotalSecurityHolders",
+      "selector": "0xbd007c8f"
     }
   ],
-  "CapTimeTravel": [
+  "CapFacetTimeTravel": [
     {
       "name": "getMaxSupply",
       "selector": "0x4c0f38c2"
@@ -6260,7 +9094,7 @@ contractNames
       "selector": "0x1f4eef27"
     }
   ],
-  "ControlListTimeTravel": [
+  "ControlListFacetTimeTravel": [
     {
       "name": "addToControlList",
       "selector": "0xe8204966"
@@ -6302,7 +9136,7 @@ contractNames
       "selector": "0x47b52d3b"
     }
   ],
-  "CorporateActionsTimeTravel": [
+  "CorporateActionsFacetTimeTravel": [
     {
       "name": "addCorporateAction",
       "selector": "0xd9e4d92c"
@@ -6340,7 +9174,7 @@ contractNames
       "selector": "0x1ef2fdc8"
     }
   ],
-  "ERC1410ManagementTimeTravel": [
+  "ERC1410ManagementFacetTimeTravel": [
     {
       "name": "controllerRedeemByPartition",
       "selector": "0xb84777cc"
@@ -6386,7 +9220,7 @@ contractNames
       "selector": "0x12e41c0a"
     }
   ],
-  "ERC1410ReadTimeTravel": [
+  "ERC1410ReadFacetTimeTravel": [
     {
       "name": "balanceOf",
       "selector": "0x70a08231"
@@ -6444,7 +9278,7 @@ contractNames
       "selector": "0xa26734dc"
     }
   ],
-  "ERC1410TokenHolderTimeTravel": [
+  "ERC1410TokenHolderFacetTimeTravel": [
     {
       "name": "authorizeOperator",
       "selector": "0x959b8c3f"
@@ -6486,7 +9320,7 @@ contractNames
       "selector": "0x6afb79db"
     }
   ],
-  "ERC1594TimeTravel": [
+  "ERC1594FacetTimeTravel": [
     {
       "name": "canTransfer",
       "selector": "0x1badb25c"
@@ -6536,7 +9370,7 @@ contractNames
       "selector": "0x2535f762"
     }
   ],
-  "ERC1643TimeTravel": [
+  "ERC1643FacetTimeTravel": [
     {
       "name": "getAllDocuments",
       "selector": "0x9fa5f50b"
@@ -6566,7 +9400,7 @@ contractNames
       "selector": "0x010648ca"
     }
   ],
-  "ERC1644TimeTravel": [
+  "ERC1644FacetTimeTravel": [
     {
       "name": "controllerRedeem",
       "selector": "0x2bc6acc3"
@@ -6600,7 +9434,7 @@ contractNames
       "selector": "0x4c783bf5"
     }
   ],
-  "ERC20TimeTravel": [
+  "ERC20FacetTimeTravel": [
     {
       "name": "allowance",
       "selector": "0xdd62ed3e"
@@ -6670,22 +9504,64 @@ contractNames
       "selector": "0x23b872dd"
     }
   ],
-  "ERC3643BatchTimeTravel": [
+  "ERC20PermitFacetTimeTravel": [
     {
-      "name": "batchBurn",
-      "selector": "0x4a6cc677"
+      "name": "DOMAIN_SEPARATOR",
+      "selector": "0x3644e515"
     },
     {
-      "name": "batchForcedTransfer",
-      "selector": "0x42a47abc"
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
     },
     {
-      "name": "batchMint",
-      "selector": "0x68573107"
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
     },
     {
-      "name": "batchTransfer",
-      "selector": "0x88d695b2"
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "initialize_ERC20Permit",
+      "selector": "0x70d162dc"
+    },
+    {
+      "name": "nonces",
+      "selector": "0x7ecebe00"
+    },
+    {
+      "name": "permit",
+      "selector": "0xd505accf"
+    }
+  ],
+  "ERC20VotesTimeTravel": [
+    {
+      "name": "CLOCK_MODE",
+      "selector": "0x4bf5d7e9"
+    },
+    {
+      "name": "checkpoints",
+      "selector": "0x0cdfebfa"
+    },
+    {
+      "name": "clock",
+      "selector": "0x91ddadf4"
+    },
+    {
+      "name": "delegate",
+      "selector": "0x5c19a95c"
+    },
+    {
+      "name": "delegates",
+      "selector": "0x587cde1e"
+    },
+    {
+      "name": "getPastTotalSupply",
+      "selector": "0x8e539e8c"
+    },
+    {
+      "name": "getPastVotes",
+      "selector": "0x3a46b1a8"
     },
     {
       "name": "getStaticFunctionSelectors",
@@ -6698,24 +9574,40 @@ contractNames
     {
       "name": "getStaticResolverKey",
       "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "getVotes",
+      "selector": "0x9ab24eb0"
+    },
+    {
+      "name": "initialize_ERC20Votes",
+      "selector": "0x65fa0b29"
+    },
+    {
+      "name": "isActivated",
+      "selector": "0x4a8c1fb4"
+    },
+    {
+      "name": "numCheckpoints",
+      "selector": "0x6fcfff45"
     }
   ],
-  "ERC3643TimeTravel": [
+  "ERC3643BatchFacetTimeTravel": [
     {
-      "name": "addAgent",
-      "selector": "0x84e79842"
+      "name": "batchBurn",
+      "selector": "0x4a6cc677"
     },
     {
-      "name": "burn",
-      "selector": "0x9dc29fac"
+      "name": "batchForcedTransfer",
+      "selector": "0x42a47abc"
     },
     {
-      "name": "compliance",
-      "selector": "0x6290865d"
+      "name": "batchMint",
+      "selector": "0x68573107"
     },
     {
-      "name": "forcedTransfer",
-      "selector": "0x9fc1d0e7"
+      "name": "batchTransfer",
+      "selector": "0x88d695b2"
     },
     {
       "name": "getStaticFunctionSelectors",
@@ -6728,30 +9620,28 @@ contractNames
     {
       "name": "getStaticResolverKey",
       "selector": "0x1ef2fdc8"
-    },
-    {
-      "name": "identityRegistry",
-      "selector": "0x134e18f4"
-    },
+    }
+  ],
+  "ERC3643ManagementTimeTravel": [
     {
-      "name": "initialize_ERC3643",
-      "selector": "0x888d9119"
+      "name": "addAgent",
+      "selector": "0x84e79842"
     },
     {
-      "name": "isAddressRecovered",
-      "selector": "0x1b997ec2"
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
     },
     {
-      "name": "isAgent",
-      "selector": "0x1ffbb064"
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
     },
     {
-      "name": "mint",
-      "selector": "0x40c10f19"
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
     },
     {
-      "name": "onchainID",
-      "selector": "0xaba63705"
+      "name": "initialize_ERC3643",
+      "selector": "0xc047bb6c"
     },
     {
       "name": "recoveryAddress",
@@ -6780,17 +9670,81 @@ contractNames
     {
       "name": "setSymbol",
       "selector": "0xb84c8246"
+    }
+  ],
+  "ERC3643OperationsTimeTravel": [
+    {
+      "name": "burn",
+      "selector": "0x9dc29fac"
+    },
+    {
+      "name": "forcedTransfer",
+      "selector": "0x9fc1d0e7"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "mint",
+      "selector": "0x40c10f19"
+    }
+  ],
+  "ERC3643ReadTimeTravel": [
+    {
+      "name": "compliance",
+      "selector": "0x6290865d"
+    },
+    {
+      "name": "getStaticFunctionSelectors",
+      "selector": "0xc1f0d742"
+    },
+    {
+      "name": "getStaticInterfaceIds",
+      "selector": "0xb378cf37"
+    },
+    {
+      "name": "getStaticResolverKey",
+      "selector": "0x1ef2fdc8"
+    },
+    {
+      "name": "identityRegistry",
+      "selector": "0x134e18f4"
+    },
+    {
+      "name": "isAddressRecovered",
+      "selector": "0x1b997ec2"
+    },
+    {
+      "name": "isAgent",
+      "selector": "0x1ffbb064"
+    },
+    {
+      "name": "onchainID",
+      "selector": "0xaba63705"
     },
     {
       "name": "version",
       "selector": "0x54fd4d50"
     }
   ],
-  "EquityUSATimeTravel": [
+  "EquityUSAFacetTimeTravel": [
     {
       "name": "_initialize_equityUSA",
       "selector": "0xd34090aa"
     },
+    {
+      "name": "getDividendHolders",
+      "selector": "0xeba3918e"
+    },
     {
       "name": "getDividends",
       "selector": "0x3837ac88"
@@ -6815,6 +9769,10 @@ contractNames
       "name": "getScheduledBalanceAdjustmentCount",
       "selector": "0x7c62c7fc"
     },
+    {
+      "name": "getSecurityHolders",
+      "selector": "0x81438d2f"
+    },
     {
       "name": "getSecurityRegulationData",
       "selector": "0x8fda5afe"
@@ -6831,6 +9789,18 @@ contractNames
       "name": "getStaticResolverKey",
       "selector": "0x1ef2fdc8"
     },
+    {
+      "name": "getTotalDividendHolders",
+      "selector": "0xd61a022b"
+    },
+    {
+      "name": "getTotalSecurityHolders",
+      "selector": "0xbd007c8f"
+    },
+    {
+      "name": "getTotalVotingHolders",
+      "selector": "0x92c51818"
+    },
     {
       "name": "getVoting",
       "selector": "0x3afc7282"
@@ -6843,6 +9813,10 @@ contractNames
       "name": "getVotingFor",
       "selector": "0x7633eccf"
     },
+    {
+      "name": "getVotingHolders",
+      "selector": "0x009f64ac"
+    },
     {
       "name": "setDividends",
       "selector": "0x054d2b88"
@@ -6856,7 +9830,7 @@ contractNames
       "selector": "0x5adaa49e"
     }
   ],
-  "ExternalControlListManagementTimeTravel": [
+  "ExternalControlListManagementFacetTimeTravel": [
     {
       "name": "addExternalControlList",
       "selector": "0x995e4649"
@@ -6898,7 +9872,7 @@ contractNames
       "selector": "0x0ba2b922"
     }
   ],
-  "ExternalKycListManagementTimeTravel": [
+  "ExternalKycListManagementFacetTimeTravel": [
     {
       "name": "addExternalKycList",
       "selector": "0x7570e044"
@@ -6944,7 +9918,7 @@ contractNames
       "selector": "0xc391576d"
     }
   ],
-  "ExternalPauseManagementTimeTravel": [
+  "ExternalPauseManagementFacetTimeTravel": [
     {
       "name": "addExternalPause",
       "selector": "0xd438cff1"
@@ -7028,7 +10002,7 @@ contractNames
       "selector": "0x1fe56f7d"
     }
   ],
-  "HoldManagementTimeTravel": [
+  "HoldManagementFacetTimeTravel": [
     {
       "name": "controllerCreateHoldByPartition",
       "selector": "0x5f3d8171"
@@ -7054,7 +10028,7 @@ contractNames
       "selector": "0xc17f3554"
     }
   ],
-  "HoldReadTimeTravel": [
+  "HoldReadFacetTimeTravel": [
     {
       "name": "getHeldAmountFor",
       "selector": "0x8493aabb"
@@ -7092,53 +10066,7 @@ contractNames
       "selector": "0x1ef2fdc8"
     }
   ],
-  "HoldTimeTravel": [
-    {
-      "name": "controllerCreateHoldByPartition",
-      "selector": "0x5f3d8171"
-    },
-    {
-      "name": "createHoldByPartition",
-      "selector": "0x5d23449e"
-    },
-    {
-      "name": "createHoldFromByPartition",
-      "selector": "0x2361f007"
-    },
-    {
-      "name": "executeHoldByPartition",
-      "selector": "0x25fe8720"
-    },
-    {
-      "name": "getStaticFunctionSelectors",
-      "selector": "0xc1f0d742"
-    },
-    {
-      "name": "getStaticInterfaceIds",
-      "selector": "0xb378cf37"
-    },
-    {
-      "name": "getStaticResolverKey",
-      "selector": "0x1ef2fdc8"
-    },
-    {
-      "name": "operatorCreateHoldByPartition",
-      "selector": "0xc6062c3c"
-    },
-    {
-      "name": "protectedCreateHoldByPartition",
-      "selector": "0xc17f3554"
-    },
-    {
-      "name": "reclaimHoldByPartition",
-      "selector": "0xb437969e"
-    },
-    {
-      "name": "releaseHoldByPartition",
-      "selector": "0xf8bafc1c"
-    }
-  ],
-  "HoldTokenHolderTimeTravel": [
+  "HoldTokenHolderFacetTimeTravel": [
     {
       "name": "createHoldByPartition",
       "selector": "0x5d23449e"
@@ -7172,7 +10100,7 @@ contractNames
       "selector": "0xf8bafc1c"
     }
   ],
-  "KycTimeTravel": [
+  "KycFacetTimeTravel": [
     {
       "name": "activateInternalKyc",
       "selector": "0xfbb08f50"
@@ -7226,7 +10154,7 @@ contractNames
       "selector": "0x12283191"
     }
   ],
-  "LockTimeTravel": [
+  "LockFacetTimeTravel": [
     {
       "name": "getLockCountFor",
       "selector": "0x4f131ba4"
@@ -7314,7 +10242,7 @@ contractNames
       "selector": "0x3f4ba83a"
     }
   ],
-  "ProtectedPartitionsTimeTravel": [
+  "ProtectedPartitionsFacetTimeTravel": [
     {
       "name": "arePartitionsProtected",
       "selector": "0xa151c19f"
@@ -7352,7 +10280,7 @@ contractNames
       "selector": "0x1277b323"
     }
   ],
-  "ScheduledBalanceAdjustmentsTimeTravel": [
+  "ScheduledBalanceAdjustmentsFacetTimeTravel": [
     {
       "name": "getScheduledBalanceAdjustments",
       "selector": "0xcb884d41"
@@ -7378,7 +10306,7 @@ contractNames
       "selector": "0x2de241e3"
     }
   ],
-  "ScheduledSnapshotsTimeTravel": [
+  "ScheduledSnapshotsFacetTimeTravel": [
     {
       "name": "getScheduledSnapshots",
       "selector": "0xca21c53a"
@@ -7404,7 +10332,7 @@ contractNames
       "selector": "0xa19e91fe"
     }
   ],
-  "ScheduledTasksTimeTravel": [
+  "ScheduledTasksFacetTimeTravel": [
     {
       "name": "getScheduledTasks",
       "selector": "0xdcff09ba"
@@ -7438,7 +10366,7 @@ contractNames
       "selector": "0x28a5d769"
     }
   ],
-  "SnapshotsTimeTravel": [
+  "SnapshotsFacetTimeTravel": [
     {
       "name": "balanceOfAtSnapshot",
       "selector": "0x8e00ae2e"
@@ -7471,6 +10399,14 @@ contractNames
       "name": "getStaticResolverKey",
       "selector": "0x1ef2fdc8"
     },
+    {
+      "name": "getTokenHoldersAtSnapshot",
+      "selector": "0xd22a73df"
+    },
+    {
+      "name": "getTotalTokenHoldersAtSnapshot",
+      "selector": "0x867126e1"
+    },
     {
       "name": "heldBalanceOfAtSnapshot",
       "selector": "0xb52e39aa"
@@ -7504,7 +10440,7 @@ contractNames
       "selector": "0x9657ddb9"
     }
   ],
-  "SsiManagementTimeTravel": [
+  "SsiManagementFacetTimeTravel": [
     {
       "name": "addIssuer",
       "selector": "0x20694db0"
@@ -7546,7 +10482,7 @@ contractNames
       "selector": "0xbb3daeaf"
     }
   ],
-  "TransferAndLockTimeTravel": [
+  "TransferAndLockFacetTimeTravel": [
     {
       "name": "getStaticFunctionSelectors",
       "selector": "0xc1f0d742"
@@ -7581,10 +10517,18 @@ contractNames
       "name": "blockTimestamp",
       "selector": "0xadb61832"
     },
+    {
+      "name": "changeSystemBlocknumber",
+      "selector": "0x4dd6b375"
+    },
     {
       "name": "changeSystemTimestamp",
       "selector": "0xc0f0f67e"
     },
+    {
+      "name": "resetSystemBlocknumber",
+      "selector": "0x64b677a4"
+    },
     {
       "name": "resetSystemTimestamp",
       "selector": "0x8f145250"
@@ -7595,6 +10539,10 @@ contractNames
       "name": "blockTimestamp",
       "selector": "0xadb61832"
     },
+    {
+      "name": "changeSystemBlocknumber",
+      "selector": "0x4dd6b375"
+    },
     {
       "name": "changeSystemTimestamp",
       "selector": "0xc0f0f67e"
@@ -7615,6 +10563,10 @@ contractNames
       "name": "getStaticResolverKey",
       "selector": "0x1ef2fdc8"
     },
+    {
+      "name": "resetSystemBlocknumber",
+      "selector": "0x64b677a4"
+    },
     {
       "name": "resetSystemTimestamp",
       "selector": "0x8f145250"
diff --git a/packages/ats/contracts/package.json b/packages/ats/contracts/package.json
index 5f4658dca..443edc572 100644
--- a/packages/ats/contracts/package.json
+++ b/packages/ats/contracts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hashgraph/asset-tokenization-contracts",
-    "version": "1.16.0",
+    "version": "1.16.1",
     "type": "commonjs",
     "main": "./build/typechain-types/index.js",
     "files": [
@@ -88,7 +88,10 @@
         "typescript": "^5.8.2"
     },
     "overrides": {
-        "@typechain/ethers-v5": "^11.1.2",
         "ws": "^8.15.0"
+    },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org"
     }
 }
diff --git a/packages/ats/contracts/scripts/businessLogicResolver.ts b/packages/ats/contracts/scripts/businessLogicResolver.ts
index a4694dd58..582dfa833 100644
--- a/packages/ats/contracts/scripts/businessLogicResolver.ts
+++ b/packages/ats/contracts/scripts/businessLogicResolver.ts
@@ -241,44 +241,44 @@ export interface DeployedBusinessLogics {
     businessLogicResolver: IStaticFunctionSelectors
     factory: IStaticFunctionSelectors
     diamondFacet: IStaticFunctionSelectors
-    accessControl: IStaticFunctionSelectors
-    controlList: IStaticFunctionSelectors
-    kyc: IStaticFunctionSelectors
-    ssiManagement: IStaticFunctionSelectors
-    corporateActions: IStaticFunctionSelectors
-    pause: IStaticFunctionSelectors
-    ERC20: IStaticFunctionSelectors
-    ERC20Permit: IStaticFunctionSelectors
-    ERC20Votes: IStaticFunctionSelectors
-    ERC1644: IStaticFunctionSelectors
+    accessControlFacet: IStaticFunctionSelectors
+    controlListFacet: IStaticFunctionSelectors
+    kycFacet: IStaticFunctionSelectors
+    ssiManagementFacet: IStaticFunctionSelectors
+    corporateActionsFacet: IStaticFunctionSelectors
+    pauseFacet: IStaticFunctionSelectors
+    ERC20Facet: IStaticFunctionSelectors
+    ERC20PermitFacet: IStaticFunctionSelectors
+    ERC20Votes: IStaticFunctionSelectors //TODO
+    ERC1644Facet: IStaticFunctionSelectors
     erc1410ReadFacet: IStaticFunctionSelectors
     erc1410ManagementFacet: IStaticFunctionSelectors
     erc1410TokenHolderFacet: IStaticFunctionSelectors
-    ERC1594: IStaticFunctionSelectors
-    ERC1643: IStaticFunctionSelectors
-    equityUSA: IStaticFunctionSelectors
-    bondUSA: IStaticFunctionSelectors
-    bondUSARead: IStaticFunctionSelectors
-    Snapshots: IStaticFunctionSelectors
-    scheduledSnapshots: IStaticFunctionSelectors
-    scheduledBalanceAdjustments: IStaticFunctionSelectors
-    scheduledTasks: IStaticFunctionSelectors
-    Cap: IStaticFunctionSelectors
-    Lock: IStaticFunctionSelectors
-    transferAndLock: IStaticFunctionSelectors
-    adjustBalances: IStaticFunctionSelectors
-    protectedPartitions: IStaticFunctionSelectors
+    ERC1594Facet: IStaticFunctionSelectors
+    ERC1643Facet: IStaticFunctionSelectors
+    equityUSAFacet: IStaticFunctionSelectors
+    bondUSAFacet: IStaticFunctionSelectors
+    bondUSARead: IStaticFunctionSelectors //TODO
+    SnapshotsFacet: IStaticFunctionSelectors
+    scheduledSnapshotsFacet: IStaticFunctionSelectors
+    scheduledBalanceAdjustmentsFacet: IStaticFunctionSelectors
+    scheduledTasksFacet: IStaticFunctionSelectors
+    CapFacet: IStaticFunctionSelectors
+    LockFacet: IStaticFunctionSelectors
+    transferAndLockFacet: IStaticFunctionSelectors
+    adjustBalancesFacet: IStaticFunctionSelectors
+    protectedPartitionsFacet: IStaticFunctionSelectors
     holdReadFacet: IStaticFunctionSelectors
     holdManagementFacet: IStaticFunctionSelectors
     holdTokenHolderFacet: IStaticFunctionSelectors
-    externalPauseManagement: IStaticFunctionSelectors
-    externalControlListManagement: IStaticFunctionSelectors
-    externalKycListManagement: IStaticFunctionSelectors
-    freeze: IStaticFunctionSelectors
+    externalPauseManagementFacet: IStaticFunctionSelectors
+    externalControlListManagementFacet: IStaticFunctionSelectors
+    externalKycListManagementFacet: IStaticFunctionSelectors
+    freezeFacet: IStaticFunctionSelectors
     ERC3643Management: IStaticFunctionSelectors
     ERC3643Operations: IStaticFunctionSelectors
     ERC3643Read: IStaticFunctionSelectors
-    ERC3643Batch: IStaticFunctionSelectors
+    ERC3643BatchFacet: IStaticFunctionSelectors
 }
 
 export let businessLogicResolver: IBusinessLogicResolver
diff --git a/packages/ats/contracts/scripts/commands/CreateConfigurationsForDeployedContractsCommand.ts b/packages/ats/contracts/scripts/commands/CreateConfigurationsForDeployedContractsCommand.ts
index baef4a060..acf90d51b 100644
--- a/packages/ats/contracts/scripts/commands/CreateConfigurationsForDeployedContractsCommand.ts
+++ b/packages/ats/contracts/scripts/commands/CreateConfigurationsForDeployedContractsCommand.ts
@@ -230,8 +230,8 @@ export default class CreateConfigurationsForDeployedContractsCommand extends Bas
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             deployer: _,
             businessLogicResolver,
-            equityUsa,
-            bondUsa,
+            equityUsaFacet,
+            bondUsaFacet,
             ...contractListToRegister
         } = deployedContractList
 
@@ -250,12 +250,12 @@ export default class CreateConfigurationsForDeployedContractsCommand extends Bas
             signer,
             overrides,
         })
-        this.equityUsaAddress = equityUsa.address
+        this.equityUsaAddress = equityUsaFacet.address
         this.excludeEquityAddresses = [deployedContractList.bondUsaRead.address]
-        this.bondUsaAddress = bondUsa.address
+        this.bondUsaAddress = bondUsaFacet.address
         this.excludeBondAddresses = [
-            deployedContractList.adjustBalances.address,
-            deployedContractList.scheduledBalanceAdjustments.address,
+            deployedContractList.adjustBalancesFacet.address,
+            deployedContractList.scheduledBalanceAdjustmentsFacet.address,
         ]
     }
 
diff --git a/packages/ats/contracts/scripts/constants.ts b/packages/ats/contracts/scripts/constants.ts
index a6c4bd2c2..ee415629a 100644
--- a/packages/ats/contracts/scripts/constants.ts
+++ b/packages/ats/contracts/scripts/constants.ts
@@ -389,6 +389,29 @@ export const MESSAGES = {
     },
 }
 
+// * Time periods (in seconds and milliseconds)
+export const TIME_PERIODS_S = {
+    SECOND: 1,
+    MINUTE: 60,
+    HOUR: 60 * 60,
+    DAY: 24 * 60 * 60,
+    WEEK: 7 * 24 * 60 * 60,
+    MONTH: 30 * 24 * 60 * 60,
+    QUARTER: 90 * 24 * 60 * 60,
+    YEAR: 365 * 24 * 60 * 60,
+}
+
+export const TIME_PERIODS_MS = {
+    SECOND: TIME_PERIODS_S.SECOND * 1000,
+    MINUTE: TIME_PERIODS_S.MINUTE * 1000,
+    HOUR: TIME_PERIODS_S.HOUR * 1000,
+    DAY: TIME_PERIODS_S.DAY * 1000,
+    WEEK: TIME_PERIODS_S.WEEK * 1000,
+    MONTH: TIME_PERIODS_S.MONTH * 1000,
+    QUARTER: TIME_PERIODS_S.QUARTER * 1000,
+    YEAR: TIME_PERIODS_S.YEAR * 1000,
+}
+
 export const EIP1066_CODES = {
     // 0x0* Generic
     FAILURE: '0x00',
diff --git a/packages/ats/contracts/scripts/deploy.ts b/packages/ats/contracts/scripts/deploy.ts
index e79a67bc1..134e73fc0 100644
--- a/packages/ats/contracts/scripts/deploy.ts
+++ b/packages/ats/contracts/scripts/deploy.ts
@@ -210,100 +210,6 @@ import {
     ContractTransaction,
     Overrides,
 } from 'ethers'
-import {
-    AccessControlFacet__factory,
-    AccessControlFacetTimeTravel__factory,
-    AdjustBalances__factory,
-    AdjustBalancesTimeTravel__factory,
-    BondUSA__factory,
-    BondUSATimeTravel__factory,
-    BondUSARead__factory,
-    BondUSAReadTimeTravel__factory,
-    BusinessLogicResolver__factory,
-    Cap__factory,
-    CapTimeTravel__factory,
-    ControlList__factory,
-    ControlListTimeTravel__factory,
-    CorporateActions__factory,
-    CorporateActionsTimeTravel__factory,
-    DiamondFacet__factory,
-    EquityUSA__factory,
-    EquityUSATimeTravel__factory,
-    ERC1410ReadFacet__factory,
-    ERC1410ReadTimeTravel__factory,
-    ERC1410ManagementFacet__factory,
-    ERC1410ManagementTimeTravel__factory,
-    ERC1594__factory,
-    ERC1594TimeTravel__factory,
-    ERC1643__factory,
-    ERC1643TimeTravel__factory,
-    ERC1644__factory,
-    ERC1644TimeTravel__factory,
-    ERC20__factory,
-    ERC20Permit__factory,
-    ERC20PermitTimeTravel__factory,
-    ERC20TimeTravel__factory,
-    ERC20Votes__factory,
-    ERC20VotesTimeTravel__factory,
-    Factory__factory,
-    Kyc__factory,
-    KycTimeTravel__factory,
-    SsiManagement__factory,
-    SsiManagementTimeTravel__factory,
-    Lock__factory,
-    LockTimeTravel__factory,
-    HoldReadFacet__factory,
-    HoldReadTimeTravel__factory,
-    HoldManagementFacet__factory,
-    HoldManagementTimeTravel__factory,
-    HoldTokenHolderFacet__factory,
-    HoldTokenHolderTimeTravel__factory,
-    PauseFacet__factory,
-    PauseFacetTimeTravel__factory,
-    ProtectedPartitions__factory,
-    ProtectedPartitionsTimeTravel__factory,
-    ProxyAdmin__factory,
-    ScheduledBalanceAdjustments__factory,
-    ScheduledBalanceAdjustmentsTimeTravel__factory,
-    ScheduledSnapshots__factory,
-    ScheduledSnapshotsTimeTravel__factory,
-    ScheduledTasks__factory,
-    ScheduledTasksTimeTravel__factory,
-    Snapshots__factory,
-    SnapshotsTimeTravel__factory,
-    TransferAndLock__factory,
-    TransferAndLockTimeTravel__factory,
-    TransparentUpgradeableProxy__factory,
-    TimeTravel__factory,
-    ClearingTransferFacet__factory,
-    ClearingTransferFacetTimeTravel__factory,
-    ClearingRedeemFacet__factory,
-    ClearingRedeemFacetTimeTravel__factory,
-    ClearingHoldCreationFacet__factory,
-    ClearingHoldCreationFacetTimeTravel__factory,
-    ClearingReadFacet__factory,
-    ClearingReadFacetTimeTravel__factory,
-    ClearingActionsFacet__factory,
-    ClearingActionsFacetTimeTravel__factory,
-    ExternalPauseManagement__factory,
-    ExternalPauseManagementTimeTravel__factory,
-    ExternalControlListManagement__factory,
-    ExternalControlListManagementTimeTravel__factory,
-    ExternalKycListManagement__factory,
-    ExternalKycListManagementTimeTravel__factory,
-    ERC1410TokenHolderFacet__factory,
-    ERC1410TokenHolderTimeTravel__factory,
-    ERC3643ManagementFacet__factory,
-    ERC3643ManagementTimeTravel__factory,
-    ERC3643ReadFacet__factory,
-    ERC3643ReadTimeTravel__factory,
-    ERC3643OperationsFacet__factory,
-    ERC3643OperationsTimeTravel__factory,
-    ERC3643BatchFacet__factory,
-    ERC3643BatchTimeTravel__factory,
-    FreezeFacet__factory,
-    FreezeFacetTimeTravel__factory,
-} from '@typechain'
 import Configuration from '@configuration'
 import DeployContractCommand from './commands/DeployContractCommand'
 import DeployContractWithLibraryCommand from './commands/DeployContractWithLibraryCommand'
@@ -328,6 +234,100 @@ import {
     CreateConfigurationsForDeployedContractsResult,
 } from '@scripts'
 import Environment from './Environment'
+import {
+    Factory__factory,
+    BusinessLogicResolver__factory,
+    AccessControlFacet__factory,
+    AccessControlFacetTimeTravel__factory,
+    CapFacet__factory,
+    CapFacetTimeTravel__factory,
+    ControlListFacet__factory,
+    ControlListFacetTimeTravel__factory,
+    KycFacet__factory,
+    KycFacetTimeTravel__factory,
+    SsiManagementFacet__factory,
+    SsiManagementFacetTimeTravel__factory,
+    PauseFacet__factory,
+    PauseFacetTimeTravel__factory,
+    LockFacet__factory,
+    LockFacetTimeTravel__factory,
+    HoldReadFacet__factory,
+    HoldReadFacetTimeTravel__factory,
+    HoldManagementFacet__factory,
+    HoldManagementFacetTimeTravel__factory,
+    HoldTokenHolderFacet__factory,
+    HoldTokenHolderFacetTimeTravel__factory,
+    ERC20Facet__factory,
+    ERC20FacetTimeTravel__factory,
+    ERC20PermitFacet__factory,
+    ERC20PermitFacetTimeTravel__factory,
+    ERC20Votes__factory,
+    ERC20VotesTimeTravel__factory,
+    ERC1410ReadFacet__factory,
+    ERC1410ReadFacetTimeTravel__factory,
+    ERC1410ManagementFacet__factory,
+    ERC1410ManagementFacetTimeTravel__factory,
+    ERC1410TokenHolderFacet__factory,
+    ERC1410TokenHolderFacetTimeTravel__factory,
+    ERC1594Facet__factory,
+    ERC1594FacetTimeTravel__factory,
+    ERC1643Facet__factory,
+    ERC1643FacetTimeTravel__factory,
+    ERC1644Facet__factory,
+    ERC1644FacetTimeTravel__factory,
+    SnapshotsFacet__factory,
+    SnapshotsFacetTimeTravel__factory,
+    DiamondFacet__factory,
+    EquityUSAFacet__factory,
+    EquityUSAFacetTimeTravel__factory,
+    BondUSAFacet__factory,
+    BondUSAFacetTimeTravel__factory,
+    BondUSARead__factory,
+    BondUSAReadTimeTravel__factory,
+    ScheduledSnapshotsFacet__factory,
+    ScheduledSnapshotsFacetTimeTravel__factory,
+    ScheduledBalanceAdjustmentsFacet__factory,
+    ScheduledBalanceAdjustmentsFacetTimeTravel__factory,
+    ScheduledTasksFacet__factory,
+    ScheduledTasksFacetTimeTravel__factory,
+    CorporateActionsFacet__factory,
+    CorporateActionsFacetTimeTravel__factory,
+    TransferAndLockFacet__factory,
+    TransferAndLockFacetTimeTravel__factory,
+    AdjustBalancesFacet__factory,
+    AdjustBalancesFacetTimeTravel__factory,
+    ProtectedPartitionsFacet__factory,
+    ProtectedPartitionsFacetTimeTravel__factory,
+    ClearingTransferFacet__factory,
+    ClearingTransferFacetTimeTravel__factory,
+    ClearingRedeemFacet__factory,
+    ClearingRedeemFacetTimeTravel__factory,
+    ClearingHoldCreationFacet__factory,
+    ClearingHoldCreationFacetTimeTravel__factory,
+    ClearingReadFacet__factory,
+    ClearingReadFacetTimeTravel__factory,
+    ClearingActionsFacet__factory,
+    ClearingActionsFacetTimeTravel__factory,
+    ExternalPauseManagementFacet__factory,
+    ExternalPauseManagementFacetTimeTravel__factory,
+    ExternalControlListManagementFacet__factory,
+    ExternalControlListManagementFacetTimeTravel__factory,
+    ExternalKycListManagementFacet__factory,
+    ExternalKycListManagementFacetTimeTravel__factory,
+    ERC3643ManagementFacet__factory,
+    ERC3643ManagementTimeTravel__factory,
+    ERC3643OperationsFacet__factory,
+    ERC3643OperationsTimeTravel__factory,
+    ERC3643ReadFacet__factory,
+    ERC3643ReadTimeTravel__factory,
+    ERC3643BatchFacet__factory,
+    ERC3643BatchFacetTimeTravel__factory,
+    FreezeFacet__factory,
+    FreezeFacetTimeTravel__factory,
+    TimeTravel__factory,
+    ProxyAdmin__factory,
+    TransparentUpgradeableProxy__factory,
+} from '@typechain'
 
 export let environment = Environment.empty()
 
@@ -461,7 +461,7 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        accessControl: new DeployContractWithFactoryCommand({
+        accessControlFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new AccessControlFacet__factory(),
                 new AccessControlFacetTimeTravel__factory()
@@ -474,51 +474,53 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        cap: new DeployContractWithFactoryCommand({
+        capFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new Cap__factory(),
-                new CapTimeTravel__factory()
+                new CapFacet__factory(),
+                new CapFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.Cap.addresses?.[network]
+                ? Configuration.contracts.CapFacet.addresses?.[network]
                 : undefined,
             overrides,
         }),
-        controlList: new DeployContractWithFactoryCommand({
+        controlListFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ControlList__factory(),
-                new ControlListTimeTravel__factory()
+                new ControlListFacet__factory(),
+                new ControlListFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ControlList.addresses?.[network]
+                ? Configuration.contracts.ControlListFacet.addresses?.[network]
                 : undefined,
             overrides,
         }),
-        kyc: new DeployContractWithFactoryCommand({
+        kycFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new Kyc__factory(),
-                new KycTimeTravel__factory()
+                new KycFacet__factory(),
+                new KycFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.Kyc.addresses?.[network]
+                ? Configuration.contracts.KycFacet.addresses?.[network]
                 : undefined,
             overrides,
         }),
-        ssiManagement: new DeployContractWithFactoryCommand({
+        ssiManagementFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new SsiManagement__factory(),
-                new SsiManagementTimeTravel__factory()
+                new SsiManagementFacet__factory(),
+                new SsiManagementFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.SsiManagement.addresses?.[network]
+                ? Configuration.contracts.SsiManagementFacet.addresses?.[
+                      network
+                  ]
                 : undefined,
             overrides,
         }),
-        pause: new DeployContractWithFactoryCommand({
+        pauseFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new PauseFacet__factory(),
                 new PauseFacetTimeTravel__factory()
@@ -529,21 +531,21 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        lock: new DeployContractWithFactoryCommand({
+        lockFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new Lock__factory(),
-                new LockTimeTravel__factory()
+                new LockFacet__factory(),
+                new LockFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.Lock.addresses?.[network]
+                ? Configuration.contracts.LockFacet.addresses?.[network]
                 : undefined,
             overrides,
         }),
         holdReadFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new HoldReadFacet__factory(),
-                new HoldReadTimeTravel__factory()
+                new HoldReadFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
@@ -554,7 +556,7 @@ export async function deployAtsContracts({
         holdManagementFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new HoldManagementFacet__factory(),
-                new HoldManagementTimeTravel__factory()
+                new HoldManagementFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
@@ -567,7 +569,7 @@ export async function deployAtsContracts({
         holdTokenHolderFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new HoldTokenHolderFacet__factory(),
-                new HoldTokenHolderTimeTravel__factory()
+                new HoldTokenHolderFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
@@ -577,25 +579,25 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        erc20: new DeployContractWithFactoryCommand({
+        erc20Facet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ERC20__factory(),
-                new ERC20TimeTravel__factory()
+                new ERC20Facet__factory(),
+                new ERC20FacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ERC20.addresses?.[network]
+                ? Configuration.contracts.ERC20Facet.addresses?.[network]
                 : undefined,
             overrides,
         }),
-        erc20Permit: new DeployContractWithFactoryCommand({
+        erc20PermitFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ERC20Permit__factory(),
-                new ERC20PermitTimeTravel__factory()
+                new ERC20PermitFacet__factory(),
+                new ERC20PermitFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ERC20Permit.addresses?.[network]
+                ? Configuration.contracts.ERC20PermitFacet.addresses?.[network]
                 : undefined,
             overrides,
         }),
@@ -613,7 +615,7 @@ export async function deployAtsContracts({
         erc1410ReadFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new ERC1410ReadFacet__factory(),
-                new ERC1410ReadTimeTravel__factory()
+                new ERC1410ReadFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
@@ -624,7 +626,7 @@ export async function deployAtsContracts({
         erc1410ManagementFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new ERC1410ManagementFacet__factory(),
-                new ERC1410ManagementTimeTravel__factory()
+                new ERC1410ManagementFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
@@ -637,7 +639,7 @@ export async function deployAtsContracts({
         erc1410TokenHolderFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new ERC1410TokenHolderFacet__factory(),
-                new ERC1410TokenHolderTimeTravel__factory()
+                new ERC1410TokenHolderFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
@@ -647,47 +649,47 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        erc1594: new DeployContractWithFactoryCommand({
+        erc1594Facet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ERC1594__factory(),
-                new ERC1594TimeTravel__factory()
+                new ERC1594Facet__factory(),
+                new ERC1594FacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ERC1594.addresses?.[network]
+                ? Configuration.contracts.ERC1594Facet.addresses?.[network]
                 : undefined,
             overrides,
         }),
-        erc1643: new DeployContractWithFactoryCommand({
+        erc1643Facet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ERC1643__factory(),
-                new ERC1643TimeTravel__factory()
+                new ERC1643Facet__factory(),
+                new ERC1643FacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ERC1643.addresses?.[network]
+                ? Configuration.contracts.ERC1643Facet.addresses?.[network]
                 : undefined,
             overrides,
         }),
-        erc1644: new DeployContractWithFactoryCommand({
+        erc1644Facet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ERC1644__factory(),
-                new ERC1644TimeTravel__factory()
+                new ERC1644Facet__factory(),
+                new ERC1644FacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ERC1644.addresses?.[network]
+                ? Configuration.contracts.ERC1644Facet.addresses?.[network]
                 : undefined,
             overrides,
         }),
-        snapshots: new DeployContractWithFactoryCommand({
+        snapshotsFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new Snapshots__factory(),
-                new SnapshotsTimeTravel__factory()
+                new SnapshotsFacet__factory(),
+                new SnapshotsFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.Snapshots.addresses?.[network]
+                ? Configuration.contracts.SnapshotsFacet.addresses?.[network]
                 : undefined,
             overrides,
         }),
@@ -699,25 +701,25 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        equityUsa: new DeployContractWithFactoryCommand({
+        equityUsaFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new EquityUSA__factory(),
-                new EquityUSATimeTravel__factory()
+                new EquityUSAFacet__factory(),
+                new EquityUSAFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.EquityUSA.addresses?.[network]
+                ? Configuration.contracts.EquityUSAFacet.addresses?.[network]
                 : undefined,
             overrides,
         }),
-        bondUsa: new DeployContractWithFactoryCommand({
+        bondUsaFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new BondUSA__factory(),
-                new BondUSATimeTravel__factory()
+                new BondUSAFacet__factory(),
+                new BondUSAFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.BondUSA.addresses?.[network]
+                ? Configuration.contracts.BondUSAFacet.addresses?.[network]
                 : undefined,
             overrides,
         }),
@@ -732,83 +734,91 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        scheduledSnapshots: new DeployContractWithFactoryCommand({
+        scheduledSnapshotsFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ScheduledSnapshots__factory(),
-                new ScheduledSnapshotsTimeTravel__factory()
+                new ScheduledSnapshotsFacet__factory(),
+                new ScheduledSnapshotsFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ScheduledSnapshots.addresses?.[
+                ? Configuration.contracts.ScheduledSnapshotsFacet.addresses?.[
                       network
                   ]
                 : undefined,
             overrides,
         }),
-        scheduledBalanceAdjustments: new DeployContractWithFactoryCommand({
+        scheduledBalanceAdjustmentsFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ScheduledBalanceAdjustments__factory(),
-                new ScheduledBalanceAdjustmentsTimeTravel__factory()
+                new ScheduledBalanceAdjustmentsFacet__factory(),
+                new ScheduledBalanceAdjustmentsFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ScheduledBalanceAdjustments
+                ? Configuration.contracts.ScheduledBalanceAdjustmentsFacet
                       .addresses?.[network]
                 : undefined,
             overrides,
         }),
-        scheduledTasks: new DeployContractWithFactoryCommand({
+        scheduledTasksFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ScheduledTasks__factory(),
-                new ScheduledTasksTimeTravel__factory()
+                new ScheduledTasksFacet__factory(),
+                new ScheduledTasksFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ScheduledTasks.addresses?.[network]
+                ? Configuration.contracts.ScheduledTasksFacet.addresses?.[
+                      network
+                  ]
                 : undefined,
             overrides,
         }),
-        corporateActions: new DeployContractWithFactoryCommand({
+        corporateActionsFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new CorporateActions__factory(),
-                new CorporateActionsTimeTravel__factory()
+                new CorporateActionsFacet__factory(),
+                new CorporateActionsFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.CorporateActions.addresses?.[network]
+                ? Configuration.contracts.CorporateActionsFacet.addresses?.[
+                      network
+                  ]
                 : undefined,
             overrides,
         }),
-        transferAndLock: new DeployContractWithFactoryCommand({
+        transferAndLockFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new TransferAndLock__factory(),
-                new TransferAndLockTimeTravel__factory()
+                new TransferAndLockFacet__factory(),
+                new TransferAndLockFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.TransferAndLock.addresses?.[network]
+                ? Configuration.contracts.TransferAndLockFacet.addresses?.[
+                      network
+                  ]
                 : undefined,
             overrides,
         }),
-        adjustBalances: new DeployContractWithFactoryCommand({
+        adjustBalancesFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new AdjustBalances__factory(),
-                new AdjustBalancesTimeTravel__factory()
+                new AdjustBalancesFacet__factory(),
+                new AdjustBalancesFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.AdjustBalances.addresses?.[network]
+                ? Configuration.contracts.AdjustBalancesFacet.addresses?.[
+                      network
+                  ]
                 : undefined,
             overrides,
         }),
-        protectedPartitions: new DeployContractWithFactoryCommand({
+        protectedPartitionsFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ProtectedPartitions__factory(),
-                new ProtectedPartitionsTimeTravel__factory()
+                new ProtectedPartitionsFacet__factory(),
+                new ProtectedPartitionsFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ProtectedPartitions.addresses?.[
+                ? Configuration.contracts.ProtectedPartitionsFacet.addresses?.[
                       network
                   ]
                 : undefined,
@@ -877,41 +887,40 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        externalPauseManagement: new DeployContractWithFactoryCommand({
+        externalPauseManagementFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ExternalPauseManagement__factory(),
-                new ExternalPauseManagementTimeTravel__factory()
+                new ExternalPauseManagementFacet__factory(),
+                new ExternalPauseManagementFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ExternalPauseManagement.addresses?.[
-                      network
-                  ]
-                : undefined,
-            overrides,
-        }),
-        externalControlListManagement: new DeployContractWithFactoryCommand({
-            factory: getFactory(
-                new ExternalControlListManagement__factory(),
-                new ExternalControlListManagementTimeTravel__factory()
-            ),
-            signer,
-            deployedContract: useDeployed
-                ? Configuration.contracts.ExternalControlListManagement
+                ? Configuration.contracts.ExternalPauseManagementFacet
                       .addresses?.[network]
                 : undefined,
             overrides,
         }),
-        externalKycListManagement: new DeployContractWithFactoryCommand({
+        externalControlListManagementFacet:
+            new DeployContractWithFactoryCommand({
+                factory: getFactory(
+                    new ExternalControlListManagementFacet__factory(),
+                    new ExternalControlListManagementFacetTimeTravel__factory()
+                ),
+                signer,
+                deployedContract: useDeployed
+                    ? Configuration.contracts.ExternalControlListManagementFacet
+                          .addresses?.[network]
+                    : undefined,
+                overrides,
+            }),
+        externalKycListManagementFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
-                new ExternalKycListManagement__factory(),
-                new ExternalKycListManagementTimeTravel__factory()
+                new ExternalKycListManagementFacet__factory(),
+                new ExternalKycListManagementFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
-                ? Configuration.contracts.ExternalKycListManagement.addresses?.[
-                      network
-                  ]
+                ? Configuration.contracts.ExternalKycListManagementFacet
+                      .addresses?.[network]
                 : undefined,
             overrides,
         }),
@@ -955,7 +964,7 @@ export async function deployAtsContracts({
         erc3643BatchFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new ERC3643BatchFacet__factory(),
-                new ERC3643BatchTimeTravel__factory()
+                new ERC3643BatchFacetTimeTravel__factory()
             ),
             signer,
             deployedContract: useDeployed
@@ -963,7 +972,7 @@ export async function deployAtsContracts({
                 : undefined,
             overrides,
         }),
-        freeze: new DeployContractWithFactoryCommand({
+        freezeFacet: new DeployContractWithFactoryCommand({
             factory: getFactory(
                 new FreezeFacet__factory(),
                 new FreezeFacetTimeTravel__factory()
@@ -1001,18 +1010,18 @@ export async function deployAtsContracts({
                 )
                 return result
             }),
-            accessControl: await deployContractWithFactory(
-                commands.accessControl
+            accessControlFacet: await deployContractWithFactory(
+                commands.accessControlFacet
             ).then((result) => {
                 console.log(
-                    `AccessControl has been deployed successfully at ${result.address}`
+                    `AccessControlFacet has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            cap: await deployContractWithFactory(commands.cap).then(
+            capFacet: await deployContractWithFactory(commands.capFacet).then(
                 (result) => {
                     console.log(
-                        `Cap has been deployed successfully at ${result.address}`
+                        `CapFacet has been deployed successfully at ${result.address}`
                     )
                     console.log(
                         `Cap has been deployed successfully at ${result.address}`
@@ -1020,21 +1029,21 @@ export async function deployAtsContracts({
                     return result
                 }
             ),
-            controlList: await deployContractWithFactory(
-                commands.controlList
+            controlListFacet: await deployContractWithFactory(
+                commands.controlListFacet
             ).then((result) => {
                 console.log(
-                    `ControlList has been deployed successfully at ${result.address}`
+                    `ControlListFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `ControlList has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            kyc: await deployContractWithFactory(commands.kyc).then(
+            kycFacet: await deployContractWithFactory(commands.kycFacet).then(
                 (result) => {
                     console.log(
-                        `KYC has been deployed successfully at ${result.address}`
+                        `KYCFacet has been deployed successfully at ${result.address}`
                     )
                     console.log(
                         `KYC has been deployed successfully at ${result.address}`
@@ -1042,18 +1051,26 @@ export async function deployAtsContracts({
                     return result
                 }
             ),
-            ssiManagement: await deployContractWithFactory(
-                commands.ssiManagement
+            ssiManagementFacet: await deployContractWithFactory(
+                commands.ssiManagementFacet
             ).then((result) => {
                 console.log(
-                    `SSIManagement has been deployed successfully at ${result.address}`
+                    `SSIManagementFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `SSIManagement has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            pause: await deployContractWithFactory(commands.pause).then(
+            pauseFacet: await deployContractWithFactory(
+                commands.pauseFacet
+            ).then((result) => {
+                console.log(
+                    `PauseFacet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            lockFacet: await deployContractWithFactory(commands.lockFacet).then(
                 (result) => {
                     console.log(
                         `Pause has been deployed successfully at ${result.address}`
@@ -1064,22 +1081,11 @@ export async function deployAtsContracts({
                     return result
                 }
             ),
-            lock: await deployContractWithFactory(commands.lock).then(
-                (result) => {
-                    console.log(
-                        `Lock has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `Lock has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
             holdReadFacet: await deployContractWithFactory(
                 commands.holdReadFacet
             ).then((result) => {
                 console.log(
-                    `HoldRead has been deployed successfully at ${result.address}`
+                    `HoldReadFacet has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
@@ -1087,7 +1093,7 @@ export async function deployAtsContracts({
                 commands.holdManagementFacet
             ).then((result) => {
                 console.log(
-                    `HoldManagement has been deployed successfully at ${result.address}`
+                    `HoldManagementFacet has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
@@ -1095,21 +1101,18 @@ export async function deployAtsContracts({
                 commands.holdTokenHolderFacet
             ).then((result) => {
                 console.log(
-                    `HoldTokenHolder has been deployed successfully at ${result.address}`
+                    `HoldTokenHolderFacet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            erc20Facet: await deployContractWithFactory(
+                commands.erc20Facet
+            ).then((result) => {
+                console.log(
+                    `ERC20Facet has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            erc20: await deployContractWithFactory(commands.erc20).then(
-                (result) => {
-                    console.log(
-                        `ERC20 has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `ERC20 has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
             erc1410ReadFacet: await deployContractWithFactory(
                 commands.erc1410ReadFacet
             ).then((result) => {
@@ -1134,11 +1137,43 @@ export async function deployAtsContracts({
                 )
                 return result
             }),
-            erc20Permit: await deployContractWithFactory(
-                commands.erc20Permit
+            erc20PermitFacet: await deployContractWithFactory(
+                commands.erc20PermitFacet
+            ).then((result) => {
+                console.log(
+                    `ERC20PermitFacet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            erc1594Facet: await deployContractWithFactory(
+                commands.erc1594Facet
+            ).then((result) => {
+                console.log(
+                    `ERC1594Facet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            erc1643Facet: await deployContractWithFactory(
+                commands.erc1643Facet
+            ).then((result) => {
+                console.log(
+                    `ERC1643Facet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            erc1644Facet: await deployContractWithFactory(
+                commands.erc1644Facet
+            ).then((result) => {
+                console.log(
+                    `ERC1644Facet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            snapshotsFacet: await deployContractWithFactory(
+                commands.snapshotsFacet
             ).then((result) => {
                 console.log(
-                    `ERC20Permit has been deployed successfully at ${result.address}`
+                    `SnapshotsFacet has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
@@ -1150,50 +1185,6 @@ export async function deployAtsContracts({
                 )
                 return result
             }),
-            erc1594: await deployContractWithFactory(commands.erc1594).then(
-                (result) => {
-                    console.log(
-                        `ERC1594 has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `ERC1594 has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
-            erc1643: await deployContractWithFactory(commands.erc1643).then(
-                (result) => {
-                    console.log(
-                        `ERC1643 has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `ERC1643 has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
-            erc1644: await deployContractWithFactory(commands.erc1644).then(
-                (result) => {
-                    console.log(
-                        `ERC1644 has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `ERC1644 has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
-            snapshots: await deployContractWithFactory(commands.snapshots).then(
-                (result) => {
-                    console.log(
-                        `Snapshots has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `Snapshots has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
             diamondFacet: await deployContractWithFactory(
                 commands.diamondFacet
             ).then((result) => {
@@ -1205,28 +1196,7 @@ export async function deployAtsContracts({
                 )
                 return result
             }),
-            equityUsa: await deployContractWithFactory(commands.equityUsa).then(
-                (result) => {
-                    console.log(
-                        `EquityUSA has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `EquityUSA has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
-            bondUsa: await deployContractWithFactory(commands.bondUsa).then(
-                (result) => {
-                    console.log(
-                        `BondUSA has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `BondUSA has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
+
             bondUsaRead: await deployContractWithFactory(
                 commands.bondUsaRead
             ).then((result) => {
@@ -1238,77 +1208,93 @@ export async function deployAtsContracts({
                 )
                 return result
             }),
-            scheduledSnapshots: await deployContractWithFactory(
-                commands.scheduledSnapshots
+            equityUsaFacet: await deployContractWithFactory(
+                commands.equityUsaFacet
             ).then((result) => {
                 console.log(
-                    `ScheduledSnapshots has been deployed successfully at ${result.address}`
+                    `EquityUSAFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `ScheduledSnapshots has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            scheduledBalanceAdjustments: await deployContractWithFactory(
-                commands.scheduledBalanceAdjustments
+            bondUsaFacet: await deployContractWithFactory(
+                commands.bondUsaFacet
             ).then((result) => {
                 console.log(
-                    `ScheduledBalanceAdjustments has been deployed successfully at ${result.address}`
+                    `BondUSAFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `ScheduledBalanceAdjustments has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            scheduledTasks: await deployContractWithFactory(
-                commands.scheduledTasks
+            scheduledSnapshotsFacet: await deployContractWithFactory(
+                commands.scheduledSnapshotsFacet
             ).then((result) => {
                 console.log(
-                    `ScheduledTasks has been deployed successfully at ${result.address}`
+                    `ScheduledSnapshotsFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `ScheduledTasks has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            corporateActions: await deployContractWithFactory(
-                commands.corporateActions
+            scheduledBalanceAdjustmentsFacet: await deployContractWithFactory(
+                commands.scheduledBalanceAdjustmentsFacet
             ).then((result) => {
                 console.log(
-                    `CorporateActions has been deployed successfully at ${result.address}`
+                    `ScheduledBalanceAdjustmentsFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `CorporateActions has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            transferAndLock: await deployContractWithFactory(
-                commands.transferAndLock
+            scheduledTasksFacet: await deployContractWithFactory(
+                commands.scheduledTasksFacet
             ).then((result) => {
                 console.log(
-                    `TransferAndLock has been deployed successfully at ${result.address}`
+                    `ScheduledTasksFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `TransferAndLock has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            adjustBalances: await deployContractWithFactory(
-                commands.adjustBalances
+            corporateActionsFacet: await deployContractWithFactory(
+                commands.corporateActionsFacet
             ).then((result) => {
                 console.log(
-                    `AdjustBalances has been deployed successfully at ${result.address}`
+                    `CorporateActionsFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `AdjustBalances has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            protectedPartitions: await deployContractWithFactory(
-                commands.protectedPartitions
+            transferAndLockFacet: await deployContractWithFactory(
+                commands.transferAndLockFacet
             ).then((result) => {
                 console.log(
-                    `ProtectedPartitions has been deployed successfully at ${result.address}`
+                    `TransferAndLockFacet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            adjustBalancesFacet: await deployContractWithFactory(
+                commands.adjustBalancesFacet
+            ).then((result) => {
+                console.log(
+                    `AdjustBalancesFacet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            protectedPartitionsFacet: await deployContractWithFactory(
+                commands.protectedPartitionsFacet
+            ).then((result) => {
+                console.log(
+                    `ProtectedPartitionsFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `ProtectedPartitions has been deployed successfully at ${result.address}`
@@ -1370,33 +1356,33 @@ export async function deployAtsContracts({
                 )
                 return result
             }),
-            externalPauseManagement: await deployContractWithFactory(
-                commands.externalPauseManagement
+            externalPauseManagementFacet: await deployContractWithFactory(
+                commands.externalPauseManagementFacet
             ).then((result) => {
                 console.log(
-                    `ExternalPauseManagement has been deployed successfully at ${result.address}`
+                    `ExternalPauseManagementFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `ExternalPauseManagement has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            externalControlListManagement: await deployContractWithFactory(
-                commands.externalControlListManagement
+            externalControlListManagementFacet: await deployContractWithFactory(
+                commands.externalControlListManagementFacet
             ).then((result) => {
                 console.log(
-                    `ExternalControlListManagement has been deployed successfully at ${result.address}`
+                    `ExternalControlListManagementFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `ExternalControlListManagement has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            externalKycListManagement: await deployContractWithFactory(
-                commands.externalKycListManagement
+            externalKycListManagementFacet: await deployContractWithFactory(
+                commands.externalKycListManagementFacet
             ).then((result) => {
                 console.log(
-                    `ExternalKycListManagement has been deployed successfully at ${result.address}`
+                    `ExternalKycListManagementFacet has been deployed successfully at ${result.address}`
                 )
                 console.log(
                     `ExternalKycListManagement has been deployed successfully at ${result.address}`
@@ -1431,21 +1417,18 @@ export async function deployAtsContracts({
                 commands.erc3643BatchFacet
             ).then((result) => {
                 console.log(
-                    `ERC3643Batch has been deployed successfully at ${result.address}`
+                    `ERC3643BatchFacet has been deployed successfully at ${result.address}`
+                )
+                return result
+            }),
+            freezeFacet: await deployContractWithFactory(
+                commands.freezeFacet
+            ).then((result) => {
+                console.log(
+                    `FreezeFacet has been deployed successfully at ${result.address}`
                 )
                 return result
             }),
-            freeze: await deployContractWithFactory(commands.freeze).then(
-                (result) => {
-                    console.log(
-                        `Freeze has been deployed successfully at ${result.address}`
-                    )
-                    console.log(
-                        `Freeze has been deployed successfully at ${result.address}`
-                    )
-                    return result
-                }
-            ),
             timeTravel: commands.timeTravel
                 ? await deployContractWithFactory(commands.timeTravel).then(
                       (result) => {
diff --git a/packages/ats/contracts/scripts/deployEnvironmentByRpc.ts b/packages/ats/contracts/scripts/deployEnvironmentByRpc.ts
index a5965695f..20b6995e7 100644
--- a/packages/ats/contracts/scripts/deployEnvironmentByRpc.ts
+++ b/packages/ats/contracts/scripts/deployEnvironmentByRpc.ts
@@ -275,44 +275,44 @@ function buildEmptyEnvironment(): Environment {
             businessLogicResolver: {} as IStaticFunctionSelectors,
             factory: {} as IStaticFunctionSelectors,
             diamondFacet: {} as IStaticFunctionSelectors,
-            accessControl: {} as IStaticFunctionSelectors,
-            controlList: {} as IStaticFunctionSelectors,
-            kyc: {} as IStaticFunctionSelectors,
-            ssiManagement: {} as IStaticFunctionSelectors,
-            corporateActions: {} as IStaticFunctionSelectors,
-            pause: {} as IStaticFunctionSelectors,
-            ERC20: {} as IStaticFunctionSelectors,
-            ERC20Permit: {} as IStaticFunctionSelectors,
+            accessControlFacet: {} as IStaticFunctionSelectors,
+            controlListFacet: {} as IStaticFunctionSelectors,
+            kycFacet: {} as IStaticFunctionSelectors,
+            ssiManagementFacet: {} as IStaticFunctionSelectors,
+            corporateActionsFacet: {} as IStaticFunctionSelectors,
+            pauseFacet: {} as IStaticFunctionSelectors,
+            ERC20Facet: {} as IStaticFunctionSelectors,
+            ERC20PermitFacet: {} as IStaticFunctionSelectors,
             ERC20Votes: {} as IStaticFunctionSelectors,
-            ERC1644: {} as IStaticFunctionSelectors,
+            ERC1644Facet: {} as IStaticFunctionSelectors,
             erc1410ReadFacet: {} as IStaticFunctionSelectors,
             erc1410ManagementFacet: {} as IStaticFunctionSelectors,
             erc1410TokenHolderFacet: {} as IStaticFunctionSelectors,
-            ERC1594: {} as IStaticFunctionSelectors,
-            ERC1643: {} as IStaticFunctionSelectors,
-            equityUSA: {} as IStaticFunctionSelectors,
-            bondUSA: {} as IStaticFunctionSelectors,
+            ERC1594Facet: {} as IStaticFunctionSelectors,
+            ERC1643Facet: {} as IStaticFunctionSelectors,
+            equityUSAFacet: {} as IStaticFunctionSelectors,
+            bondUSAFacet: {} as IStaticFunctionSelectors,
             bondUSARead: {} as IStaticFunctionSelectors,
-            Snapshots: {} as IStaticFunctionSelectors,
-            scheduledSnapshots: {} as IStaticFunctionSelectors,
-            scheduledBalanceAdjustments: {} as IStaticFunctionSelectors,
-            scheduledTasks: {} as IStaticFunctionSelectors,
-            Cap: {} as IStaticFunctionSelectors,
-            Lock: {} as IStaticFunctionSelectors,
-            transferAndLock: {} as IStaticFunctionSelectors,
-            adjustBalances: {} as IStaticFunctionSelectors,
-            protectedPartitions: {} as IStaticFunctionSelectors,
+            SnapshotsFacet: {} as IStaticFunctionSelectors,
+            scheduledSnapshotsFacet: {} as IStaticFunctionSelectors,
+            scheduledBalanceAdjustmentsFacet: {} as IStaticFunctionSelectors,
+            scheduledTasksFacet: {} as IStaticFunctionSelectors,
+            CapFacet: {} as IStaticFunctionSelectors,
+            LockFacet: {} as IStaticFunctionSelectors,
+            transferAndLockFacet: {} as IStaticFunctionSelectors,
+            adjustBalancesFacet: {} as IStaticFunctionSelectors,
+            protectedPartitionsFacet: {} as IStaticFunctionSelectors,
             holdReadFacet: {} as IStaticFunctionSelectors,
             holdManagementFacet: {} as IStaticFunctionSelectors,
             holdTokenHolderFacet: {} as IStaticFunctionSelectors,
-            externalPauseManagement: {} as IStaticFunctionSelectors,
-            externalControlListManagement: {} as IStaticFunctionSelectors,
-            externalKycListManagement: {} as IStaticFunctionSelectors,
-            freeze: {} as IStaticFunctionSelectors,
+            externalPauseManagementFacet: {} as IStaticFunctionSelectors,
+            externalControlListManagementFacet: {} as IStaticFunctionSelectors,
+            externalKycListManagementFacet: {} as IStaticFunctionSelectors,
+            freezeFacet: {} as IStaticFunctionSelectors,
             ERC3643Management: {} as IStaticFunctionSelectors,
             ERC3643Operations: {} as IStaticFunctionSelectors,
             ERC3643Read: {} as IStaticFunctionSelectors,
-            ERC3643Batch: {} as IStaticFunctionSelectors,
+            ERC3643BatchFacet: {} as IStaticFunctionSelectors,
         },
         facetIdsEquities: [],
         facetVersionsEquities: [],
diff --git a/packages/ats/contracts/scripts/factory.ts b/packages/ats/contracts/scripts/factory.ts
index 8c2a3a0bc..f4e379370 100644
--- a/packages/ats/contracts/scripts/factory.ts
+++ b/packages/ats/contracts/scripts/factory.ts
@@ -273,6 +273,13 @@ export interface CouponDetailsData {
     firstCouponDate: number
 }
 
+export interface CouponData {
+    recordDate: number
+    executionDate: number
+    rate: number
+    period: number
+}
+
 export interface SecurityData {
     arePartitionsProtected: boolean
     isMultiPartition: boolean
diff --git a/packages/ats/contracts/scripts/results/DeployAtsContractsResult.ts b/packages/ats/contracts/scripts/results/DeployAtsContractsResult.ts
index d0731ee5b..878ede07f 100644
--- a/packages/ats/contracts/scripts/results/DeployAtsContractsResult.ts
+++ b/packages/ats/contracts/scripts/results/DeployAtsContractsResult.ts
@@ -207,39 +207,17 @@ import { Signer } from 'ethers'
 import {
     BusinessLogicResolver,
     AccessControlFacet,
-    AdjustBalances,
-    BondUSA,
     BondUSARead,
-    Cap,
-    ControlList,
-    CorporateActions,
     DiamondFacet,
-    EquityUSA,
     ERC1410ReadFacet,
     ERC1410ManagementFacet,
-    ERC1594,
-    ERC1643,
-    ERC1644,
-    ERC20,
     PauseFacet,
-    ScheduledBalanceAdjustments,
-    ScheduledSnapshots,
-    ScheduledTasks,
-    Snapshots,
-    TransferAndLock,
-    Lock,
-    ProtectedPartitions,
-    Kyc,
-    SsiManagement,
     ClearingTransferFacet,
     ClearingRedeemFacet,
     ClearingHoldCreationFacet,
     ClearingReadFacet,
     ClearingActionsFacet,
-    ExternalPauseManagement,
-    ExternalControlListManagement,
     TimeTravel,
-    ExternalKycListManagement,
     FreezeFacet,
     HoldReadFacet,
     HoldManagementFacet,
@@ -249,149 +227,171 @@ import {
     ERC3643OperationsFacet,
     ERC3643ReadFacet,
     ERC3643BatchFacet,
-    ERC20Permit,
+    CapFacet,
+    ControlListFacet,
+    KycFacet,
+    ERC20Facet,
+    ERC20PermitFacet,
+    ExternalPauseManagementFacet,
+    ExternalControlListManagementFacet,
+    ProtectedPartitionsFacet,
+    AdjustBalancesFacet,
+    BondUSAFacet,
+    CorporateActionsFacet,
+    EquityUSAFacet,
+    ERC1594Facet,
+    ERC1643Facet,
+    ERC1644Facet,
+    ExternalKycListManagementFacet,
+    LockFacet,
+    ScheduledBalanceAdjustmentsFacet,
+    ScheduledSnapshotsFacet,
+    ScheduledTasksFacet,
+    SnapshotsFacet,
+    SsiManagementFacet,
+    TransferAndLockFacet,
     ERC20Votes,
 } from '@typechain'
 import { DeployContractWithFactoryResult } from '../index'
 
 export interface DeployAtsContractsResultParams {
     businessLogicResolver: DeployContractWithFactoryResult<BusinessLogicResolver>
-    accessControl: DeployContractWithFactoryResult<AccessControlFacet>
-    cap: DeployContractWithFactoryResult<Cap>
-    controlList: DeployContractWithFactoryResult<ControlList>
-    kyc: DeployContractWithFactoryResult<Kyc>
-    ssiManagement: DeployContractWithFactoryResult<SsiManagement>
-    pause: DeployContractWithFactoryResult<PauseFacet>
-    erc20: DeployContractWithFactoryResult<ERC20>
+    accessControlFacet: DeployContractWithFactoryResult<AccessControlFacet>
+    capFacet: DeployContractWithFactoryResult<CapFacet>
+    controlListFacet: DeployContractWithFactoryResult<ControlListFacet>
+    kycFacet: DeployContractWithFactoryResult<KycFacet>
+    ssiManagementFacet: DeployContractWithFactoryResult<SsiManagementFacet>
+    pauseFacet: DeployContractWithFactoryResult<PauseFacet>
+    erc20Facet: DeployContractWithFactoryResult<ERC20Facet>
     erc1410ReadFacet: DeployContractWithFactoryResult<ERC1410ReadFacet>
     erc1410ManagementFacet: DeployContractWithFactoryResult<ERC1410ManagementFacet>
     erc1410TokenHolderFacet: DeployContractWithFactoryResult<ERC1410TokenHolderFacet>
-    erc20Permit: DeployContractWithFactoryResult<ERC20Permit>
+    erc20PermitFacet: DeployContractWithFactoryResult<ERC20PermitFacet>
     erc20Votes: DeployContractWithFactoryResult<ERC20Votes>
-    erc1594: DeployContractWithFactoryResult<ERC1594>
-    erc1643: DeployContractWithFactoryResult<ERC1643>
-    erc1644: DeployContractWithFactoryResult<ERC1644>
+    erc1594Facet: DeployContractWithFactoryResult<ERC1594Facet>
+    erc1643Facet: DeployContractWithFactoryResult<ERC1643Facet>
+    erc1644Facet: DeployContractWithFactoryResult<ERC1644Facet>
     diamondFacet: DeployContractWithFactoryResult<DiamondFacet>
-    equityUsa: DeployContractWithFactoryResult<EquityUSA>
-    bondUsa: DeployContractWithFactoryResult<BondUSA>
+    equityUsaFacet: DeployContractWithFactoryResult<EquityUSAFacet>
+    bondUsaFacet: DeployContractWithFactoryResult<BondUSAFacet>
     bondUsaRead: DeployContractWithFactoryResult<BondUSARead>
-    scheduledSnapshots: DeployContractWithFactoryResult<ScheduledSnapshots>
-    scheduledBalanceAdjustments: DeployContractWithFactoryResult<ScheduledBalanceAdjustments>
-    scheduledTasks: DeployContractWithFactoryResult<ScheduledTasks>
-    snapshots: DeployContractWithFactoryResult<Snapshots>
-    corporateActions: DeployContractWithFactoryResult<CorporateActions>
-    transferAndLock: DeployContractWithFactoryResult<TransferAndLock>
-    lock: DeployContractWithFactoryResult<Lock>
+    scheduledSnapshotsFacet: DeployContractWithFactoryResult<ScheduledSnapshotsFacet>
+    scheduledBalanceAdjustmentsFacet: DeployContractWithFactoryResult<ScheduledBalanceAdjustmentsFacet>
+    scheduledTasksFacet: DeployContractWithFactoryResult<ScheduledTasksFacet>
+    snapshotsFacet: DeployContractWithFactoryResult<SnapshotsFacet>
+    corporateActionsFacet: DeployContractWithFactoryResult<CorporateActionsFacet>
+    transferAndLockFacet: DeployContractWithFactoryResult<TransferAndLockFacet>
+    lockFacet: DeployContractWithFactoryResult<LockFacet>
     holdReadFacet: DeployContractWithFactoryResult<HoldReadFacet>
     holdManagementFacet: DeployContractWithFactoryResult<HoldManagementFacet>
     holdTokenHolderFacet: DeployContractWithFactoryResult<HoldTokenHolderFacet>
-    adjustBalances: DeployContractWithFactoryResult<AdjustBalances>
-    protectedPartitions: DeployContractWithFactoryResult<ProtectedPartitions>
+    adjustBalancesFacet: DeployContractWithFactoryResult<AdjustBalancesFacet>
+    protectedPartitionsFacet: DeployContractWithFactoryResult<ProtectedPartitionsFacet>
     clearingTransferFacet: DeployContractWithFactoryResult<ClearingTransferFacet>
     clearingRedeemFacet: DeployContractWithFactoryResult<ClearingRedeemFacet>
     clearingHoldCreationFacet: DeployContractWithFactoryResult<ClearingHoldCreationFacet>
     clearingReadFacet: DeployContractWithFactoryResult<ClearingReadFacet>
     clearingActionsFacet: DeployContractWithFactoryResult<ClearingActionsFacet>
-    externalPauseManagement: DeployContractWithFactoryResult<ExternalPauseManagement>
-    externalControlListManagement: DeployContractWithFactoryResult<ExternalControlListManagement>
-    externalKycListManagement: DeployContractWithFactoryResult<ExternalKycListManagement>
+    externalPauseManagementFacet: DeployContractWithFactoryResult<ExternalPauseManagementFacet>
+    externalControlListManagementFacet: DeployContractWithFactoryResult<ExternalControlListManagementFacet>
+    externalKycListManagementFacet: DeployContractWithFactoryResult<ExternalKycListManagementFacet>
     erc3643ManagementFacet: DeployContractWithFactoryResult<ERC3643ManagementFacet>
     erc3643OperationsFacet: DeployContractWithFactoryResult<ERC3643OperationsFacet>
     erc3643ReadFacet: DeployContractWithFactoryResult<ERC3643ReadFacet>
     erc3643BatchFacet: DeployContractWithFactoryResult<ERC3643BatchFacet>
-    freeze: DeployContractWithFactoryResult<FreezeFacet>
+    freezeFacet: DeployContractWithFactoryResult<FreezeFacet>
     timeTravel?: DeployContractWithFactoryResult<TimeTravel>
     deployer?: Signer
 }
 
 export default class DeployAtsContractsResult {
     public readonly businessLogicResolver: DeployContractWithFactoryResult<BusinessLogicResolver>
-    public readonly accessControl: DeployContractWithFactoryResult<AccessControlFacet>
-    public readonly cap: DeployContractWithFactoryResult<Cap>
-    public readonly controlList: DeployContractWithFactoryResult<ControlList>
-    public readonly kyc: DeployContractWithFactoryResult<Kyc>
-    public readonly ssiManagement: DeployContractWithFactoryResult<SsiManagement>
-    public readonly pause: DeployContractWithFactoryResult<PauseFacet>
-    public readonly erc20: DeployContractWithFactoryResult<ERC20>
+    public readonly accessControlFacet: DeployContractWithFactoryResult<AccessControlFacet>
+    public readonly capFacet: DeployContractWithFactoryResult<CapFacet>
+    public readonly controlListFacet: DeployContractWithFactoryResult<ControlListFacet>
+    public readonly kycFacet: DeployContractWithFactoryResult<KycFacet>
+    public readonly ssiManagementFacet: DeployContractWithFactoryResult<SsiManagementFacet>
+    public readonly pauseFacet: DeployContractWithFactoryResult<PauseFacet>
+    public readonly erc20Facet: DeployContractWithFactoryResult<ERC20Facet>
     public readonly erc1410ReadFacet: DeployContractWithFactoryResult<ERC1410ReadFacet>
     public readonly erc1410ManagementFacet: DeployContractWithFactoryResult<ERC1410ManagementFacet>
     public readonly erc1410TokenHolderFacet: DeployContractWithFactoryResult<ERC1410TokenHolderFacet>
-    public readonly erc20Permit: DeployContractWithFactoryResult<ERC20Permit>
+    public readonly erc20PermitFacet: DeployContractWithFactoryResult<ERC20PermitFacet>
     public readonly erc20Votes: DeployContractWithFactoryResult<ERC20Votes>
-    public readonly erc1594: DeployContractWithFactoryResult<ERC1594>
-    public readonly erc1643: DeployContractWithFactoryResult<ERC1643>
-    public readonly erc1644: DeployContractWithFactoryResult<ERC1644>
+    public readonly erc1594Facet: DeployContractWithFactoryResult<ERC1594Facet>
+    public readonly erc1643Facet: DeployContractWithFactoryResult<ERC1643Facet>
+    public readonly erc1644Facet: DeployContractWithFactoryResult<ERC1644Facet>
     public readonly diamondFacet: DeployContractWithFactoryResult<DiamondFacet>
-    public readonly equityUsa: DeployContractWithFactoryResult<EquityUSA>
-    public readonly bondUsa: DeployContractWithFactoryResult<BondUSA>
+    public readonly equityUsaFacet: DeployContractWithFactoryResult<EquityUSAFacet>
+    public readonly bondUsaFacet: DeployContractWithFactoryResult<BondUSAFacet>
     public readonly bondUsaRead: DeployContractWithFactoryResult<BondUSARead>
-    public readonly scheduledSnapshots: DeployContractWithFactoryResult<ScheduledSnapshots>
-    public readonly scheduledBalanceAdjustments: DeployContractWithFactoryResult<ScheduledBalanceAdjustments>
-    public readonly scheduledTasks: DeployContractWithFactoryResult<ScheduledTasks>
-    public readonly snapshots: DeployContractWithFactoryResult<Snapshots>
-    public readonly corporateActions: DeployContractWithFactoryResult<CorporateActions>
-    public readonly transferAndLock: DeployContractWithFactoryResult<TransferAndLock>
-    public readonly lock: DeployContractWithFactoryResult<Lock>
+    public readonly scheduledSnapshotsFacet: DeployContractWithFactoryResult<ScheduledSnapshotsFacet>
+    public readonly scheduledBalanceAdjustmentsFacet: DeployContractWithFactoryResult<ScheduledBalanceAdjustmentsFacet>
+    public readonly scheduledTasksFacet: DeployContractWithFactoryResult<ScheduledTasksFacet>
+    public readonly snapshotsFacet: DeployContractWithFactoryResult<SnapshotsFacet>
+    public readonly corporateActionsFacet: DeployContractWithFactoryResult<CorporateActionsFacet>
+    public readonly transferAndLockFacet: DeployContractWithFactoryResult<TransferAndLockFacet>
+    public readonly lockFacet: DeployContractWithFactoryResult<LockFacet>
     public readonly holdReadFacet: DeployContractWithFactoryResult<HoldReadFacet>
     public readonly holdManagementFacet: DeployContractWithFactoryResult<HoldManagementFacet>
     public readonly holdTokenHolderFacet: DeployContractWithFactoryResult<HoldTokenHolderFacet>
-    public readonly adjustBalances: DeployContractWithFactoryResult<AdjustBalances>
-    public readonly protectedPartitions: DeployContractWithFactoryResult<ProtectedPartitions>
+    public readonly adjustBalancesFacet: DeployContractWithFactoryResult<AdjustBalancesFacet>
+    public readonly protectedPartitionsFacet: DeployContractWithFactoryResult<ProtectedPartitionsFacet>
     public readonly clearingTransferFacet: DeployContractWithFactoryResult<ClearingTransferFacet>
     public readonly clearingRedeemFacet: DeployContractWithFactoryResult<ClearingRedeemFacet>
     public readonly clearingHoldCreationFacet: DeployContractWithFactoryResult<ClearingHoldCreationFacet>
     public readonly clearingReadFacet: DeployContractWithFactoryResult<ClearingReadFacet>
     public readonly clearingActionsFacet: DeployContractWithFactoryResult<ClearingActionsFacet>
-    public readonly externalPauseManagement: DeployContractWithFactoryResult<ExternalPauseManagement>
-    public readonly externalControlListManagement: DeployContractWithFactoryResult<ExternalControlListManagement>
-    public readonly externalKycListManagement: DeployContractWithFactoryResult<ExternalKycListManagement>
+    public readonly externalPauseManagementFacet: DeployContractWithFactoryResult<ExternalPauseManagementFacet>
+    public readonly externalControlListManagementFacet: DeployContractWithFactoryResult<ExternalControlListManagementFacet>
+    public readonly externalKycListManagementFacet: DeployContractWithFactoryResult<ExternalKycListManagementFacet>
     public readonly erc3643ManagementFacet: DeployContractWithFactoryResult<ERC3643ManagementFacet>
     public readonly erc3643OperationsFacet: DeployContractWithFactoryResult<ERC3643OperationsFacet>
     public readonly erc3643ReadFacet: DeployContractWithFactoryResult<ERC3643ReadFacet>
     public readonly erc3643BatchFacet: DeployContractWithFactoryResult<ERC3643BatchFacet>
-    public readonly freeze: DeployContractWithFactoryResult<FreezeFacet>
+    public readonly freezeFacet: DeployContractWithFactoryResult<FreezeFacet>
     public readonly timeTravel?: DeployContractWithFactoryResult<TimeTravel>
     public readonly deployer?: Signer
 
     constructor({
         businessLogicResolver,
-        accessControl,
-        cap,
-        controlList,
-        kyc,
-        ssiManagement,
-        pause,
-        erc20,
+        accessControlFacet,
+        capFacet,
+        controlListFacet,
+        kycFacet,
+        ssiManagementFacet,
+        pauseFacet,
+        erc20Facet,
         erc1410ReadFacet,
         erc1410ManagementFacet,
         erc1410TokenHolderFacet,
-        erc20Permit,
+        erc20PermitFacet,
         erc20Votes,
-        erc1594,
-        erc1643,
-        erc1644,
+        erc1594Facet,
+        erc1643Facet,
+        erc1644Facet,
         diamondFacet,
-        equityUsa,
-        bondUsa,
+        equityUsaFacet,
+        bondUsaFacet,
         bondUsaRead,
-        scheduledSnapshots,
-        scheduledBalanceAdjustments,
-        scheduledTasks,
-        snapshots,
-        corporateActions,
-        transferAndLock,
-        lock,
-        adjustBalances,
-        protectedPartitions,
+        scheduledSnapshotsFacet,
+        scheduledBalanceAdjustmentsFacet,
+        scheduledTasksFacet,
+        snapshotsFacet,
+        corporateActionsFacet,
+        transferAndLockFacet,
+        lockFacet,
+        adjustBalancesFacet,
+        protectedPartitionsFacet,
         clearingTransferFacet,
         clearingRedeemFacet,
         clearingHoldCreationFacet,
         clearingReadFacet,
         clearingActionsFacet,
-        externalPauseManagement,
-        externalControlListManagement,
-        externalKycListManagement,
-        freeze,
+        externalPauseManagementFacet,
+        externalControlListManagementFacet,
+        externalKycListManagementFacet,
+        freezeFacet,
         timeTravel,
         deployer,
         erc3643ManagementFacet,
@@ -403,50 +403,51 @@ export default class DeployAtsContractsResult {
         holdTokenHolderFacet,
     }: DeployAtsContractsResultParams) {
         this.businessLogicResolver = businessLogicResolver
-        this.accessControl = accessControl
-        this.cap = cap
-        this.controlList = controlList
-        this.kyc = kyc
-        this.ssiManagement = ssiManagement
-        this.pause = pause
-        this.erc20 = erc20
-        this.erc20Permit = erc20Permit
+        this.accessControlFacet = accessControlFacet
+        this.capFacet = capFacet
+        this.controlListFacet = controlListFacet
+        this.kycFacet = kycFacet
+        this.ssiManagementFacet = ssiManagementFacet
+        this.pauseFacet = pauseFacet
+        this.erc20Facet = erc20Facet
+        this.erc20PermitFacet = erc20PermitFacet
         this.erc20Votes = erc20Votes
         this.erc1410ReadFacet = erc1410ReadFacet
         this.erc1410ManagementFacet = erc1410ManagementFacet
         this.erc1410TokenHolderFacet = erc1410TokenHolderFacet
-        this.erc1594 = erc1594
-        this.erc1643 = erc1643
-        this.erc1644 = erc1644
+        this.erc1594Facet = erc1594Facet
+        this.erc1643Facet = erc1643Facet
+        this.erc1644Facet = erc1644Facet
         this.diamondFacet = diamondFacet
-        this.equityUsa = equityUsa
-        this.bondUsa = bondUsa
+        this.equityUsaFacet = equityUsaFacet
+        this.bondUsaFacet = bondUsaFacet
         this.bondUsaRead = bondUsaRead
-        this.scheduledSnapshots = scheduledSnapshots
-        this.scheduledBalanceAdjustments = scheduledBalanceAdjustments
-        this.scheduledTasks = scheduledTasks
-        this.snapshots = snapshots
-        this.corporateActions = corporateActions
-        this.transferAndLock = transferAndLock
-        this.lock = lock
+        this.scheduledSnapshotsFacet = scheduledSnapshotsFacet
+        this.scheduledBalanceAdjustmentsFacet = scheduledBalanceAdjustmentsFacet
+        this.scheduledTasksFacet = scheduledTasksFacet
+        this.snapshotsFacet = snapshotsFacet
+        this.corporateActionsFacet = corporateActionsFacet
+        this.transferAndLockFacet = transferAndLockFacet
+        this.lockFacet = lockFacet
         this.holdReadFacet = holdReadFacet
         this.holdManagementFacet = holdManagementFacet
         this.holdTokenHolderFacet = holdTokenHolderFacet
-        this.adjustBalances = adjustBalances
-        this.protectedPartitions = protectedPartitions
+        this.adjustBalancesFacet = adjustBalancesFacet
+        this.protectedPartitionsFacet = protectedPartitionsFacet
         this.clearingTransferFacet = clearingTransferFacet
         this.clearingRedeemFacet = clearingRedeemFacet
         this.clearingHoldCreationFacet = clearingHoldCreationFacet
         this.clearingReadFacet = clearingReadFacet
         this.clearingActionsFacet = clearingActionsFacet
-        this.externalPauseManagement = externalPauseManagement
-        this.externalControlListManagement = externalControlListManagement
-        this.externalKycListManagement = externalKycListManagement
+        this.externalPauseManagementFacet = externalPauseManagementFacet
+        this.externalControlListManagementFacet =
+            externalControlListManagementFacet
+        this.externalKycListManagementFacet = externalKycListManagementFacet
         this.erc3643ManagementFacet = erc3643ManagementFacet
         this.erc3643OperationsFacet = erc3643OperationsFacet
         this.erc3643ReadFacet = erc3643ReadFacet
         this.erc3643BatchFacet = erc3643BatchFacet
-        this.freeze = freeze
+        this.freezeFacet = freezeFacet
         this.timeTravel = timeTravel
         // Deployer
         this.deployer = deployer
diff --git a/packages/ats/contracts/tasks/deploy.ts b/packages/ats/contracts/tasks/deploy.ts
index 02ab0bd20..2430c166b 100644
--- a/packages/ats/contracts/tasks/deploy.ts
+++ b/packages/ats/contracts/tasks/deploy.ts
@@ -266,49 +266,49 @@ task(
         const {
             factory,
             businessLogicResolver,
-            accessControl,
-            cap,
-            controlList,
-            kyc,
-            ssiManagement,
-            pause,
-            erc20,
+            accessControlFacet,
+            capFacet,
+            controlListFacet,
+            kycFacet,
+            ssiManagementFacet,
+            pauseFacet,
+            erc20Facet,
             erc1410ReadFacet,
             erc1410ManagementFacet,
             erc1410TokenHolderFacet,
-            erc1594,
-            erc1643,
-            erc1644,
-            snapshots,
+            erc1594Facet,
+            erc1643Facet,
+            erc1644Facet,
+            snapshotsFacet,
             diamondFacet,
-            equityUsa,
-            bondUsa,
+            equityUsaFacet,
+            bondUsaFacet,
             bondUsaRead,
-            scheduledSnapshots,
-            scheduledBalanceAdjustments,
-            scheduledTasks,
-            corporateActions,
-            lock,
+            scheduledSnapshotsFacet,
+            scheduledBalanceAdjustmentsFacet,
+            scheduledTasksFacet,
+            corporateActionsFacet,
+            lockFacet,
             holdReadFacet,
             holdManagementFacet,
             holdTokenHolderFacet,
-            transferAndLock,
-            adjustBalances,
+            transferAndLockFacet,
+            adjustBalancesFacet,
             clearingActionsFacet,
             clearingTransferFacet,
             clearingRedeemFacet,
             clearingHoldCreationFacet,
             clearingReadFacet,
-            externalPauseManagement,
-            externalControlListManagement,
-            externalKycListManagement,
-            protectedPartitions,
+            externalPauseManagementFacet,
+            externalControlListManagementFacet,
+            externalKycListManagementFacet,
+            protectedPartitionsFacet,
             erc3643ManagementFacet,
             erc3643OperationsFacet,
             erc3643ReadFacet,
             erc3643BatchFacet,
-            freeze,
-            erc20Permit,
+            freezeFacet,
+            erc20PermitFacet,
         } = await deployAtsFullInfrastructure(
             new DeployAtsFullInfrastructureCommand({
                 signer: signer,
@@ -327,52 +327,53 @@ task(
             'Factory Proxy': factory.proxyAddress,
             'Factory Proxy Admin': factory.proxyAdminAddress,
             Factory: factory.address,
-            'Access Control': accessControl.address,
-            Cap: cap.address,
-            'Control List': controlList.address,
-            Kyc: kyc.address,
-            SsiManagement: ssiManagement.address,
-            Pause: pause.address,
-            ERC20: erc20.address,
-            ERC1410Read: erc1410ReadFacet.address,
-            ERC1410Management: erc1410ManagementFacet.address,
-            ERC1410TokenHolder: erc1410TokenHolderFacet.address,
-            ERC1594: erc1594.address,
-            ERC1643: erc1643.address,
-            ERC1644: erc1644.address,
-            Snapshots: snapshots.address,
+            'Access Control Facet': accessControlFacet.address,
+            'Cap Facet': capFacet.address,
+            'Control List Facet': controlListFacet.address,
+            'Kyc Facet': kycFacet.address,
+            'SsiManagement Facet': ssiManagementFacet.address,
+            'Pause Facet': pauseFacet.address,
+            'ERC20 Facet': erc20Facet.address,
+            'ERC1410 Read Facet': erc1410ReadFacet.address,
+            'ERC1410 Management Facet': erc1410ManagementFacet.address,
+            'ERC1410 TokenHolder Facet': erc1410TokenHolderFacet.address,
+            'ERC1594 Facet': erc1594Facet.address,
+            'ERC1643 Facet': erc1643Facet.address,
+            'ERC1644 Facet': erc1644Facet.address,
+            'Snapshots Facet': snapshotsFacet.address,
             'Diamond Facet': diamondFacet.address,
-            Equity: equityUsa.address,
-            Bond: bondUsa.address,
+            'Equity Facet': equityUsaFacet.address,
+            'Bond Facet': bondUsaFacet.address,
             BondRead: bondUsaRead.address,
-            'Scheduled Snapshots': scheduledSnapshots.address,
-            'Scheduled Balance Adjustments':
-                scheduledBalanceAdjustments.address,
-            'Scheduled Tasks': scheduledTasks.address,
-            'Corporate Actions': corporateActions.address,
-            Lock: lock.address,
+            'Scheduled Snapshots Facet': scheduledSnapshotsFacet.address,
+            'Scheduled Balance Adjustments Facet':
+                scheduledBalanceAdjustmentsFacet.address,
+            'Scheduled Tasks Facet': scheduledTasksFacet.address,
+            'Corporate Actions Facet': corporateActionsFacet.address,
+            'Lock Facet': lockFacet.address,
             'Hold Read Facet': holdReadFacet.address,
             'Hold Management Facet': holdManagementFacet.address,
             'Hold TokenHolder Facet': holdTokenHolderFacet.address,
-            'Transfer and Lock': transferAndLock.address,
-            'Adjust Balances': adjustBalances.address,
+            'Transfer and Lock Facet': transferAndLockFacet.address,
+            'Adjust Balances Facet': adjustBalancesFacet.address,
             'Clearing Action Facet': clearingActionsFacet.address,
             'Clearing Transfer Facet': clearingTransferFacet.address,
             'Clearing Redeem Facet': clearingRedeemFacet.address,
             'Clearing Hold Creation Facet': clearingHoldCreationFacet.address,
             'Clearing Read Facet': clearingReadFacet.address,
-            'External Pause Management Facet': externalPauseManagement.address,
+            'External Pause Management Facet':
+                externalPauseManagementFacet.address,
             'External Control List Management Facet':
-                externalControlListManagement.address,
+                externalControlListManagementFacet.address,
             'External Kyc List Management Facet':
-                externalKycListManagement.address,
-            'Protected Partitions': protectedPartitions.address,
+                externalKycListManagementFacet.address,
+            'Protected Partitions Facet': protectedPartitionsFacet.address,
             'ERC3643 Management Facet': erc3643ManagementFacet.address,
             'ERC3643 Operations Facet': erc3643OperationsFacet.address,
             'ERC3643 Read Facet': erc3643ReadFacet.address,
             'ERC3643 Batch Facet': erc3643BatchFacet.address,
-            Freeze: freeze.address,
-            ERC20Permit: erc20Permit.address,
+            'Freeze Facet': freezeFacet.address,
+            'ERC20Permit Facet': erc20PermitFacet.address,
         }
 
         const contractAddress = []
diff --git a/packages/ats/contracts/tasks/index.ts b/packages/ats/contracts/tasks/index.ts
index bbd19cdec..87a7428e6 100644
--- a/packages/ats/contracts/tasks/index.ts
+++ b/packages/ats/contracts/tasks/index.ts
@@ -220,3 +220,5 @@ export * from './transparentUpgradeableProxy'
 export * from './businessLogicResolver'
 
 export * from './compile'
+
+export * from './selector'
diff --git a/packages/ats/contracts/tasks/selector.ts b/packages/ats/contracts/tasks/selector.ts
new file mode 100644
index 000000000..1a9efdb7f
--- /dev/null
+++ b/packages/ats/contracts/tasks/selector.ts
@@ -0,0 +1,183 @@
+import { task } from 'hardhat/config'
+import { HardhatRuntimeEnvironment } from 'hardhat/types'
+// Para Ethers v5, EventFragment nos ayuda con el tipado si lo necesitamos.
+// Puedes importarlo de 'ethers/lib/utils' o '@ethersproject/abi' dependiendo de tu setup.
+// Si hre.ethers ya es v5, no necesitas esta importación explícita para EventFragment
+// a menos que quieras un tipado más estricto.
+import { FunctionFragment } from '@ethersproject/abi' // O 'ethers/lib/utils'
+import { id } from 'ethers/lib/utils'
+
+task(
+    'list-events-v5',
+    'Muestra los nombres y selectores (topic hash) de los eventos para Ethers v5'
+).setAction(async (taskArgs, hre: HardhatRuntimeEnvironment) => {
+    console.log('Obteniendo firmas de eventos (Ethers v5)...')
+
+    // Asegurarse de que ethers en HRE es v5.
+    // Esto es una comprobación rudimentaria; la versión exacta puede variar (e.g., 5.7.2).
+
+    const allContractEvents: {
+        [contractName: string]: { name: string; selector: string }[]
+    } = {}
+
+    const contractNames = await hre.artifacts.getAllFullyQualifiedNames()
+    console.log('contractNames')
+    console.log(contractNames)
+    for (const qualifiedName of contractNames) {
+        try {
+            const artifact = await hre.artifacts.readArtifact(qualifiedName)
+            const contractName = artifact.contractName
+
+            if (!artifact.abi || artifact.abi.length === 0) {
+                // console.log(`Skipping ${contractName} (no ABI or empty ABI)`);
+                continue
+            }
+
+            // En Ethers v5, creamos la instancia de Interface así:
+            const contractInterface = new hre.ethers.utils.Interface(
+                artifact.abi
+            )
+
+            const eventsData = []
+
+            for (const fragment of contractInterface.fragments) {
+                if (fragment.type === 'function') {
+                    // Casteamos a FunctionFragment para tener mejor autocompletado y seguridad de tipos
+                    const functionFragment = fragment as FunctionFragment
+                    const functionName = functionFragment.name
+
+                    // En Ethers v5, usamos getSighash para obtener el selector de la función
+                    const functionSelector =
+                        contractInterface.getSighash(functionFragment)
+
+                    eventsData.push({
+                        name: functionName,
+                        selector: functionSelector,
+                    })
+                }
+            }
+
+            if (eventsData.length > 0) {
+                // Podrías querer almacenar por qualifiedName si tienes colisiones de contractName
+                allContractEvents[contractName] = eventsData
+            }
+        } catch (error) {
+            console.warn(
+                `No se pudo procesar ${qualifiedName}: ${(error as Error).message}`
+            )
+        }
+    }
+
+    if (Object.keys(allContractEvents).length === 0) {
+        console.log('No se encontraron eventos en ningún contrato.')
+    } else {
+        // Imprimir el JSON
+        console.log(JSON.stringify(allContractEvents, null, 2))
+
+        // Si prefieres un objeto plano { 'EventName(params)': 'selector', ... }
+        // (esto puede tener colisiones si diferentes contratos tienen el mismo evento)
+        /*
+      const flatEventMap: { [signature: string]: string } = {};
+      for (const contractName in allContractEvents) {
+        allContractEvents[contractName].forEach(event => {
+          // Para obtener una firma más completa como la de 'sighash' en ethers v6
+          // necesitamos reconstruirla un poco o usar el fragmento completo.
+          // Por ahora, solo nombre y selector simple.
+          // const fullSignature = `${event.name}(${(contractInterface.getEvent(event.name).inputs.map(i => i.type)).join(',')})`;
+          // flatEventMap[`${contractName}.${event.name}`] = event.selector; // Evitar colisiones
+          flatEventMap[event.name] = event.selector; // Simple, puede haber colisiones
+        });
+      }
+      console.log("Eventos como objeto plano (nombre: selector):");
+      console.log(JSON.stringify(flatEventMap, null, 2));
+      */
+    }
+})
+
+task(
+    'list-functions-v5',
+    'Muestra los nombres y selectores (topic hash) de los eventos para Ethers v5'
+).setAction(async (taskArgs, hre: HardhatRuntimeEnvironment) => {
+    console.log('Obteniendo firmas de las funciones (Ethers v5)...')
+
+    // Asegurarse de que ethers en HRE es v5.
+    // Esto es una comprobación rudimentaria; la versión exacta puede variar (e.g., 5.7.2).
+
+    const allContractEvents: {
+        [contractName: string]: { name: string; selector: string }[]
+    } = {}
+
+    const contractNames = await hre.artifacts.getAllFullyQualifiedNames()
+    console.log('contractNames')
+    console.log(contractNames)
+    for (const qualifiedName of contractNames) {
+        try {
+            const artifact = await hre.artifacts.readArtifact(qualifiedName)
+            const contractName = artifact.contractName
+
+            if (!artifact.abi || artifact.abi.length === 0) {
+                // console.log(`Skipping ${contractName} (no ABI or empty ABI)`);
+                continue
+            }
+
+            // En Ethers v5, creamos la instancia de Interface así:
+            const contractInterface = new hre.ethers.utils.Interface(
+                artifact.abi
+            )
+
+            const eventsData = []
+
+            for (const fragment of contractInterface.fragments) {
+                if (fragment.type === 'function') {
+                    // Casteamos a EventFragment para tener mejor autocompletado y seguridad de tipos
+                    const functionFragment = fragment as FunctionFragment
+                    const functionName = functionFragment.name
+
+                    // En Ethers v5, usamos getEventTopic para obtener el selector del evento (topic hash)
+                    const functionSelector = id(
+                        functionFragment.format('sighash')
+                    ).substring(0, 10)
+
+                    eventsData.push({
+                        name: functionName,
+                        selector: functionSelector,
+                    })
+                }
+            }
+
+            if (eventsData.length > 0) {
+                // Podrías querer almacenar por qualifiedName si tienes colisiones de contractName
+                allContractEvents[contractName] = eventsData
+            }
+        } catch (error) {
+            console.warn(
+                `No se pudo procesar ${qualifiedName}: ${(error as Error).message}`
+            )
+        }
+    }
+
+    if (Object.keys(allContractEvents).length === 0) {
+        console.log('No se encontraron eventos en ningún contrato.')
+    } else {
+        // Imprimir el JSON
+        console.log(JSON.stringify(allContractEvents, null, 2))
+
+        // Si prefieres un objeto plano { 'EventName(params)': 'selector', ... }
+        // (esto puede tener colisiones si diferentes contratos tienen el mismo evento)
+        /*
+      const flatEventMap: { [signature: string]: string } = {};
+      for (const contractName in allContractEvents) {
+        allContractEvents[contractName].forEach(event => {
+          // Para obtener una firma más completa como la de 'sighash' en ethers v6
+          // necesitamos reconstruirla un poco o usar el fragmento completo.
+          // Por ahora, solo nombre y selector simple.
+          // const fullSignature = `${event.name}(${(contractInterface.getEvent(event.name).inputs.map(i => i.type)).join(',')})`;
+          // flatEventMap[`${contractName}.${event.name}`] = event.selector; // Evitar colisiones
+          flatEventMap[event.name] = event.selector; // Simple, puede haber colisiones
+        });
+      }
+      console.log("Eventos como objeto plano (nombre: selector):");
+      console.log(JSON.stringify(flatEventMap, null, 2));
+      */
+    }
+})
diff --git a/packages/ats/contracts/test/demo/Demo.test.js b/packages/ats/contracts/test/demo/Demo.test.js
index 3286a67f5..884b06edf 100644
--- a/packages/ats/contracts/test/demo/Demo.test.js
+++ b/packages/ats/contracts/test/demo/Demo.test.js
@@ -171,9 +171,9 @@ Deployed contracts:
             await testFacet2.getStaticResolverKey(),
         ])
         await (0, hardhat_network_helpers_1.loadFixture)(deployDiamond)
-        /*console.log(`    Diamond: ${await diamond.address}`)
+        console.log(`    Diamond: ${await diamond.address}`)
 
-        const loupeFacet: DiamondLoupeFacet = await ethers.getContractAt(
+        /*const loupeFacet: DiamondLoupeFacet = await ethers.getContractAt(
             'DiamondLoupeFacet',
             await diamond.address
         )
diff --git a/packages/ats/contracts/test/unitTests/factory/factory.test.ts b/packages/ats/contracts/test/unitTests/factory/factory.test.ts
index 906e9d8f9..f3f3379be 100644
--- a/packages/ats/contracts/test/unitTests/factory/factory.test.ts
+++ b/packages/ats/contracts/test/unitTests/factory/factory.test.ts
@@ -238,6 +238,7 @@ import {
     setFactoryRegulationData,
     RegulationType,
     RegulationSubType,
+    TIME_PERIODS_S,
 } from '@scripts'
 
 describe('Factory Tests', () => {
@@ -275,7 +276,7 @@ describe('Factory Tests', () => {
     const nominalValue = 100
     let startingDate = 999
     let maturityDate = 999
-    const couponFrequency = 1
+    const couponFrequency = TIME_PERIODS_S.DAY
     const couponRate = 1
     let firstCouponDate = 999
     const numberOfCoupon = 30
diff --git a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1410/erc1410.test.ts b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1410/erc1410.test.ts
index 1bb149808..e769c9713 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1410/erc1410.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1410/erc1410.test.ts
@@ -349,12 +349,21 @@ describe('ERC1410 Tests', () => {
     }
 
     async function grantRolesToAccounts() {
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
-        await accessControlFacet.grantRole(CAP_ROLE, account_A)
-        await accessControlFacet.grantRole(CONTROLLER_ROLE, account_A)
-        await accessControlFacet.grantRole(LOCKER_ROLE, account_A)
-        await accessControlFacet.grantRole(KYC_ROLE, account_A)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(CAP_ROLE, account_A)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(CONTROLLER_ROLE, account_A)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(LOCKER_ROLE, account_A)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(KYC_ROLE, account_A)
     }
 
     async function grantKycToAccounts() {
@@ -739,6 +748,8 @@ describe('ERC1410 Tests', () => {
             'ISnapshots',
             diamond.address
         )
+
+        capFacet = await ethers.getContractAt('Cap', diamond.address)
         await accessControlFacet.grantRole(ISSUER_ROLE, account_A)
         await ssiManagementFacet.addIssuer(account_E)
 
@@ -905,30 +916,30 @@ describe('ERC1410 Tests', () => {
             expect(isOperatorByPartition_E_1).to.be.equal(false)
             expect(isOperatorByPartition_E).to.be.equal(true)
 
-            erc1410Facet = erc1410Facet.connect(signer_D)
-            await erc1410Facet.operatorRedeemByPartition(
-                _PARTITION_ID_1,
-                account_C,
-                balanceOf_C_Original,
-                '0x',
-                '0x'
-            )
-            erc1410Facet = erc1410Facet.connect(signer_E)
-            await erc1410Facet.operatorRedeemByPartition(
-                _PARTITION_ID,
-                account_C,
-                balanceOf_C_Original,
-                '0x',
-                '0x'
-            )
+            await erc1410Facet
+                .connect(signer_D)
+                .operatorRedeemByPartition(
+                    _PARTITION_ID_1,
+                    account_C,
+                    balanceOf_C_Original,
+                    '0x',
+                    '0x'
+                )
+            await erc1410Facet
+                .connect(signer_E)
+                .operatorRedeemByPartition(
+                    _PARTITION_ID,
+                    account_C,
+                    balanceOf_C_Original,
+                    '0x',
+                    '0x'
+                )
 
             // revoke
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            await erc1410Facet.revokeOperator(account_D)
-            await erc1410Facet.revokeOperatorByPartition(
-                _PARTITION_ID,
-                account_E
-            )
+            await erc1410Facet.connect(signer_C).revokeOperator(account_D)
+            await erc1410Facet
+                .connect(signer_C)
+                .revokeOperatorByPartition(_PARTITION_ID, account_E)
 
             // check
             isOperator_D = await erc1410Facet.isOperator(account_D, account_C)
@@ -943,42 +954,47 @@ describe('ERC1410 Tests', () => {
 
         it('GIVEN a paused Token WHEN transfer THEN transaction fails with TokenIsPaused', async () => {
             // Pausing the token
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
+            await pauseFacet.connect(signer_B).pause()
 
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canTransfer = await erc1410Facet.canTransferByPartition(
-                account_C,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            const canTransfer_2 = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            const canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_C,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
+            const canTransfer_2 = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // transfer with data fails
             await expect(
-                erc1410Facet.transferByPartition(
-                    _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             ).to.be.rejectedWith('TokenIsPaused')
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.PAUSED)
 
             // transfer from with data fails
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.rejectedWith('TokenIsPaused')
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer_2[1]).to.be.equal(EIP1066_CODES.PAUSED)
@@ -987,31 +1003,35 @@ describe('ERC1410 Tests', () => {
         it('GIVEN a token with clearing active WHEN transfer THEN transaction fails with ClearingIsActivated', async () => {
             await clearingActionsFacet.activateClearing()
 
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canTransfer = await erc1410Facet.canTransferByPartition(
-                account_C,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            const canTransfer_2 = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            // transfer with data fails
-            await expect(
-                erc1410Facet.transferByPartition(
+            const canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_C,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
+            const canTransfer_2 = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
                     _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
+                    amount,
+                    data,
+                    operatorData
                 )
+            // transfer with data fails
+            await expect(
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             ).to.be.revertedWithCustomError(
                 clearingInterface,
                 'ClearingIsActivated'
@@ -1020,7 +1040,9 @@ describe('ERC1410 Tests', () => {
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.UNAVAILABLE)
             // transfer from with data fails
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.revertedWithCustomError(
                 clearingInterface,
                 'ClearingIsActivated'
@@ -1031,13 +1053,11 @@ describe('ERC1410 Tests', () => {
 
         it('GIVEN a paused Token WHEN issue THEN transaction fails with TokenIsPaused', async () => {
             // Pausing the token
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
+            await pauseFacet.connect(signer_B).pause()
+
             // issue fails
             await expect(
-                erc1410Facet.issueByPartition({
+                erc1410Facet.connect(signer_C).issueByPartition({
                     partition: _PARTITION_ID_1,
                     tokenHolder: account_E,
                     value: amount,
@@ -1047,11 +1067,9 @@ describe('ERC1410 Tests', () => {
         })
 
         it('GIVEN Token WHEN issue to partition 0 THEN transaction fails with ZeroPartition', async () => {
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_A)
             // issue fails
             await expect(
-                erc1410Facet.issueByPartition({
+                erc1410Facet.connect(signer_A).issueByPartition({
                     partition:
                         '0x0000000000000000000000000000000000000000000000000000000000000000',
                     tokenHolder: account_E,
@@ -1062,11 +1080,9 @@ describe('ERC1410 Tests', () => {
         })
 
         it('GIVEN Token WHEN issue amount 0 THEN transaction fails with ZeroValue', async () => {
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_A)
             // issue fails
             await expect(
-                erc1410Facet.issueByPartition({
+                erc1410Facet.connect(signer_A).issueByPartition({
                     partition: _PARTITION_ID_1,
                     tokenHolder: account_E,
                     value: 0,
@@ -1077,42 +1093,47 @@ describe('ERC1410 Tests', () => {
 
         it('GIVEN a paused Token WHEN redeem THEN transaction fails with TokenIsPaused', async () => {
             // Pausing the token
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
+            await pauseFacet.connect(signer_B).pause()
 
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                account_C,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            const canRedeem_2 = await erc1410Facet.canRedeemByPartition(
-                account_E,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            const canRedeem = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_C,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
+            const canRedeem_2 = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_E,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // transfer with data fails
             await expect(
-                erc1410Facet.redeemByPartition(_PARTITION_ID_1, amount, data)
+                erc1410Facet
+                    .connect(signer_C)
+                    .redeemByPartition(_PARTITION_ID_1, amount, data)
             ).to.be.rejectedWith('TokenIsPaused')
             expect(canRedeem[0]).to.be.equal(false)
             expect(canRedeem[1]).to.be.equal(EIP1066_CODES.PAUSED)
 
             // transfer from with data fails
             await expect(
-                erc1410Facet.operatorRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_E,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             ).to.be.rejectedWith('TokenIsPaused')
             expect(canRedeem_2[0]).to.be.equal(false)
             expect(canRedeem_2[1]).to.be.equal(EIP1066_CODES.PAUSED)
@@ -1121,25 +1142,29 @@ describe('ERC1410 Tests', () => {
         it('GIVEN a token with clearing active WHEN redeem THEN transaction fails with ClearingIsActivated', async () => {
             await clearingActionsFacet.activateClearing()
 
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                account_C,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            const canRedeem_2 = await erc1410Facet.canRedeemByPartition(
-                account_E,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            const canRedeem = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_C,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
+            const canRedeem_2 = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_E,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             await expect(
-                erc1410Facet.redeemByPartition(_PARTITION_ID_1, amount, data)
+                erc1410Facet
+                    .connect(signer_C)
+                    .redeemByPartition(_PARTITION_ID_1, amount, data)
             ).to.be.revertedWithCustomError(
                 clearingInterface,
                 'ClearingIsActivated'
@@ -1148,13 +1173,15 @@ describe('ERC1410 Tests', () => {
             expect(canRedeem[1]).to.be.equal(EIP1066_CODES.UNAVAILABLE)
 
             await expect(
-                erc1410Facet.operatorRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_E,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             ).to.be.revertedWithCustomError(
                 clearingInterface,
                 'ClearingIsActivated'
@@ -1165,44 +1192,51 @@ describe('ERC1410 Tests', () => {
 
         it('GIVEN blocked accounts (sender, to, from) WHEN transfer THEN transaction fails with AccountIsBlocked', async () => {
             // Blacklisting accounts
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_A)
-            controlList = controlList.connect(signer_A)
-            await controlList.addToControlList(account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CONTROL_LIST_ROLE, account_A)
+            await controlList.connect(signer_A).addToControlList(account_C)
 
             // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            let canTransfer = await erc1410Facet.canTransferByPartition(
-                account_C,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            let canTransfer_2 = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            let canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_C,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
+            let canTransfer_2 = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // transfer with data fails
             await expect(
-                erc1410Facet.transferByPartition(
-                    _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             ).to.be.rejectedWith('AccountIsBlocked')
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.DISALLOWED_OR_STOP)
 
             // transfer from with data fails
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.rejectedWith('AccountIsBlocked')
             expect(canTransfer_2[0]).to.be.equal(false)
             expect(canTransfer_2[1]).to.be.equal(
@@ -1210,39 +1244,47 @@ describe('ERC1410 Tests', () => {
             )
 
             // Update blacklist
-            await controlList.removeFromControlList(account_C)
-            await controlList.addToControlList(account_D)
-            canTransfer = await erc1410Facet.canTransferByPartition(
-                account_C,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            canTransfer_2 = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            await controlList.connect(signer_A).removeFromControlList(account_C)
+            await controlList.connect(signer_A).addToControlList(account_D)
+            canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_C,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
+            canTransfer_2 = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // transfer with data fails
             await expect(
-                erc1410Facet.transferByPartition(
-                    _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             ).to.be.rejectedWith('AccountIsBlocked')
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.DISALLOWED_OR_STOP)
 
             // transfer from with data fails
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.rejectedWith('AccountIsBlocked')
             expect(canTransfer_2[0]).to.be.equal(false)
             expect(canTransfer_2[1]).to.be.equal(
@@ -1250,20 +1292,24 @@ describe('ERC1410 Tests', () => {
             )
 
             // Update blacklist
-            await controlList.removeFromControlList(account_D)
-            await controlList.addToControlList(account_E)
-            canTransfer_2 = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            await controlList.connect(signer_A).removeFromControlList(account_D)
+            await controlList.connect(signer_A).addToControlList(account_E)
+            canTransfer_2 = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // transfer from with data fails
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.rejectedWith('AccountIsBlocked')
             expect(canTransfer_2[0]).to.be.equal(false)
             expect(canTransfer_2[1]).to.be.equal(
@@ -1276,26 +1322,31 @@ describe('ERC1410 Tests', () => {
             await erc1410Facet.connect(signer_D).authorizeOperator(account_C)
             await kycFacet.revokeKyc(account_D)
 
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            let canTransfer = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            let canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // transfer from with data fails
             await expect(
-                erc1410Facet.transferByPartition(
-                    _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.DISALLOWED_OR_STOP)
@@ -1308,14 +1359,16 @@ describe('ERC1410 Tests', () => {
                 account_E
             )
             await kycFacet.revokeKyc(account_E)
-            canTransfer = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // transfer from with data fails
             await expect(
@@ -1328,7 +1381,9 @@ describe('ERC1410 Tests', () => {
                     )
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.DISALLOWED_OR_STOP)
@@ -1406,8 +1461,7 @@ describe('ERC1410 Tests', () => {
         })
 
         it('GIVEN non Kyc account WHEN issue or redeem THEN transaction fails with InvalidKycStatus', async () => {
-            erc1410Facet = erc1410Facet.connect(signer_A)
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_D,
                 value: amount,
@@ -1416,33 +1470,37 @@ describe('ERC1410 Tests', () => {
             await erc1410Facet.connect(signer_D).authorizeOperator(account_A)
             await kycFacet.revokeKyc(account_D)
             await expect(
-                erc1410Facet.issueByPartition({
+                erc1410Facet.connect(signer_A).issueByPartition({
                     partition: _PARTITION_ID_1,
                     tokenHolder: account_D,
                     value: amount,
                     data: data,
                 })
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            const canRedeem = await erc1410Facet
+                .connect(signer_A)
+                .canRedeemByPartition(
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
             await expect(
                 erc1410Facet
                     .connect(signer_D)
                     .redeemByPartition(_PARTITION_ID_1, amount, data)
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
             await expect(
-                erc1410Facet.operatorRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_D,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_A)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        amount,
+                        data,
+                        operatorData
+                    )
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
             expect(canRedeem[0]).to.be.equal(false)
             expect(canRedeem[1]).to.be.equal(EIP1066_CODES.DISALLOWED_OR_STOP)
@@ -1450,44 +1508,50 @@ describe('ERC1410 Tests', () => {
 
         it('GIVEN blocked accounts (sender, from) WHEN redeem THEN transaction fails with AccountIsBlocked', async () => {
             // Blacklisting accounts
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_A)
-            controlList = controlList.connect(signer_A)
-            await controlList.addToControlList(account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CONTROL_LIST_ROLE, account_A)
+            await controlList.connect(signer_A).addToControlList(account_C)
 
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                account_C,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            let canRedeem_2 = await erc1410Facet.canRedeemByPartition(
-                account_E,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            const canRedeem = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_C,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
+            let canRedeem_2 = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_E,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // redeem with data fails
             await expect(
-                erc1410Facet.redeemByPartition(_PARTITION_ID_1, amount, data)
+                erc1410Facet
+                    .connect(signer_C)
+                    .redeemByPartition(_PARTITION_ID_1, amount, data)
             ).to.be.rejectedWith('AccountIsBlocked')
             expect(canRedeem[0]).to.be.equal(false)
             expect(canRedeem[1]).to.be.equal(EIP1066_CODES.DISALLOWED_OR_STOP)
 
             // redeem from with data fails
             await expect(
-                erc1410Facet.operatorRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_E,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             ).to.be.rejectedWith('AccountIsBlocked')
             expect(canRedeem_2[0]).to.be.equal(false)
             expect(canRedeem_2[1]).to.be.equal(EIP1066_CODES.DISALLOWED_OR_STOP)
@@ -1495,77 +1559,78 @@ describe('ERC1410 Tests', () => {
             // Update blacklist
             await controlList.removeFromControlList(account_C)
             await controlList.addToControlList(account_E)
-            canRedeem_2 = await erc1410Facet.canRedeemByPartition(
-                account_E,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-
-            // redeem from with data fails
-            await expect(
-                erc1410Facet.operatorRedeemByPartition(
-                    _PARTITION_ID_1,
+            canRedeem_2 = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
                     account_E,
+                    _PARTITION_ID_1,
                     amount,
                     data,
                     operatorData
                 )
+
+            // redeem from with data fails
+            await expect(
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             ).to.be.rejectedWith('AccountIsBlocked')
             expect(canRedeem_2[0]).to.be.equal(false)
             expect(canRedeem_2[1]).to.be.equal(EIP1066_CODES.DISALLOWED_OR_STOP)
         })
 
         it('GIVEN wrong partition WHEN transfer THEN transaction fails with InValidPartition', async () => {
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canTransfer = await erc1410Facet.canTransferByPartition(
-                account_C,
-                account_D,
-                _PARTITION_ID,
-                amount,
-                data,
-                operatorData
-            )
-            // transfer with data fails
-            await expect(
-                erc1410Facet.transferByPartition(
+            const canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_C,
+                    account_D,
                     _PARTITION_ID,
-                    basicTransferInfo,
-                    data
+                    amount,
+                    data,
+                    operatorData
                 )
+            // transfer with data fails
+            await expect(
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(_PARTITION_ID, basicTransferInfo, data)
             ).to.be.rejectedWith('InvalidPartition')
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.INSUFFICIENT_FUNDS)
         })
 
         it('GIVEN wrong partition WHEN redeem THEN transaction fails with InValidPartition', async () => {
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                account_C,
-                _PARTITION_ID,
-                amount,
-                data,
-                operatorData
-            )
+            const canRedeem = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_C,
+                    _PARTITION_ID,
+                    amount,
+                    data,
+                    operatorData
+                )
 
             // transfer with data fails
             await expect(
-                erc1410Facet.redeemByPartition(_PARTITION_ID, amount, data)
+                erc1410Facet
+                    .connect(signer_C)
+                    .redeemByPartition(_PARTITION_ID, amount, data)
             ).to.be.rejectedWith('InvalidPartition')
             expect(canRedeem[0]).to.be.equal(false)
             expect(canRedeem[1]).to.be.equal(EIP1066_CODES.INSUFFICIENT_FUNDS)
         })
 
         it('GIVEN an account without issuer role WHEN issue THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-
             // add to list fails
             await expect(
-                erc1410Facet.issueByPartition({
+                erc1410Facet.connect(signer_C).issueByPartition({
                     partition: _PARTITION_ID_1,
                     tokenHolder: account_E,
                     value: amount,
@@ -1575,45 +1640,49 @@ describe('ERC1410 Tests', () => {
         })
 
         it('GIVEN an account WHEN transfer more than its balance THEN transaction fails', async () => {
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-
             // transfer with data fails
-            const canTransfer = await erc1410Facet.canTransferByPartition(
-                account_C,
-                account_D,
-                _PARTITION_ID_1,
-                2 * balanceOf_C_Original,
-                data,
-                operatorData
-            )
-            basicTransferInfo.value = 2 * balanceOf_C_Original
-            await expect(
-                erc1410Facet.transferByPartition(
+            const canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_C,
+                    account_D,
                     _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
+                    2 * balanceOf_C_Original,
+                    data,
+                    operatorData
                 )
+            basicTransferInfo.value = 2 * balanceOf_C_Original
+            await expect(
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             ).to.be.rejected
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.INSUFFICIENT_FUNDS)
 
             // transfer from with data fails
-            erc1410Facet = erc1410Facet.connect(signer_E)
-            await erc1410Facet.authorizeOperator(account_C)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canTransfer_2 = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                2 * balanceOf_E_Original,
-                data,
-                operatorData
-            )
+            await erc1410Facet.connect(signer_E).authorizeOperator(account_C)
+
+            const canTransfer_2 = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
+                    _PARTITION_ID_1,
+                    2 * balanceOf_E_Original,
+                    data,
+                    operatorData
+                )
 
             operatorTransferData.value = 2 * balanceOf_E_Original
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.rejected
             expect(canTransfer_2[0]).to.be.equal(false)
             expect(canTransfer_2[1]).to.be.equal(
@@ -1622,79 +1691,85 @@ describe('ERC1410 Tests', () => {
         })
 
         it('GIVEN an account WHEN redeem more than its balance THEN transaction fails', async () => {
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-
             // transfer with data fails
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                account_C,
-                _PARTITION_ID_1,
-                2 * balanceOf_C_Original,
-                data,
-                operatorData
-            )
-
-            await expect(
-                erc1410Facet.redeemByPartition(
+            const canRedeem = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_C,
                     _PARTITION_ID_1,
                     2 * balanceOf_C_Original,
-                    data
+                    data,
+                    operatorData
                 )
+
+            await expect(
+                erc1410Facet
+                    .connect(signer_C)
+                    .redeemByPartition(
+                        _PARTITION_ID_1,
+                        2 * balanceOf_C_Original,
+                        data
+                    )
             ).to.be.rejected
             expect(canRedeem[0]).to.be.equal(false)
             expect(canRedeem[1]).to.be.equal(EIP1066_CODES.INSUFFICIENT_FUNDS)
 
             // transfer from with data fails
-            await erc1410Facet.authorizeOperatorByPartition(
-                _PARTITION_ID_1,
-                account_E
-            )
-            erc1410Facet = erc1410Facet.connect(signer_E)
-            const canRedeem_2 = await erc1410Facet.canRedeemByPartition(
-                account_E,
-                _PARTITION_ID_1,
-                2 * balanceOf_C_Original,
-                data,
-                operatorData
-            )
-            await expect(
-                erc1410Facet.operatorRedeemByPartition(
+            await erc1410Facet
+                .connect(signer_C)
+                .authorizeOperatorByPartition(_PARTITION_ID_1, account_E)
+            const canRedeem_2 = await erc1410Facet
+                .connect(signer_E)
+                .canRedeemByPartition(
+                    account_E,
                     _PARTITION_ID_1,
-                    account_C,
                     2 * balanceOf_C_Original,
                     data,
                     operatorData
                 )
+            await expect(
+                erc1410Facet
+                    .connect(signer_E)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_C,
+                        2 * balanceOf_C_Original,
+                        data,
+                        operatorData
+                    )
             ).to.be.rejected
             expect(canRedeem_2[0]).to.be.equal(false)
             expect(canRedeem_2[1]).to.be.equal(EIP1066_CODES.INSUFFICIENT_FUNDS)
         })
 
         it('GIVEN an account WHEN transfer from address 0 THEN transaction fails', async () => {
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-
-            const canTransfer = await erc1410Facet.canTransferByPartition(
-                ADDRESS_ZERO,
-                account_D,
-                _PARTITION_ID_1,
-                balanceOf_E_Original,
-                data,
-                operatorData
-            )
+            const canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    ADDRESS_ZERO,
+                    account_D,
+                    _PARTITION_ID_1,
+                    balanceOf_E_Original,
+                    data,
+                    operatorData
+                )
 
             operatorTransferData.from = ADDRESS_ZERO
             basicTransferInfo.to = ADDRESS_ZERO
 
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             ).to.be.rejected
             await expect(
-                erc1410Facet.transferByPartition(
-                    _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             ).to.be.rejected
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(
@@ -1703,24 +1778,26 @@ describe('ERC1410 Tests', () => {
         })
 
         it('GIVEN an account WHEN redeem from address 0 THEN transaction fails', async () => {
-            // transfer from with data fails
-            erc1410Facet = erc1410Facet.connect(signer_E)
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                ADDRESS_ZERO,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            await erc1410Facet.authorizeOperator(account_C)
-            await expect(
-                erc1410Facet.operatorRedeemByPartition(
-                    _PARTITION_ID_1,
+            const canRedeem = await erc1410Facet
+                .connect(signer_E)
+                .canRedeemByPartition(
                     ADDRESS_ZERO,
-                    balanceOf_E_Original,
+                    _PARTITION_ID_1,
+                    amount,
                     data,
                     operatorData
                 )
+            await erc1410Facet.connect(signer_E).authorizeOperator(account_C)
+            await expect(
+                erc1410Facet
+                    .connect(signer_E)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        ADDRESS_ZERO,
+                        balanceOf_E_Original,
+                        data,
+                        operatorData
+                    )
             ).to.be.rejected
             expect(canRedeem[0]).to.be.equal(false)
             expect(canRedeem[1]).to.be.equal(
@@ -1731,11 +1808,9 @@ describe('ERC1410 Tests', () => {
         it('GIVEN an account WHEN transfer THEN transaction succeeds', async () => {
             // BEFORE SCHEDULED SNAPSHOTS ------------------------------------------------------------------
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            equityFacet = equityFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
             // scheduling 2 snapshots
             const dividendsRecordDateInSeconds_1 = dateToUnixTimestamp(
                 '2030-01-01T00:00:08Z'
@@ -1757,24 +1832,28 @@ describe('ERC1410 Tests', () => {
                 executionDate: dividendsExecutionDateInSeconds.toString(),
                 amount: 1,
             }
-            await equityFacet.setDividends(dividendData_1)
-            await equityFacet.setDividends(dividendData)
+            await equityFacet.connect(signer_C).setDividends(dividendData_1)
+            await equityFacet.connect(signer_C).setDividends(dividendData)
 
             //  transfer
-            const canTransfer = await erc1410Facet.canTransferByPartition(
-                account_C,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            await expect(
-                erc1410Facet.transferByPartition(
+            const canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
+                    account_C,
+                    account_D,
                     _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
+                    amount,
+                    data,
+                    operatorData
                 )
+            await expect(
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             )
                 .to.emit(erc1410Facet, 'TransferByPartition')
                 .withArgs(
@@ -1788,19 +1867,21 @@ describe('ERC1410 Tests', () => {
                 )
             expect(canTransfer[0]).to.be.equal(true)
             // transfer from
-            erc1410Facet = erc1410Facet.connect(signer_E)
-            await erc1410Facet.authorizeOperator(account_C)
-            const canTransfer_2 = await erc1410Facet.canTransferByPartition(
-                account_E,
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-            erc1410Facet = erc1410Facet.connect(signer_C)
+            await erc1410Facet.connect(signer_E).authorizeOperator(account_C)
+            const canTransfer_2 = await erc1410Facet
+                .connect(signer_E)
+                .canTransferByPartition(
+                    account_E,
+                    account_D,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             )
                 .to.emit(erc1410Facet, 'TransferByPartition')
                 .withArgs(
@@ -1876,11 +1957,13 @@ describe('ERC1410 Tests', () => {
 
             // transfer
             await expect(
-                erc1410Facet.transferByPartition(
-                    _PARTITION_ID_1,
-                    basicTransferInfo,
-                    data
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .transferByPartition(
+                        _PARTITION_ID_1,
+                        basicTransferInfo,
+                        data
+                    )
             )
                 .to.emit(snapshotsFacet, 'SnapshotTriggered')
                 .withArgs(account_C, 1)
@@ -1916,7 +1999,9 @@ describe('ERC1410 Tests', () => {
 
             // transfer From
             await expect(
-                erc1410Facet.operatorTransferByPartition(operatorTransferData)
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             )
                 .to.emit(snapshotsFacet, 'SnapshotTriggered')
                 .withArgs(account_C, 2)
@@ -1929,19 +2014,21 @@ describe('ERC1410 Tests', () => {
         })
 
         it('GIVEN an account WHEN issue more than max supply THEN transaction fails with MaxSupplyReached or MaxSupplyReachedForPartition', async () => {
-            // Using account C (non role)
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CAP_ROLE, account_A)
-            erc1410Facet = erc1410Facet.connect(signer_A)
-            capFacet = await ethers.getContractAt('Cap', diamond.address)
-            capFacet = capFacet.connect(signer_A)
-            await capFacet.setMaxSupply(
-                balanceOf_C_Original + balanceOf_E_Original + 2 * amount
-            )
-            await capFacet.setMaxSupplyByPartition(
-                _PARTITION_ID_1,
-                balanceOf_C_Original + balanceOf_E_Original + amount
-            )
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_A)
+
+            await capFacet
+                .connect(signer_A)
+                .setMaxSupply(
+                    balanceOf_C_Original + balanceOf_E_Original + 2 * amount
+                )
+            await capFacet
+                .connect(signer_A)
+                .setMaxSupplyByPartition(
+                    _PARTITION_ID_1,
+                    balanceOf_C_Original + balanceOf_E_Original + amount
+                )
 
             // add to list fails
             await expect(
@@ -1966,11 +2053,10 @@ describe('ERC1410 Tests', () => {
         it('GIVEN an account WHEN issue THEN transaction succeeds', async () => {
             // BEFORE SCHEDULED SNAPSHOTS ------------------------------------------------------------------
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_A)
-            equityFacet = equityFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
+
             // scheduling 2 snapshots
             const dividendsRecordDateInSeconds_1 = dateToUnixTimestamp(
                 '2030-01-01T00:00:08Z'
@@ -1991,12 +2077,12 @@ describe('ERC1410 Tests', () => {
                 executionDate: dividendsExecutionDateInSeconds.toString(),
                 amount: 1,
             }
-            await equityFacet.setDividends(dividendData_1)
-            await equityFacet.setDividends(dividendData)
+            await equityFacet.connect(signer_C).setDividends(dividendData_1)
+            await equityFacet.connect(signer_C).setDividends(dividendData)
 
             //  transfer
             await expect(
-                erc1410Facet.issueByPartition({
+                erc1410Facet.connect(signer_A).issueByPartition({
                     partition: _PARTITION_ID_1,
                     tokenHolder: account_D,
                     value: amount,
@@ -2035,17 +2121,21 @@ describe('ERC1410 Tests', () => {
             expect(dividend.snapshotId.toNumber()).to.equal(0)
 
             // Set Max supplies to test
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CAP_ROLE, account_A)
-            capFacet = await ethers.getContractAt('Cap', diamond.address)
-            capFacet = capFacet.connect(signer_A)
-            await capFacet.setMaxSupply(
-                balanceOf_C_Original + balanceOf_E_Original + 100 * amount
-            )
-            await capFacet.setMaxSupplyByPartition(
-                _PARTITION_ID_1,
-                balanceOf_C_Original + balanceOf_E_Original + 100 * amount
-            )
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_A)
+
+            await capFacet
+                .connect(signer_A)
+                .setMaxSupply(
+                    balanceOf_C_Original + balanceOf_E_Original + 100 * amount
+                )
+            await capFacet
+                .connect(signer_A)
+                .setMaxSupplyByPartition(
+                    _PARTITION_ID_1,
+                    balanceOf_C_Original + balanceOf_E_Original + 100 * amount
+                )
 
             // AFTER FIRST SCHEDULED SNAPSHOTS ------------------------------------------------------------------
             await timeTravelFacet.changeSystemTimestamp(
@@ -2054,7 +2144,7 @@ describe('ERC1410 Tests', () => {
 
             // transfer
             await expect(
-                erc1410Facet.issueByPartition({
+                erc1410Facet.connect(signer_A).issueByPartition({
                     partition: _PARTITION_ID_1,
                     tokenHolder: account_D,
                     value: amount,
@@ -2073,12 +2163,10 @@ describe('ERC1410 Tests', () => {
 
         it('GIVEN an account WHEN redeem THEN transaction succeeds', async () => {
             // BEFORE SCHEDULED SNAPSHOTS ------------------------------------------------------------------
-            // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            equityFacet = equityFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
+
             // scheduling 2 snapshots
             const dividendsRecordDateInSeconds_1 = dateToUnixTimestamp(
                 '2030-01-01T00:00:08Z'
@@ -2099,20 +2187,24 @@ describe('ERC1410 Tests', () => {
                 executionDate: dividendsExecutionDateInSeconds.toString(),
                 amount: 1,
             }
-            await equityFacet.setDividends(dividendData_1)
-            await equityFacet.setDividends(dividendData)
+            await equityFacet.connect(signer_C).setDividends(dividendData_1)
+            await equityFacet.connect(signer_C).setDividends(dividendData)
 
             //  transfer
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                account_C,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            const canRedeem = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_C,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
             expect(canRedeem[0]).to.be.equal(true)
             await expect(
-                erc1410Facet.redeemByPartition(_PARTITION_ID_1, amount, data)
+                erc1410Facet
+                    .connect(signer_C)
+                    .redeemByPartition(_PARTITION_ID_1, amount, data)
             )
                 .to.emit(erc1410Facet, 'RedeemedByPartition')
                 .withArgs(
@@ -2127,29 +2219,32 @@ describe('ERC1410 Tests', () => {
             let totalSupplyByPartition =
                 await erc1410Facet.totalSupplyByPartition(_PARTITION_ID_1)
             // transfer from
-            erc1410Facet = erc1410Facet.connect(signer_E)
-            await erc1410Facet.authorizeOperator(account_C)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            const canRedeem_2 = await erc1410Facet.canRedeemByPartition(
-                account_E,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
+            await erc1410Facet.connect(signer_E).authorizeOperator(account_C)
+
+            const canRedeem_2 = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
+                    account_E,
+                    _PARTITION_ID_1,
+                    amount,
+                    data,
+                    operatorData
+                )
             expect(canRedeem_2[0]).to.be.equal(true)
             expect(totalSupply).to.be.equal(
                 balanceOf_C_Original + balanceOf_E_Original - amount
             )
             expect(totalSupplyByPartition).to.be.equal(totalSupply)
             await expect(
-                erc1410Facet.operatorRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_E,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             )
                 .to.emit(erc1410Facet, 'RedeemedByPartition')
                 .withArgs(
@@ -2203,7 +2298,9 @@ describe('ERC1410 Tests', () => {
 
             // transfer
             await expect(
-                erc1410Facet.redeemByPartition(_PARTITION_ID_1, amount, data)
+                erc1410Facet
+                    .connect(signer_C)
+                    .redeemByPartition(_PARTITION_ID_1, amount, data)
             )
                 .to.emit(snapshotsFacet, 'SnapshotTriggered')
                 .withArgs(account_C, 1)
@@ -2221,13 +2318,15 @@ describe('ERC1410 Tests', () => {
 
             // transfer From
             await expect(
-                erc1410Facet.operatorRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_E,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .operatorRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             )
                 .to.emit(snapshotsFacet, 'SnapshotTriggered')
                 .withArgs(account_C, 2)
@@ -2325,71 +2424,75 @@ describe('ERC1410 Tests', () => {
         })
 
         it('GIVEN an account without controller role WHEN controllerTransfer THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
             await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
             const balanceOf_D_Original = 4 * amount
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_D,
                 value: balanceOf_D_Original,
                 data: data,
             })
 
-            const canTransfer = await erc1410Facet.canTransferByPartition(
-                account_D,
-                account_E,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-
-            // controller transfer fails
-            await expect(
-                erc1410Facet.controllerTransferByPartition(
-                    _PARTITION_ID_1,
+            const canTransfer = await erc1410Facet
+                .connect(signer_C)
+                .canTransferByPartition(
                     account_D,
                     account_E,
+                    _PARTITION_ID_1,
                     amount,
                     data,
                     operatorData
                 )
+
+            // controller transfer fails
+            await expect(
+                erc1410Facet
+                    .connect(signer_C)
+                    .controllerTransferByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             ).to.be.rejectedWith('AccountHasNoRole')
             expect(canTransfer[0]).to.be.equal(false)
             expect(canTransfer[1]).to.be.equal(EIP1066_CODES.INSUFFICIENT_FUNDS)
         })
 
         it('GIVEN an account without controller role WHEN controllerRedeem THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
             await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
             const balanceOf_D_Original = 4 * amount
 
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_D,
                 value: balanceOf_D_Original,
                 data: '0x',
             })
 
-            const canRedeem = await erc1410Facet.canRedeemByPartition(
-                account_D,
-                _PARTITION_ID_1,
-                amount,
-                data,
-                operatorData
-            )
-
-            // controller redeem fails
-            await expect(
-                erc1410Facet.controllerRedeemByPartition(
-                    _PARTITION_ID_1,
+            const canRedeem = await erc1410Facet
+                .connect(signer_C)
+                .canRedeemByPartition(
                     account_D,
+                    _PARTITION_ID_1,
                     amount,
                     data,
                     operatorData
                 )
+
+            // controller redeem fails
+            await expect(
+                erc1410Facet
+                    .connect(signer_C)
+                    .controllerRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        amount,
+                        data,
+                        operatorData
+                    )
             ).to.be.rejectedWith('AccountHasNoRole')
             expect(canRedeem[0]).to.be.equal(false)
             expect(canRedeem[1]).to.be.equal(EIP1066_CODES.INSUFFICIENT_FUNDS)
@@ -2406,19 +2509,18 @@ describe('ERC1410 Tests', () => {
                 account_C
             )
 
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-
             // controller transfer fails
             await expect(
-                erc1410Facet.controllerTransferByPartition(
-                    _PARTITION_ID_1,
-                    account_D,
-                    account_E,
-                    amount,
-                    '0x',
-                    '0x'
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .controllerTransferByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        account_E,
+                        amount,
+                        '0x',
+                        '0x'
+                    )
             ).to.be.rejectedWith('TokenIsPaused')
         })
 
@@ -2433,34 +2535,36 @@ describe('ERC1410 Tests', () => {
                 account_C
             )
 
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-
             // remove document
             await expect(
-                erc1410Facet.controllerRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_D,
-                    amount,
-                    '0x',
-                    '0x'
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .controllerRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        amount,
+                        '0x',
+                        '0x'
+                    )
             ).to.be.rejectedWith('TokenIsPaused')
         })
 
         it('GIVEN an account with controller role WHEN controllerTransfer and controllerRedeem THEN transaction succeeds', async () => {
             // BEFORE SCHEDULED SNAPSHOTS ------------------------------------------------------------------
-            // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CONTROLLER_ROLE, account_C)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            // Using account C (with role)
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            equityFacet = equityFacet.connect(signer_C)
+
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CONTROLLER_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
+
             // issueing 2 tokens to account D
             const balanceOf_D_Original = 4 * amount
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_D,
                 value: balanceOf_D_Original,
@@ -2486,19 +2590,21 @@ describe('ERC1410 Tests', () => {
                 executionDate: dividendsExecutionDateInSeconds.toString(),
                 amount: 1,
             }
-            await equityFacet.setDividends(dividendData_1)
-            await equityFacet.setDividends(dividendData)
+            await equityFacet.connect(signer_C).setDividends(dividendData_1)
+            await equityFacet.connect(signer_C).setDividends(dividendData)
 
             // controller transfer
             await expect(
-                erc1410Facet.controllerTransferByPartition(
-                    _PARTITION_ID_1,
-                    account_D,
-                    account_E,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .controllerTransferByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             )
                 .to.emit(erc1410Facet, 'TransferByPartition')
                 .withArgs(
@@ -2512,13 +2618,15 @@ describe('ERC1410 Tests', () => {
                 )
             // controller redeem
             await expect(
-                erc1410Facet.controllerRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_D,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .controllerRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        amount,
+                        data,
+                        operatorData
+                    )
             )
                 .to.emit(erc1410Facet, 'RedeemedByPartition')
                 .withArgs(
@@ -2559,14 +2667,16 @@ describe('ERC1410 Tests', () => {
 
             // controller transfer
             await expect(
-                erc1410Facet.controllerTransferByPartition(
-                    _PARTITION_ID_1,
-                    account_D,
-                    account_E,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .controllerTransferByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        account_E,
+                        amount,
+                        data,
+                        operatorData
+                    )
             )
                 .to.emit(snapshotsFacet, 'SnapshotTriggered')
                 .withArgs(account_C, 1)
@@ -2584,13 +2694,15 @@ describe('ERC1410 Tests', () => {
 
             // controller redeem
             await expect(
-                erc1410Facet.controllerRedeemByPartition(
-                    _PARTITION_ID_1,
-                    account_D,
-                    amount,
-                    data,
-                    operatorData
-                )
+                erc1410Facet
+                    .connect(signer_C)
+                    .controllerRedeemByPartition(
+                        _PARTITION_ID_1,
+                        account_D,
+                        amount,
+                        data,
+                        operatorData
+                    )
             )
                 .to.emit(snapshotsFacet, 'SnapshotTriggered')
                 .withArgs(account_C, 2)
@@ -2659,9 +2771,6 @@ describe('ERC1410 Tests', () => {
                     adjustDecimals
                 )
 
-                // scheduled two balance updates
-                equityFacet = equityFacet.connect(signer_B)
-
                 const balanceAdjustmentData = {
                     executionDate: dateToUnixTimestamp(
                         '2030-01-01T00:00:02Z'
@@ -2677,12 +2786,12 @@ describe('ERC1410 Tests', () => {
                     factor: adjustFactor,
                     decimals: adjustDecimals,
                 }
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData
-                )
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData_2
-                )
+                await equityFacet
+                    .connect(signer_B)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData)
+                await equityFacet
+                    .connect(signer_B)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData_2)
 
                 // wait for first scheduled balance adjustment only
                 await timeTravelFacet.changeSystemTimestamp(
@@ -2697,27 +2806,25 @@ describe('ERC1410 Tests', () => {
 
             describe('Issues', () => {
                 it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC1410 IssueByPartition succeeds', async () => {
-                    // Granting Role to account C
-                    accessControlFacet = accessControlFacet.connect(signer_A)
-                    await accessControlFacet.grantRole(
-                        ADJUSTMENT_BALANCE_ROLE,
-                        account_C
-                    )
-                    await accessControlFacet.grantRole(CAP_ROLE, account_A)
-                    await accessControlFacet.grantRole(KYC_ROLE, account_A)
+                    await accessControlFacet
+                        .connect(signer_A)
+                        .grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
+                    await accessControlFacet
+                        .connect(signer_A)
+                        .grantRole(CAP_ROLE, account_A)
+                    await accessControlFacet
+                        .connect(signer_A)
+                        .grantRole(KYC_ROLE, account_A)
 
                     await grantKycToAccounts()
 
-                    // Using account C (with role)
-                    adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
-                    erc1410Facet = erc1410Facet.connect(signer_A)
-                    await erc1410Facet.issueByPartition({
+                    await erc1410Facet.connect(signer_A).issueByPartition({
                         partition: _PARTITION_ID_1,
                         tokenHolder: account_A,
                         value: balanceOf_A_Original[0],
                         data: '0x',
                     })
-                    await erc1410Facet.issueByPartition({
+                    await erc1410Facet.connect(signer_A).issueByPartition({
                         partition: _PARTITION_ID,
                         tokenHolder: account_A,
                         value: balanceOf_A_Original[1],
@@ -2733,12 +2840,11 @@ describe('ERC1410 Tests', () => {
                         )
 
                     // adjustBalances
-                    await adjustBalancesFacet.adjustBalances(
-                        adjustFactor,
-                        adjustDecimals
-                    )
+                    await adjustBalancesFacet
+                        .connect(signer_C)
+                        .adjustBalances(adjustFactor, adjustDecimals)
                     // issue after adjust
-                    await erc1410Facet.issueByPartition({
+                    await erc1410Facet.connect(signer_A).issueByPartition({
                         partition: _PARTITION_ID_1,
                         tokenHolder: account_A,
                         value: balanceOf_A_Original[0],
@@ -3182,27 +3288,21 @@ describe('ERC1410 Tests', () => {
 
         describe('Issues', async () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC1594 Issue succeeds', async () => {
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(
-                    ADJUSTMENT_BALANCE_ROLE,
-                    account_C
-                )
-                await accessControlFacet.grantRole(CAP_ROLE, account_A)
-                await accessControlFacet.grantRole(KYC_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CAP_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(KYC_ROLE, account_A)
 
                 await grantKycToAccounts()
 
-                // Using account C (with role)
-                adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
-                erc1410Facet = erc1410Facet.connect(signer_A)
-                erc1594Facet = erc1594Facet.connect(signer_A)
-
-                await erc1594Facet.issue(
-                    account_A,
-                    balanceOf_A_Original[0],
-                    '0x'
-                )
+                await erc1594Facet
+                    .connect(signer_A)
+                    .issue(account_A, balanceOf_A_Original[0], '0x')
 
                 const balanceOf_A_Before =
                     await erc1410Facet.balanceOf(account_A)
@@ -3213,17 +3313,14 @@ describe('ERC1410 Tests', () => {
                     )
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // issue after adjust
-                await erc1594Facet.issue(
-                    account_A,
-                    balanceOf_A_Original[0],
-                    '0x'
-                )
+                await erc1594Facet
+                    .connect(signer_A)
+                    .issue(account_A, balanceOf_A_Original[0], '0x')
 
                 const balanceOf_A_After =
                     await erc1410Facet.balanceOf(account_A)
@@ -3246,40 +3343,36 @@ describe('ERC1410 Tests', () => {
             })
 
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC1594 Issue with max supply succeeds', async () => {
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(
-                    ADJUSTMENT_BALANCE_ROLE,
-                    account_C
-                )
-                await accessControlFacet.grantRole(CAP_ROLE, account_A)
-                await accessControlFacet.grantRole(KYC_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CAP_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(KYC_ROLE, account_A)
 
                 await grantKycToAccounts()
 
-                // Using account C (with role)
-                adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
-                erc1410Facet = erc1410Facet.connect(signer_A)
-                erc1594Facet = erc1594Facet.connect(signer_A)
-                capFacet = capFacet.connect(signer_A)
-
-                await capFacet.setMaxSupply(balanceOf_A_Original[1])
+                await capFacet
+                    .connect(signer_A)
+                    .setMaxSupply(balanceOf_A_Original[1])
 
-                await erc1594Facet.issue(
-                    account_A,
-                    balanceOf_A_Original[0],
-                    '0x'
-                )
+                await erc1594Facet
+                    .connect(signer_A)
+                    .issue(account_A, balanceOf_A_Original[0], '0x')
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // issue after adjust
                 await expect(
-                    erc1594Facet.issue(account_A, balanceOf_A_Original[0], '0x')
+                    erc1594Facet
+                        .connect(signer_A)
+                        .issue(account_A, balanceOf_A_Original[0], '0x')
                 )
                     .to.emit(erc1594Facet, 'Issued')
                     .withArgs(
@@ -3305,14 +3398,15 @@ describe('ERC1410 Tests', () => {
                 )
 
                 // Transaction Partition 1
-                erc1644Facet = erc1644Facet.connect(signer_A)
-                await erc1644Facet.controllerTransfer(
-                    account_A,
-                    account_B,
-                    amount,
-                    '0x',
-                    '0x'
-                )
+                await erc1644Facet
+                    .connect(signer_A)
+                    .controllerTransfer(
+                        account_A,
+                        account_B,
+                        amount,
+                        '0x',
+                        '0x'
+                    )
 
                 // After Transaction Partition 1 Values
                 const after = await getBalanceAdjustedValues()
@@ -3333,8 +3427,9 @@ describe('ERC1410 Tests', () => {
                 )
 
                 // Transaction Partition 1
-                erc1594Facet = erc1594Facet.connect(signer_A)
-                await erc1594Facet.transferWithData(account_B, amount, '0x')
+                await erc1594Facet
+                    .connect(signer_A)
+                    .transferWithData(account_B, amount, '0x')
 
                 // After Transaction Partition 1 Values
                 const after = await getBalanceAdjustedValues()
@@ -3345,8 +3440,7 @@ describe('ERC1410 Tests', () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC1594 transferFromWithData succeeds', async () => {
                 await setPreBalanceAdjustment(true)
 
-                erc20Facet = erc20Facet.connect(signer_A)
-                await erc20Facet.approve(account_A, amount)
+                await erc20Facet.connect(signer_A).approve(account_A, amount)
 
                 // Before Values
                 const before = await getBalanceAdjustedValues()
@@ -3358,13 +3452,9 @@ describe('ERC1410 Tests', () => {
                 )
 
                 // Transaction Partition 1
-                erc1594Facet = erc1594Facet.connect(signer_A)
-                await erc1594Facet.transferFromWithData(
-                    account_A,
-                    account_B,
-                    amount,
-                    '0x'
-                )
+                await erc1594Facet
+                    .connect(signer_A)
+                    .transferFromWithData(account_A, account_B, amount, '0x')
 
                 // After Transaction Partition 1 Values
                 const after = await getBalanceAdjustedValues()
@@ -3375,8 +3465,7 @@ describe('ERC1410 Tests', () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC1594 transferFromWithData with expected allowance amount succeeds', async () => {
                 await setPreBalanceAdjustment(true)
 
-                erc20Facet = erc20Facet.connect(signer_A)
-                await erc20Facet.approve(account_A, amount)
+                await erc20Facet.connect(signer_A).approve(account_A, amount)
 
                 // Before Values
                 const before = await getBalanceAdjustedValues()
@@ -3390,13 +3479,14 @@ describe('ERC1410 Tests', () => {
                 const expectedAllowance = amount * adjustFactor
 
                 // Transaction Partition 1
-                erc1594Facet = erc1594Facet.connect(signer_A)
-                await erc1594Facet.transferFromWithData(
-                    account_A,
-                    account_B,
-                    expectedAllowance,
-                    '0x'
-                )
+                await erc1594Facet
+                    .connect(signer_A)
+                    .transferFromWithData(
+                        account_A,
+                        account_B,
+                        expectedAllowance,
+                        '0x'
+                    )
 
                 // After Transaction Partition 1 Values
                 const after = await getBalanceAdjustedValues()
@@ -3415,14 +3505,10 @@ describe('ERC1410 Tests', () => {
                     adjustDecimals
                 )
 
-                erc1594Facet = erc1594Facet.connect(signer_A)
-
                 expect(
-                    await erc1594Facet.canTransfer(
-                        account_B,
-                        adjustFactor * amount,
-                        '0x'
-                    )
+                    await erc1594Facet
+                        .connect(signer_A)
+                        .canTransfer(account_B, adjustFactor * amount, '0x')
                 ).to.be.deep.equal([
                     true,
                     EIP1066_CODES.SUCCESS,
@@ -3458,8 +3544,7 @@ describe('ERC1410 Tests', () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC1594 canTransferFrom succeeds', async () => {
                 await setPreBalanceAdjustment(true)
 
-                erc20Facet = erc20Facet.connect(signer_A)
-                await erc20Facet.approve(account_A, amount)
+                await erc20Facet.connect(signer_A).approve(account_A, amount)
 
                 // adjustBalances
                 await adjustBalancesFacet.adjustBalances(
@@ -3467,15 +3552,15 @@ describe('ERC1410 Tests', () => {
                     adjustDecimals
                 )
 
-                erc1594Facet = erc1594Facet.connect(signer_A)
-
                 expect(
-                    await erc1594Facet.canTransferFrom(
-                        account_A,
-                        account_B,
-                        adjustFactor * amount,
-                        '0x'
-                    )
+                    await erc1594Facet
+                        .connect(signer_A)
+                        .canTransferFrom(
+                            account_A,
+                            account_B,
+                            adjustFactor * amount,
+                            '0x'
+                        )
                 ).to.be.deep.equal([
                     true,
                     EIP1066_CODES.SUCCESS,
@@ -3496,8 +3581,7 @@ describe('ERC1410 Tests', () => {
                 )
 
                 // Transaction Partition 1
-                erc20Facet = erc20Facet.connect(signer_A)
-                await erc20Facet.transfer(account_B, amount)
+                await erc20Facet.connect(signer_A).transfer(account_B, amount)
 
                 // After Transaction Partition 1 Values
                 const after = await getBalanceAdjustedValues()
@@ -3510,8 +3594,9 @@ describe('ERC1410 Tests', () => {
 
                 const before = await getBalanceAdjustedValues()
 
-                erc20Facet = erc20Facet.connect(signer_A)
-                await erc20Facet.approve(account_B, before.balanceOf_A)
+                await erc20Facet
+                    .connect(signer_A)
+                    .approve(account_B, before.balanceOf_A)
 
                 // Before Values
 
@@ -3521,15 +3606,12 @@ describe('ERC1410 Tests', () => {
                     adjustDecimals
                 )
 
-                erc20Facet = erc20Facet.connect(signer_B)
                 // Transaction Partition 1 with updated balance
                 const updatedBalance = before.balanceOf_A.mul(adjustFactor)
 
-                await erc20Facet.transferFrom(
-                    account_A,
-                    account_B,
-                    updatedBalance
-                )
+                await erc20Facet
+                    .connect(signer_B)
+                    .transferFrom(account_A, account_B, updatedBalance)
 
                 // // After Transaction Partition 1 Values
                 const after = await getBalanceAdjustedValues()
@@ -3602,9 +3684,8 @@ describe('ERC1410 Tests', () => {
                 )
 
                 // Transaction Partition 1
-                erc1594Facet = erc1594Facet.connect(signer_A)
 
-                await erc1594Facet.redeem(amount, '0x')
+                await erc1594Facet.connect(signer_A).redeem(amount, '0x')
 
                 // After Transaction Partition 1 Values
                 const after = await getBalanceAdjustedValues()
@@ -3624,9 +3705,9 @@ describe('ERC1410 Tests', () => {
                 const adjustAmount = amount * adjustFactor
 
                 // Transaction Partition 1
-                erc1594Facet = erc1594Facet.connect(signer_A)
-
-                await expect(erc1594Facet.redeem(adjustAmount, '0x'))
+                await expect(
+                    erc1594Facet.connect(signer_A).redeem(adjustAmount, '0x')
+                )
                     .to.emit(erc1594Facet, 'Redeemed')
                     .withArgs(ADDRESS_ZERO, account_A, adjustAmount, '0x')
             })
@@ -3634,8 +3715,7 @@ describe('ERC1410 Tests', () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC1594 redeemFrom succeeds', async () => {
                 await setPreBalanceAdjustment(true)
 
-                erc20Facet = erc20Facet.connect(signer_A)
-                await erc20Facet.approve(account_A, amount)
+                await erc20Facet.connect(signer_A).approve(account_A, amount)
 
                 // Before Values
                 const before = await getBalanceAdjustedValues()
@@ -3647,9 +3727,9 @@ describe('ERC1410 Tests', () => {
                 )
 
                 // Transaction Partition 1
-                erc1594Facet = erc1594Facet.connect(signer_A)
-
-                await erc1594Facet.redeemFrom(account_A, amount, '0x')
+                await erc1594Facet
+                    .connect(signer_A)
+                    .redeemFrom(account_A, amount, '0x')
 
                 // After Transaction Partition 1 Values
                 const after = await getBalanceAdjustedValues()
@@ -3660,8 +3740,7 @@ describe('ERC1410 Tests', () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC1594 redeemFrom with the expected adjusted amount succeeds', async () => {
                 await setPreBalanceAdjustment(true)
 
-                erc20Facet = erc20Facet.connect(signer_A)
-                await erc20Facet.approve(account_A, amount)
+                await erc20Facet.connect(signer_A).approve(account_A, amount)
 
                 // adjustBalances
                 await adjustBalancesFacet.adjustBalances(
@@ -3672,10 +3751,10 @@ describe('ERC1410 Tests', () => {
                 const adjustAmount = amount * adjustFactor
 
                 // Transaction Partition 1
-                erc1594Facet = erc1594Facet.connect(signer_A)
-
                 await expect(
-                    erc1594Facet.redeemFrom(account_A, adjustAmount, '0x')
+                    erc1594Facet
+                        .connect(signer_A)
+                        .redeemFrom(account_A, adjustAmount, '0x')
                 )
                     .to.emit(erc1594Facet, 'Redeemed')
                     .withArgs(account_A, account_A, adjustAmount, '0x')
@@ -3686,14 +3765,11 @@ describe('ERC1410 Tests', () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC20 allowance succeeds', async () => {
                 await setPreBalanceAdjustment(true)
 
-                erc20Facet = erc20Facet.connect(signer_A)
+                await erc20Facet.connect(signer_A).approve(account_B, amount)
 
-                await erc20Facet.approve(account_B, amount)
-
-                const allowance_Before = await erc20Facet.allowance(
-                    account_A,
-                    account_B
-                )
+                const allowance_Before = await erc20Facet
+                    .connect(signer_A)
+                    .allowance(account_A, account_B)
 
                 // adjustBalances
                 await adjustBalancesFacet.adjustBalances(
@@ -3701,10 +3777,9 @@ describe('ERC1410 Tests', () => {
                     adjustDecimals
                 )
 
-                const allowance_After = await erc20Facet.allowance(
-                    account_A,
-                    account_B
-                )
+                const allowance_After = await erc20Facet
+                    .connect(signer_A)
+                    .allowance(account_A, account_B)
 
                 expect(allowance_After).to.be.equal(
                     allowance_Before.mul(adjustFactor)
@@ -3714,15 +3789,12 @@ describe('ERC1410 Tests', () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC20 increaseAllowance succeeds', async () => {
                 await setPreBalanceAdjustment(true)
 
-                erc20Facet = erc20Facet.connect(signer_A)
-
                 // APPROVE 1
-                await erc20Facet.approve(account_B, amount)
+                await erc20Facet.connect(signer_A).approve(account_B, amount)
 
-                const allowance_Before = await erc20Facet.allowance(
-                    account_A,
-                    account_B
-                )
+                const allowance_Before = await erc20Facet
+                    .connect(signer_A)
+                    .allowance(account_A, account_B)
 
                 // adjustBalances
                 await adjustBalancesFacet.adjustBalances(
@@ -3731,12 +3803,13 @@ describe('ERC1410 Tests', () => {
                 )
 
                 // APPROVE 2
-                await erc20Facet.increaseAllowance(account_B, amount)
+                await erc20Facet
+                    .connect(signer_A)
+                    .increaseAllowance(account_B, amount)
 
-                const allowance_After = await erc20Facet.allowance(
-                    account_A,
-                    account_B
-                )
+                const allowance_After = await erc20Facet
+                    .connect(signer_A)
+                    .allowance(account_A, account_B)
 
                 expect(allowance_After).to.be.equal(
                     allowance_Before.mul(adjustFactor).add(amount)
@@ -3746,15 +3819,12 @@ describe('ERC1410 Tests', () => {
             it('GIVEN an account with adjustBalances role WHEN adjustBalances THEN ERC20 decreaseAllowance succeeds', async () => {
                 await setPreBalanceAdjustment(true)
 
-                erc20Facet = erc20Facet.connect(signer_A)
-
                 // APPROVE 1
-                await erc20Facet.approve(account_B, amount)
+                await erc20Facet.connect(signer_A).approve(account_B, amount)
 
-                const allowance_Before = await erc20Facet.allowance(
-                    account_A,
-                    account_B
-                )
+                const allowance_Before = await erc20Facet
+                    .connect(signer_A)
+                    .allowance(account_A, account_B)
 
                 // adjustBalances
                 await adjustBalancesFacet.adjustBalances(
@@ -3763,15 +3833,13 @@ describe('ERC1410 Tests', () => {
                 )
 
                 // APPROVE 2
-                await erc20Facet.decreaseAllowance(
-                    account_B,
-                    allowance_Before.add(amount)
-                )
+                await erc20Facet
+                    .connect(signer_A)
+                    .decreaseAllowance(account_B, allowance_Before.add(amount))
 
-                const allowance_After = await erc20Facet.allowance(
-                    account_A,
-                    account_B
-                )
+                const allowance_After = await erc20Facet
+                    .connect(signer_A)
+                    .allowance(account_A, account_B)
 
                 expect(allowance_After).to.be.equal(
                     allowance_Before
diff --git a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1594/erc1594.test.ts b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1594/erc1594.test.ts
index 29d8d8b53..8313e60a5 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1594/erc1594.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1594/erc1594.test.ts
@@ -386,16 +386,15 @@ describe('ERC1594 Tests', () => {
 
         describe('NotAllowedInMultiPartitionMode', () => {
             it('GIVEN an initialized token WHEN transferWithData THEN fails with NotAllowedInMultiPartitionMode', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.transferWithData(
-                        account_D,
-                        2 * BALANCE_OF_C_ORIGINAL,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferWithData(
+                            account_D,
+                            2 * BALANCE_OF_C_ORIGINAL,
+                            DATA
+                        )
                 ).to.be.revertedWithCustomError(
                     erc1594Facet,
                     'NotAllowedInMultiPartitionMode'
@@ -403,17 +402,16 @@ describe('ERC1594 Tests', () => {
             })
 
             it('GIVEN an initialized token WHEN transferFromWithData THEN fails with NotAllowedInMultiPartitionMode', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.transferFromWithData(
-                        account_B,
-                        account_D,
-                        2 * BALANCE_OF_C_ORIGINAL,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferFromWithData(
+                            account_B,
+                            account_D,
+                            2 * BALANCE_OF_C_ORIGINAL,
+                            DATA
+                        )
                 ).to.be.revertedWithCustomError(
                     erc1594Facet,
                     'NotAllowedInMultiPartitionMode'
@@ -421,17 +419,13 @@ describe('ERC1594 Tests', () => {
             })
 
             it('GIVEN an initialized token WHEN issue THEN fails with NotAllowedInMultiPartitionMode', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_A)
-
                 // transfer with data fails
-                expect(await erc1594Facet.isIssuable()).to.be.true
+                expect(await erc1594Facet.connect(signer_A).isIssuable()).to.be
+                    .true
                 await expect(
-                    erc1594Facet.issue(
-                        account_D,
-                        2 * BALANCE_OF_C_ORIGINAL,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_A)
+                        .issue(account_D, 2 * BALANCE_OF_C_ORIGINAL, DATA)
                 ).to.be.revertedWithCustomError(
                     erc1594Facet,
                     'NotAllowedInMultiPartitionMode'
@@ -439,12 +433,11 @@ describe('ERC1594 Tests', () => {
             })
 
             it('GIVEN an initialized token WHEN redeem THEN fails with NotAllowedInMultiPartitionMode', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.redeem(2 * BALANCE_OF_C_ORIGINAL, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .redeem(2 * BALANCE_OF_C_ORIGINAL, DATA)
                 ).to.be.revertedWithCustomError(
                     erc1594Facet,
                     'NotAllowedInMultiPartitionMode'
@@ -452,16 +445,11 @@ describe('ERC1594 Tests', () => {
             })
 
             it('GIVEN an initialized token WHEN redeemFrom THEN fails with NotAllowedInMultiPartitionMode', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.redeemFrom(
-                        account_D,
-                        2 * BALANCE_OF_C_ORIGINAL,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .redeemFrom(account_D, 2 * BALANCE_OF_C_ORIGINAL, DATA)
                 ).to.be.revertedWithCustomError(
                     erc1594Facet,
                     'NotAllowedInMultiPartitionMode'
@@ -469,16 +457,11 @@ describe('ERC1594 Tests', () => {
             })
 
             it('GIVEN an initialized token WHEN canTransfer THEN fails with NotAllowedInMultiPartitionMode', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.canTransfer(
-                        account_D,
-                        2 * BALANCE_OF_C_ORIGINAL,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .canTransfer(account_D, 2 * BALANCE_OF_C_ORIGINAL, DATA)
                 ).to.revertedWithCustomError(
                     erc1594Facet,
                     'NotAllowedInMultiPartitionMode'
@@ -486,17 +469,16 @@ describe('ERC1594 Tests', () => {
             })
 
             it('GIVEN an initialized token WHEN canTransferFrom THEN fails with NotAllowedInMultiPartitionMode', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.canTransferFrom(
-                        account_B,
-                        account_D,
-                        2 * BALANCE_OF_C_ORIGINAL,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .canTransferFrom(
+                            account_B,
+                            account_D,
+                            2 * BALANCE_OF_C_ORIGINAL,
+                            DATA
+                        )
                 ).to.revertedWithCustomError(
                     erc1594Facet,
                     'NotAllowedInMultiPartitionMode'
@@ -661,12 +643,11 @@ describe('ERC1594 Tests', () => {
         })
         describe('Cap', () => {
             it('GIVEN a max supply WHEN issue more than the max supply THEN transaction fails with MaxSupplyReached', async () => {
-                // Using account A (with role)
-                erc1594Facet = erc1594Facet.connect(signer_A)
-
                 // add to list fails
                 await expect(
-                    erc1594Facet.issue(account_E, MAX_SUPPLY + 1, DATA)
+                    erc1594Facet
+                        .connect(signer_A)
+                        .issue(account_E, MAX_SUPPLY + 1, DATA)
                 ).to.be.rejectedWith('MaxSupplyReached')
             })
         })
@@ -674,60 +655,72 @@ describe('ERC1594 Tests', () => {
         describe('ControlList', () => {
             it('GIVEN blocked accounts (sender, to, from) WHEN transfer THEN transaction fails with AccountIsBlocked', async () => {
                 // Blacklisting accounts
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_A)
-                controlList = controlList.connect(signer_A)
-                await controlList.addToControlList(account_C)
 
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROL_LIST_ROLE, account_A)
+                await controlList.connect(signer_A).addToControlList(account_C)
 
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.transferWithData(account_D, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferWithData(account_D, AMOUNT, DATA)
                 ).to.be.rejectedWith('AccountIsBlocked')
 
                 // transfer from with data fails
                 await expect(
-                    erc1594Facet.transferFromWithData(
-                        account_E,
-                        account_D,
-                        AMOUNT,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferFromWithData(
+                            account_E,
+                            account_D,
+                            AMOUNT,
+                            DATA
+                        )
                 ).to.be.rejectedWith('AccountIsBlocked')
 
                 // Update blacklist
-                await controlList.removeFromControlList(account_C)
-                await controlList.addToControlList(account_D)
+                await controlList
+                    .connect(signer_A)
+                    .removeFromControlList(account_C)
+                await controlList.connect(signer_A).addToControlList(account_D)
 
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.transferWithData(account_D, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferWithData(account_D, AMOUNT, DATA)
                 ).to.be.rejectedWith('AccountIsBlocked')
 
                 // transfer from with data fails
                 await expect(
-                    erc1594Facet.transferFromWithData(
-                        account_E,
-                        account_D,
-                        AMOUNT,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferFromWithData(
+                            account_E,
+                            account_D,
+                            AMOUNT,
+                            DATA
+                        )
                 ).to.be.rejectedWith('AccountIsBlocked')
 
                 // Update blacklist
-                await controlList.removeFromControlList(account_D)
-                await controlList.addToControlList(account_E)
+                await controlList
+                    .connect(signer_A)
+                    .removeFromControlList(account_D)
+                await controlList.connect(signer_A).addToControlList(account_E)
 
                 // transfer from with data fails
                 await expect(
-                    erc1594Facet.transferFromWithData(
-                        account_E,
-                        account_D,
-                        AMOUNT,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferFromWithData(
+                            account_E,
+                            account_D,
+                            AMOUNT,
+                            DATA
+                        )
                 ).to.be.rejectedWith('AccountIsBlocked')
             })
 
@@ -810,31 +803,34 @@ describe('ERC1594 Tests', () => {
 
             it('GIVEN blocked accounts (sender, from) WHEN redeem THEN transaction fails with AccountIsBlocked', async () => {
                 // Blacklisting accounts
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_A)
-                controlList = controlList.connect(signer_A)
-                await controlList.addToControlList(account_C)
-
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROL_LIST_ROLE, account_A)
+                await controlList.connect(signer_A).addToControlList(account_C)
 
                 // redeem with data fails
                 await expect(
-                    erc1594Facet.redeem(AMOUNT, DATA)
+                    erc1594Facet.connect(signer_C).redeem(AMOUNT, DATA)
                 ).to.be.rejectedWith('AccountIsBlocked')
 
                 // redeem from with data fails
                 await expect(
-                    erc1594Facet.redeemFrom(account_E, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .redeemFrom(account_E, AMOUNT, DATA)
                 ).to.be.rejectedWith('AccountIsBlocked')
 
                 // Update blacklist
-                await controlList.removeFromControlList(account_C)
-                await controlList.addToControlList(account_E)
+                await controlList
+                    .connect(signer_A)
+                    .removeFromControlList(account_C)
+                await controlList.connect(signer_A).addToControlList(account_E)
 
                 // redeem from with data fails
                 await expect(
-                    erc1594Facet.redeemFrom(account_E, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .redeemFrom(account_E, AMOUNT, DATA)
                 ).to.be.rejectedWith('AccountIsBlocked')
             })
         })
@@ -847,12 +843,12 @@ describe('ERC1594 Tests', () => {
                     'IClearing',
                     diamond.address
                 )
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
 
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.transferWithData(account_D, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferWithData(account_D, AMOUNT, DATA)
                 ).to.be.revertedWithCustomError(
                     clearingInterface,
                     'ClearingIsActivated'
@@ -860,12 +856,14 @@ describe('ERC1594 Tests', () => {
 
                 // transfer from with data fails
                 await expect(
-                    erc1594Facet.transferFromWithData(
-                        account_E,
-                        account_D,
-                        AMOUNT,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferFromWithData(
+                            account_E,
+                            account_D,
+                            AMOUNT,
+                            DATA
+                        )
                 ).to.be.revertedWithCustomError(
                     clearingInterface,
                     'ClearingIsActivated'
@@ -877,18 +875,18 @@ describe('ERC1594 Tests', () => {
                     'IClearing',
                     diamond.address
                 )
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
 
                 await expect(
-                    erc1594Facet.redeem(AMOUNT, DATA)
+                    erc1594Facet.connect(signer_C).redeem(AMOUNT, DATA)
                 ).to.be.revertedWithCustomError(
                     clearingInterface,
                     'ClearingIsActivated'
                 )
 
                 await expect(
-                    erc1594Facet.redeemFrom(account_E, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .redeemFrom(account_E, AMOUNT, DATA)
                 ).to.be.revertedWithCustomError(
                     clearingInterface,
                     'ClearingIsActivated'
@@ -897,8 +895,6 @@ describe('ERC1594 Tests', () => {
         })
         describe('Paused', () => {
             beforeEach(async () => {
-                // Pausing the token
-                pauseFacet = pauseFacet.connect(signer_B)
                 await kycFacet.grantKyc(
                     account_C,
                     EMPTY_VC_ID,
@@ -911,15 +907,14 @@ describe('ERC1594 Tests', () => {
                 await erc20Facet
                     .connect(signer_E)
                     .increaseAllowance(account_C, AMOUNT)
-                await pauseFacet.pause()
+                await pauseFacet.connect(signer_B).pause()
             })
 
             it('GIVEN a paused Token WHEN transfer THEN transaction fails with TokenIsPaused', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 expect(
-                    await erc1594Facet.canTransfer(account_D, AMOUNT, DATA)
+                    await erc1594Facet
+                        .connect(signer_C)
+                        .canTransfer(account_D, AMOUNT, DATA)
                 ).to.be.deep.equal([
                     false,
                     EIP1066_CODES.PAUSED,
@@ -927,12 +922,9 @@ describe('ERC1594 Tests', () => {
                 ])
 
                 expect(
-                    await erc1594Facet.canTransferFrom(
-                        account_E,
-                        account_D,
-                        AMOUNT,
-                        DATA
-                    )
+                    await erc1594Facet
+                        .connect(signer_C)
+                        .canTransferFrom(account_E, account_D, AMOUNT, DATA)
                 ).to.be.deep.equal([
                     false,
                     EIP1066_CODES.PAUSED,
@@ -940,70 +932,68 @@ describe('ERC1594 Tests', () => {
                 ])
             })
             it('GIVEN a paused Token WHEN transfer THEN transaction fails with TokenIsPaused', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.transferWithData(account_D, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferWithData(account_D, AMOUNT, DATA)
                 ).to.be.rejectedWith('TokenIsPaused')
 
                 // transfer from with data fails
                 await expect(
-                    erc1594Facet.transferFromWithData(
-                        account_E,
-                        account_D,
-                        AMOUNT,
-                        DATA
-                    )
+                    erc1594Facet
+                        .connect(signer_C)
+                        .transferFromWithData(
+                            account_E,
+                            account_D,
+                            AMOUNT,
+                            DATA
+                        )
                 ).to.be.rejectedWith('TokenIsPaused')
             })
 
             it('GIVEN a paused Token WHEN issue THEN transaction fails with TokenIsPaused', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
                 // issue fails
                 await expect(
-                    erc1594Facet.issue(account_E, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .issue(account_E, AMOUNT, DATA)
                 ).to.be.revertedWithCustomError(erc1594Facet, 'TokenIsPaused')
             })
 
             it('GIVEN a paused Token WHEN redeem THEN transaction fails with TokenIsPaused', async () => {
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
                 // transfer with data fails
                 await expect(
-                    erc1594Facet.redeem(AMOUNT, DATA)
+                    erc1594Facet.connect(signer_C).redeem(AMOUNT, DATA)
                 ).to.be.rejectedWith('TokenIsPaused')
 
                 // transfer from with data fails
                 await expect(
-                    erc1594Facet.redeemFrom(account_E, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_C)
+                        .redeemFrom(account_E, AMOUNT, DATA)
                 ).to.be.rejectedWith('TokenIsPaused')
             })
         })
 
         describe('AccessControl', () => {
             it('GIVEN an account without issuer role WHEN issue THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc1594Facet = erc1594Facet.connect(signer_B)
-
                 // add to list fails
                 await expect(
-                    erc1594Facet.issue(account_E, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_B)
+                        .issue(account_E, AMOUNT, DATA)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
         })
 
         describe('AccessControl', () => {
             it('GIVEN an account without issuer role WHEN issue THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc1594Facet = erc1594Facet.connect(signer_B)
-
                 // add to list fails
                 await expect(
-                    erc1594Facet.issue(account_E, AMOUNT, DATA)
+                    erc1594Facet
+                        .connect(signer_B)
+                        .issue(account_E, AMOUNT, DATA)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
         })
@@ -1029,16 +1019,15 @@ describe('ERC1594 Tests', () => {
                     .connect(signer_E)
                     .increaseAllowance(account_C, AMOUNT)
                 // Blacklisting accounts
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_A)
-                controlList = controlList.connect(signer_A)
-                await controlList.addToControlList(account_C)
-
-                // Using account C (with role)
-                erc1594Facet = erc1594Facet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROL_LIST_ROLE, account_A)
+                await controlList.connect(signer_A).addToControlList(account_C)
 
                 expect(
-                    await erc1594Facet.canTransfer(account_D, AMOUNT, DATA)
+                    await erc1594Facet
+                        .connect(signer_C)
+                        .canTransfer(account_D, AMOUNT, DATA)
                 ).to.be.deep.equal([
                     false,
                     EIP1066_CODES.DISALLOWED_OR_STOP,
@@ -1057,25 +1046,19 @@ describe('ERC1594 Tests', () => {
 
                 await erc1594Issuer.issue(account_E, AMOUNT, DATA)
                 expect(
-                    await erc1594Facet.canTransferFrom(
-                        account_E,
-                        account_D,
-                        AMOUNT,
-                        DATA
-                    )
+                    await erc1594Facet
+                        .connect(signer_C)
+                        .canTransferFrom(account_E, account_D, AMOUNT, DATA)
                 ).to.be.deep.equal([
                     false,
                     EIP1066_CODES.DISALLOWED_OR_STOP,
                     getSelector(erc1594Facet, 'AccountIsBlocked'),
                 ])
-                erc1594Facet = erc1594Facet.connect(signer_A)
+
                 expect(
-                    await erc1594Facet.canTransferFrom(
-                        account_C,
-                        account_D,
-                        AMOUNT,
-                        DATA
-                    )
+                    await erc1594Facet
+                        .connect(signer_A)
+                        .canTransferFrom(account_C, account_D, AMOUNT, DATA)
                 ).to.be.deep.equal([
                     false,
                     EIP1066_CODES.DISALLOWED_OR_STOP,
@@ -1085,12 +1068,9 @@ describe('ERC1594 Tests', () => {
                     .connect(signer_E)
                     .increaseAllowance(account_A, AMOUNT)
                 expect(
-                    await erc1594Facet.canTransferFrom(
-                        account_E,
-                        account_C,
-                        AMOUNT,
-                        DATA
-                    )
+                    await erc1594Facet
+                        .connect(signer_A)
+                        .canTransferFrom(account_E, account_C, AMOUNT, DATA)
                 ).to.be.deep.equal([
                     false,
                     EIP1066_CODES.DISALLOWED_OR_STOP,
@@ -1473,24 +1453,22 @@ describe('ERC1594 Tests', () => {
                 // issue succeeds
                 await erc1594Issuer.issue(account_E, AMOUNT, DATA)
 
-                erc20Facet = erc20Facet.connect(signer_E)
-
-                await erc20Facet.approve(account_D, AMOUNT / 2)
-
-                erc1594Approved = erc1594Approved.connect(signer_D)
+                await erc20Facet
+                    .connect(signer_E)
+                    .approve(account_D, AMOUNT / 2)
 
                 expect(
-                    await erc1594Approved.redeemFrom(
-                        account_E,
-                        AMOUNT / 2,
-                        DATA
-                    )
+                    await erc1594Approved
+                        .connect(signer_D)
+                        .redeemFrom(account_E, AMOUNT / 2, DATA)
                 )
                     .to.emit(erc1594Issuer, 'Redeemed')
                     .withArgs(account_D, account_E, AMOUNT / 2)
 
                 expect(
-                    await erc20Facet.allowance(account_E, account_D)
+                    await erc20Facet
+                        .connect(signer_E)
+                        .allowance(account_E, account_D)
                 ).to.be.equal(0)
                 expect(await erc1410SnapshotFacet.totalSupply()).to.be.equal(
                     AMOUNT / 2
diff --git a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1643/erc1643.test.ts b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1643/erc1643.test.ts
index da6a37729..80ad82c8d 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1643/erc1643.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1643/erc1643.test.ts
@@ -326,26 +326,18 @@ describe('ERC1643 Tests', () => {
     })
 
     it('GIVEN an account without documenter role WHEN setDocument THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
-
         // add document fails
         await expect(
-            erc1643Facet.setDocument(
-                documentName_1,
-                documentURI_1,
-                documentHASH_1
-            )
+            erc1643Facet
+                .connect(signer_C)
+                .setDocument(documentName_1, documentURI_1, documentHASH_1)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
     it('GIVEN an account without documenter role WHEN removeDocument THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
-
         // add document fails
         await expect(
-            erc1643Facet.removeDocument(documentName_1)
+            erc1643Facet.connect(signer_C).removeDocument(documentName_1)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
@@ -360,16 +352,11 @@ describe('ERC1643 Tests', () => {
             account_C
         )
 
-        // Using account C (with role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
-
         // add document fails
         await expect(
-            erc1643Facet.setDocument(
-                documentName_1,
-                documentURI_1,
-                documentHASH_1
-            )
+            erc1643Facet
+                .connect(signer_C)
+                .setDocument(documentName_1, documentURI_1, documentHASH_1)
         ).to.be.revertedWithCustomError(erc1643Facet, 'TokenIsPaused')
     })
 
@@ -384,82 +371,74 @@ describe('ERC1643 Tests', () => {
             account_C
         )
 
-        // Using account C (with role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
-
         // remove document
         await expect(
-            erc1643Facet.removeDocument(documentName_1)
+            erc1643Facet.connect(signer_C).removeDocument(documentName_1)
         ).to.be.revertedWithCustomError(erc1643Facet, 'TokenIsPaused')
     })
 
     it('GIVEN a document with no name WHEN setDocument THEN transaction fails with EmptyName', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(DOCUMENTER_ROLE, account_C)
-        // Using account C (with role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(DOCUMENTER_ROLE, account_C)
 
         // add document fails
         await expect(
-            erc1643Facet.setDocument(
-                '0x0000000000000000000000000000000000000000000000000000000000000000',
-                documentURI_1,
-                documentHASH_1
-            )
+            erc1643Facet
+                .connect(signer_C)
+                .setDocument(
+                    '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    documentURI_1,
+                    documentHASH_1
+                )
         ).to.be.rejectedWith('EmptyName')
     })
 
     it('GIVEN a document with no URI WHEN setDocument THEN transaction fails with EmptyURI', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(DOCUMENTER_ROLE, account_C)
-        // Using account C (with role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
-
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(DOCUMENTER_ROLE, account_C)
         // add document fails
         await expect(
-            erc1643Facet.setDocument(documentName_1, '', documentHASH_1)
+            erc1643Facet
+                .connect(signer_C)
+                .setDocument(documentName_1, '', documentHASH_1)
         ).to.be.rejectedWith('EmptyURI')
     })
 
     it('GIVEN a document with no HASH WHEN setDocument THEN transaction fails with EmptyHASH', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(DOCUMENTER_ROLE, account_C)
-        // Using account C (with role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(DOCUMENTER_ROLE, account_C)
 
         // add document fails
         await expect(
-            erc1643Facet.setDocument(
-                documentName_1,
-                documentURI_1,
-                '0x0000000000000000000000000000000000000000000000000000000000000000'
-            )
+            erc1643Facet
+                .connect(signer_C)
+                .setDocument(
+                    documentName_1,
+                    documentURI_1,
+                    '0x0000000000000000000000000000000000000000000000000000000000000000'
+                )
         ).to.be.rejectedWith('EmptyHASH')
     })
 
     it('GIVEN a document that does not exist WHEN removeDocument THEN transaction fails with DocumentDoesNotExist', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(DOCUMENTER_ROLE, account_C)
-        // Using account C (with role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(DOCUMENTER_ROLE, account_C)
 
         // add document fails
         await expect(
-            erc1643Facet.removeDocument(documentName_1)
+            erc1643Facet.connect(signer_C).removeDocument(documentName_1)
         ).to.be.rejectedWith('DocumentDoesNotExist')
     })
 
     it('GIVEN an account with documenter role WHEN setDocument and removeDocument THEN transaction succeeds', async () => {
         // ADD TO LIST ------------------------------------------------------------------
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(DOCUMENTER_ROLE, account_C)
-        // Using account C (with role)
-        erc1643Facet = erc1643Facet.connect(signer_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(DOCUMENTER_ROLE, account_C)
 
         // check that Document not in the list
         let documents = await erc1643Facet.getAllDocuments()
@@ -467,19 +446,15 @@ describe('ERC1643 Tests', () => {
 
         // add document
         await expect(
-            erc1643Facet.setDocument(
-                documentName_1,
-                documentURI_1,
-                documentHASH_1
-            )
+            erc1643Facet
+                .connect(signer_C)
+                .setDocument(documentName_1, documentURI_1, documentHASH_1)
         )
             .to.emit(erc1643Facet, 'DocumentUpdated')
             .withArgs(documentName_1, documentURI_1, documentHASH_1)
-        await erc1643Facet.setDocument(
-            documentName_2,
-            documentURI_2,
-            documentHASH_2
-        )
+        await erc1643Facet
+            .connect(signer_C)
+            .setDocument(documentName_2, documentURI_2, documentHASH_2)
 
         // check documents
         documents = await erc1643Facet.getAllDocuments()
@@ -491,10 +466,12 @@ describe('ERC1643 Tests', () => {
 
         // REMOVE FROM LIST ------------------------------------------------------------------
         // remove From list
-        await expect(erc1643Facet.removeDocument(documentName_1))
+        await expect(
+            erc1643Facet.connect(signer_C).removeDocument(documentName_1)
+        )
             .to.emit(erc1643Facet, 'DocumentRemoved')
             .withArgs(documentName_1, documentURI_1, documentHASH_1)
-        await erc1643Facet.removeDocument(documentName_2)
+        await erc1643Facet.connect(signer_C).removeDocument(documentName_2)
         // check documents
         documents = await erc1643Facet.getAllDocuments()
         expect(documents.length).to.equal(0)
diff --git a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1644/erc1644.test.ts b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1644/erc1644.test.ts
index 1f5a6a0c6..5d9b74085 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1644/erc1644.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC1644/erc1644.test.ts
@@ -211,9 +211,7 @@ import {
     type ResolverProxy,
     type ERC1644,
     type Pause,
-    type ERC1594,
     type AccessControl,
-    type Equity,
     type IERC1410,
     IFactory,
     BusinessLogicResolver,
@@ -261,10 +259,8 @@ describe('ERC1644 Tests', () => {
     let factory: IFactory
     let businessLogicResolver: BusinessLogicResolver
     let erc1644Facet: ERC1644
-    let erc1594Facet: ERC1594
     let accessControlFacet: AccessControl
     let pauseFacet: Pause
-    let equityFacet: Equity
     let erc1410Facet: IERC1410
     let kycFacet: Kyc
     let ssiManagementFacet: SsiManagement
@@ -366,13 +362,6 @@ describe('ERC1644 Tests', () => {
                 diamond.address
             )
 
-            erc1594Facet = await ethers.getContractAt(
-                'ERC1594',
-                diamond.address
-            )
-
-            equityFacet = await ethers.getContractAt('Equity', diamond.address)
-
             pauseFacet = await ethers.getContractAt('Pause', diamond.address)
 
             erc1410Facet = await ethers.getContractAt(
@@ -411,71 +400,59 @@ describe('ERC1644 Tests', () => {
                 )
             })
             it('GIVEN a paused Token WHEN controllerTransfer THEN transaction fails with TokenIsPaused', async () => {
-                // Using account C (with role)
-                erc1644Facet = erc1644Facet.connect(signer_C)
-
                 // controller transfer fails
                 await expect(
-                    erc1644Facet.controllerTransfer(
-                        account_D,
-                        account_E,
-                        amount,
-                        '0x',
-                        '0x'
-                    )
+                    erc1644Facet
+                        .connect(signer_C)
+                        .controllerTransfer(
+                            account_D,
+                            account_E,
+                            amount,
+                            '0x',
+                            '0x'
+                        )
                 ).to.be.revertedWithCustomError(erc1644Facet, 'TokenIsPaused')
             })
 
             it('GIVEN a paused Token WHEN controllerRedeem THEN transaction fails with TokenIsPaused', async () => {
-                // Using account C (with role)
-                erc1644Facet = erc1644Facet.connect(signer_C)
-
                 // remove document
                 await expect(
-                    erc1644Facet.controllerRedeem(account_D, amount, '0x', '0x')
+                    erc1644Facet
+                        .connect(signer_C)
+                        .controllerRedeem(account_D, amount, '0x', '0x')
                 ).to.be.revertedWithCustomError(erc1644Facet, 'TokenIsPaused')
             })
         })
 
         describe('AccessControl', () => {
             it('GIVEN an account without admin role WHEN finalizeControllable THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc1644Facet = erc1644Facet.connect(signer_C)
-
                 // controller finalize fails
                 await expect(
-                    erc1644Facet.finalizeControllable()
+                    erc1644Facet.connect(signer_C).finalizeControllable()
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
 
             it('GIVEN an account without controller role WHEN controllerTransfer THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc1644Facet = erc1644Facet.connect(signer_C)
-
                 // controller transfer fails
                 await expect(
-                    erc1644Facet.controllerTransfer(
-                        account_D,
-                        account_E,
-                        amount,
-                        data,
-                        operatorData
-                    )
+                    erc1644Facet
+                        .connect(signer_C)
+                        .controllerTransfer(
+                            account_D,
+                            account_E,
+                            amount,
+                            data,
+                            operatorData
+                        )
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
 
             it('GIVEN an account without controller role WHEN controllerRedeem THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc1644Facet = erc1644Facet.connect(signer_C)
-
                 // controller redeem fails
                 await expect(
-                    erc1644Facet.controllerRedeem(
-                        account_D,
-                        amount,
-                        data,
-                        operatorData
-                    )
+                    erc1644Facet
+                        .connect(signer_C)
+                        .controllerRedeem(account_D, amount, data, operatorData)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
         })
@@ -592,16 +569,15 @@ describe('ERC1644 Tests', () => {
 
         describe('finalizeControllable', () => {
             beforeEach(async () => {
-                // Using account C (non role)
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(CONTROLLER_ROLE, account_A)
-                await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-
-                // controller finalize fails
-                erc1644Facet = erc1644Facet.connect(signer_A)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
-                await expect(erc1644Facet.finalizeControllable())
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROLLER_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ISSUER_ROLE, account_C)
+                await expect(
+                    erc1644Facet.connect(signer_A).finalizeControllable()
+                )
                     .to.emit(erc1644Facet, 'FinalizedControllerFeature')
                     .withArgs(account_A)
             })
@@ -725,31 +701,21 @@ describe('ERC1644 Tests', () => {
                 diamond.address
             )
 
-            erc1594Facet = await ethers.getContractAt(
-                'ERC1594',
-                diamond.address
-            )
-
-            equityFacet = await ethers.getContractAt('Equity', diamond.address)
-
             pauseFacet = await ethers.getContractAt('Pause', diamond.address)
         })
 
         describe('NotAllowedInMultiPartitionMode', () => {
             beforeEach(async () => {
                 // BEFORE SCHEDULED SNAPSHOTS ------------------------------------------------------------------
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(CONTROLLER_ROLE, account_C)
-                await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-                await accessControlFacet.grantRole(
-                    CORPORATE_ACTION_ROLE,
-                    account_C
-                )
-                // Using account C (with role)
-                erc1644Facet = erc1644Facet.connect(signer_C)
-                erc1594Facet = erc1594Facet.connect(signer_C)
-                equityFacet = equityFacet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROLLER_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ISSUER_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CORPORATE_ACTION_ROLE, account_C)
             })
 
             it('GIVEN an account with controller role WHEN controllerTransfer THEN NotAllowedInMultiPartitionMode', async () => {
diff --git a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC20/erc20.test.ts b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC20/erc20.test.ts
index 033f86e86..e22a603d9 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC20/erc20.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC20/erc20.test.ts
@@ -413,26 +413,30 @@ describe('ERC20 Tests', () => {
         })
 
         it('GIVEN a initialized ERC20 WHEN running any state changing method THEN transaction fails with NotAllowedInMultiPartitionMode', async () => {
-            erc20Facet = erc20Facet.connect(signer_A)
-
             await expect(
-                erc20Facet.approve(account_E, amount)
+                erc20Facet.connect(signer_A).approve(account_E, amount)
             ).to.be.rejectedWith('NotAllowedInMultiPartitionMode')
 
             await expect(
-                erc20Facet.transfer(account_E, amount)
+                erc20Facet.connect(signer_A).transfer(account_E, amount)
             ).to.be.rejectedWith('NotAllowedInMultiPartitionMode')
 
             await expect(
-                erc20Facet.transferFrom(account_C, account_E, amount)
+                erc20Facet
+                    .connect(signer_A)
+                    .transferFrom(account_C, account_E, amount)
             ).to.be.rejectedWith('NotAllowedInMultiPartitionMode')
 
             await expect(
-                erc20Facet.increaseAllowance(account_C, amount)
+                erc20Facet
+                    .connect(signer_A)
+                    .increaseAllowance(account_C, amount)
             ).to.be.rejectedWith('NotAllowedInMultiPartitionMode')
 
             await expect(
-                erc20Facet.decreaseAllowance(account_C, amount)
+                erc20Facet
+                    .connect(signer_A)
+                    .decreaseAllowance(account_C, amount)
             ).to.be.rejectedWith('NotAllowedInMultiPartitionMode')
         })
     })
diff --git a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC20Permit/erc20Permit.test.ts b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC20Permit/erc20Permit.test.ts
index d10bf92e2..fa06049a3 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC20Permit/erc20Permit.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/ERC1400/ERC20Permit/erc20Permit.test.ts
@@ -392,10 +392,10 @@ describe('ERC20Permit Tests', () => {
 
             it('GIVEN a blocked owner account WHEN permit is called THEN the transaction fails with AccountIsBlocked', async () => {
                 // Blacklisting accounts
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_A)
-                controlList = controlList.connect(signer_A)
-                await controlList.addToControlList(account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROL_LIST_ROLE, account_A)
+                await controlList.connect(signer_A).addToControlList(account_C)
 
                 await expect(
                     erc20PermitFacet.permit(
@@ -414,10 +414,10 @@ describe('ERC20Permit Tests', () => {
             })
 
             it('GIVEN a blocked spender account WHEN permit is called THEN the transaction fails with AccountIsBlocked', async () => {
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_A)
-                controlList = controlList.connect(signer_A)
-                await controlList.addToControlList(account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROL_LIST_ROLE, account_A)
+                await controlList.connect(signer_A).addToControlList(account_C)
 
                 await expect(
                     erc20PermitFacet.permit(
diff --git a/packages/ats/contracts/test/unitTests/layer_1/ERC3643/erc3643.test.ts b/packages/ats/contracts/test/unitTests/layer_1/ERC3643/erc3643.test.ts
index 445e76cca..5f15b863e 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/ERC3643/erc3643.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/ERC3643/erc3643.test.ts
@@ -635,8 +635,7 @@ describe('ERC3643 Tests', () => {
         })
 
         it('GIVEN a paused token WHEN attempting to update name or symbol THEN transactions revert with TokenIsPaused error', async () => {
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
+            await pauseFacet.connect(signer_B).pause()
 
             await expect(erc3643Facet.setName(newName)).to.be.rejectedWith(
                 'TokenIsPaused'
@@ -680,30 +679,25 @@ describe('ERC3643 Tests', () => {
                     account_A
                 )
 
-                pauseFacet = pauseFacet.connect(signer_B)
-                await pauseFacet.pause()
+                await pauseFacet.connect(signer_B).pause()
 
                 await expect(
                     erc3643Facet.mint(account_A, AMOUNT)
                 ).to.be.revertedWithCustomError(pauseFacet, 'TokenIsPaused')
             })
             it('GIVEN a max supply WHEN mint more than the max supply THEN transaction fails with MaxSupplyReached', async () => {
-                // Using account A (with role)
-                erc3643Facet = erc3643Facet.connect(signer_A)
-
                 await expect(
-                    erc3643Facet.mint(account_E, MAX_SUPPLY + 1)
+                    erc3643Facet
+                        .connect(signer_A)
+                        .mint(account_E, MAX_SUPPLY + 1)
                 ).to.be.rejectedWith('MaxSupplyReached')
             })
             it('GIVEN blocked account USING WHITELIST WHEN mint THEN transaction fails with AccountIsBlocked', async () => {
                 // Blacklisting accounts
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_A)
-                controlList = controlList.connect(signer_A)
-                await controlList.addToControlList(account_C)
-
-                // Using account C (with role)
-                erc3643Facet = erc3643Facet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROL_LIST_ROLE, account_A)
+                await controlList.connect(signer_A).addToControlList(account_C)
 
                 await ssiManagementFacet.addIssuer(account_C)
                 await kycFacet.grantKyc(
@@ -716,7 +710,7 @@ describe('ERC3643 Tests', () => {
 
                 // mint fails
                 await expect(
-                    erc3643Facet.mint(account_C, AMOUNT)
+                    erc3643Facet.connect(signer_C).mint(account_C, AMOUNT)
                 ).to.be.revertedWithCustomError(controlList, 'AccountIsBlocked')
             })
             it('GIVEN non kyc account WHEN mint THEN transaction reverts with InvalidKycStatus', async () => {
@@ -758,8 +752,7 @@ describe('ERC3643 Tests', () => {
                 ).to.be.equal(AMOUNT / 2)
             })
             it('GIVEN a paused token WHEN attempting to burn TokenIsPaused error', async () => {
-                pauseFacet = pauseFacet.connect(signer_B)
-                await pauseFacet.pause()
+                await pauseFacet.connect(signer_B).pause()
 
                 await expect(
                     erc3643Facet.burn(account_A, AMOUNT)
@@ -818,8 +811,7 @@ describe('ERC3643 Tests', () => {
                 ).to.be.equal(AMOUNT)
             })
             it('GIVEN a paused token WHEN attempting to forcedTransfer TokenIsPaused error', async () => {
-                pauseFacet = pauseFacet.connect(signer_B)
-                await pauseFacet.pause()
+                await pauseFacet.connect(signer_B).pause()
 
                 await expect(
                     erc3643Facet.forcedTransfer(
@@ -830,10 +822,10 @@ describe('ERC3643 Tests', () => {
                 ).to.be.rejectedWith('TokenIsPaused')
             })
             it('GIVEN an account without CONTROLLER_ROLE WHEN forcedTransfer is called THEN transaction fails with AccountHasNoRole', async () => {
-                erc3643Facet = erc3643Facet.connect(signer_B)
-
                 await expect(
-                    erc3643Facet.forcedTransfer(account_D, account_E, AMOUNT)
+                    erc3643Facet
+                        .connect(signer_B)
+                        .forcedTransfer(account_D, account_E, AMOUNT)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
         })
@@ -1102,9 +1094,10 @@ describe('ERC3643 Tests', () => {
 
             it('GIVEN non verified account with balance WHEN transfer THEN reverts with AddressNotVerified', async () => {
                 // Setup
-                const erc20FacetE = erc20Facet.connect(signer_E)
                 await erc3643Facet.mint(account_E, 2 * AMOUNT)
-                await erc20FacetE.approve(account_D, MAX_UINT256)
+                await erc20Facet
+                    .connect(signer_E)
+                    .approve(account_D, MAX_UINT256)
                 await erc1410Facet
                     .connect(signer_E)
                     .authorizeOperator(account_D)
@@ -1113,7 +1106,7 @@ describe('ERC3643 Tests', () => {
 
                 // Transfers
                 await expect(
-                    erc20FacetE.transfer(account_D, AMOUNT)
+                    erc20Facet.connect(signer_E).transfer(account_D, AMOUNT)
                 ).to.be.revertedWithCustomError(
                     erc3643Facet,
                     'AddressNotVerified'
@@ -1305,10 +1298,8 @@ describe('ERC3643 Tests', () => {
                 await erc3643Facet.mint(account_E, AMOUNT)
                 await complianceMock.setFlags(false, false) // canTransfer = false
 
-                const erc20FacetE = erc20Facet.connect(signer_E)
-
                 await expect(
-                    erc20FacetE.transfer(account_D, AMOUNT / 2)
+                    erc20Facet.connect(signer_E).transfer(account_D, AMOUNT / 2)
                 ).to.be.revertedWithCustomError(
                     erc3643Facet,
                     'ComplianceNotAllowed'
@@ -1320,10 +1311,9 @@ describe('ERC3643 Tests', () => {
                 await erc3643Facet.mint(account_E, AMOUNT)
                 await complianceMock.setFlags(true, false) // canTransfer = true
 
-                const erc20FacetE = erc20Facet.connect(signer_E)
-
-                await expect(erc20FacetE.transfer(account_D, AMOUNT / 2)).to.not
-                    .be.reverted
+                await expect(
+                    erc20Facet.connect(signer_E).transfer(account_D, AMOUNT / 2)
+                ).to.not.be.reverted
 
                 expect(
                     await erc1410SnapshotFacet.balanceOf(account_E)
@@ -1429,10 +1419,8 @@ describe('ERC3643 Tests', () => {
                 await erc3643Facet.mint(account_E, AMOUNT)
                 await complianceMock.setFlags(false, false) // canTransfer = false
 
-                const erc20FacetE = erc20Facet.connect(signer_E)
-
                 await expect(
-                    erc20FacetE.transfer(account_D, AMOUNT / 2)
+                    erc20Facet.connect(signer_E).transfer(account_D, AMOUNT / 2)
                 ).to.be.revertedWithCustomError(
                     erc3643Facet,
                     'ComplianceNotAllowed'
@@ -1444,10 +1432,9 @@ describe('ERC3643 Tests', () => {
                 await erc3643Facet.mint(account_E, AMOUNT)
                 await complianceMock.setFlags(true, false) // canTransfer = true
 
-                const erc20FacetE = erc20Facet.connect(signer_E)
-
-                await expect(erc20FacetE.transfer(account_D, AMOUNT / 2)).to.not
-                    .be.reverted
+                await expect(
+                    erc20Facet.connect(signer_E).transfer(account_D, AMOUNT / 2)
+                ).to.not.be.reverted
 
                 expect(
                     await erc1410SnapshotFacet.balanceOf(account_E)
@@ -1945,9 +1932,10 @@ describe('ERC3643 Tests', () => {
             //TODO: we should test when canTransfer returns false for the FROM, TO and SENDER separately
             it('GIVEN ComplianceMock::canTransfer returns false THEN operations fail with ComplianceNotAllowed', async () => {
                 // Setup: mint tokens and set compliance to return false for canTransfer
-                const erc20FacetE = erc20Facet.connect(signer_E)
                 await erc3643Facet.mint(account_E, 2 * AMOUNT)
-                await erc20FacetE.approve(account_D, MAX_UINT256)
+                await erc20Facet
+                    .connect(signer_E)
+                    .approve(account_D, MAX_UINT256)
                 await erc1410Facet
                     .connect(signer_E)
                     .authorizeOperator(account_D)
@@ -1956,7 +1944,7 @@ describe('ERC3643 Tests', () => {
 
                 // Transfers
                 await expect(
-                    erc20FacetE.transfer(account_D, AMOUNT)
+                    erc20Facet.connect(signer_E).transfer(account_D, AMOUNT)
                 ).to.be.revertedWithCustomError(
                     erc3643Facet,
                     'ComplianceNotAllowed'
@@ -2092,7 +2080,7 @@ describe('ERC3643 Tests', () => {
 
                 // Approves
                 await expect(
-                    erc20FacetE.approve(account_D, AMOUNT)
+                    erc20Facet.connect(signer_E).approve(account_D, AMOUNT)
                 ).to.be.revertedWithCustomError(
                     erc3643Facet,
                     'ComplianceNotAllowed'
@@ -2115,7 +2103,9 @@ describe('ERC3643 Tests', () => {
                     'ComplianceNotAllowed'
                 )
                 await expect(
-                    erc20FacetE.increaseAllowance(account_D, AMOUNT)
+                    erc20Facet
+                        .connect(signer_E)
+                        .increaseAllowance(account_D, AMOUNT)
                 ).to.be.revertedWithCustomError(
                     erc3643Facet,
                     'ComplianceNotAllowed'
@@ -2242,10 +2232,10 @@ describe('ERC3643 Tests', () => {
                     const amounts = [mintAmount, mintAmount]
 
                     // signer_B does not have ISSUER_ROLE
-                    erc3643Facet = erc3643Facet.connect(signer_B)
-
                     await expect(
-                        erc3643Facet.batchMint(toList, amounts)
+                        erc3643Facet
+                            .connect(signer_B)
+                            .batchMint(toList, amounts)
                     ).to.be.rejectedWith('AccountHasNoRole')
                 })
 
@@ -2280,9 +2270,10 @@ describe('ERC3643 Tests', () => {
                     const initialBalanceD =
                         await erc1410SnapshotFacet.balanceOf(account_D)
 
-                    erc3643Transferor = erc3643Facet.connect(signer_E)
                     await expect(
-                        erc3643Transferor.batchTransfer(toList, amounts)
+                        erc3643Facet
+                            .connect(signer_E)
+                            .batchTransfer(toList, amounts)
                     ).to.not.be.reverted
 
                     const finalBalanceSender =
@@ -2307,10 +2298,11 @@ describe('ERC3643 Tests', () => {
                     const toList = [account_F, account_D]
                     // Total amount > balance
                     const amounts = [initialMintAmount, transferAmount]
-                    erc3643Transferor = erc3643Facet.connect(signer_E)
 
                     await expect(
-                        erc3643Transferor.batchTransfer(toList, amounts)
+                        erc3643Facet
+                            .connect(signer_E)
+                            .batchTransfer(toList, amounts)
                     ).to.be.revertedWithCustomError(
                         erc1410Facet,
                         'InvalidPartition'
@@ -2352,13 +2344,10 @@ describe('ERC3643 Tests', () => {
                     const initialBalanceE =
                         await erc1410SnapshotFacet.balanceOf(account_E)
 
-                    erc3643Facet = erc3643Facet.connect(signer_A)
                     await expect(
-                        erc3643Facet.batchForcedTransfer(
-                            fromList,
-                            toList,
-                            amounts
-                        )
+                        erc3643Facet
+                            .connect(signer_A)
+                            .batchForcedTransfer(fromList, toList, amounts)
                     ).to.not.be.reverted
 
                     const finalBalanceF =
@@ -2385,13 +2374,10 @@ describe('ERC3643 Tests', () => {
                     const amounts = [transferAmount]
 
                     // signer_B does not have CONTROLLER_ROLE
-                    erc3643Facet = erc3643Facet.connect(signer_B)
                     await expect(
-                        erc3643Facet.batchForcedTransfer(
-                            fromList,
-                            toList,
-                            amounts
-                        )
+                        erc3643Facet
+                            .connect(signer_B)
+                            .batchForcedTransfer(fromList, toList, amounts)
                     ).to.be.rejectedWith('AccountHasNoRole')
                 })
 
@@ -2418,12 +2404,13 @@ describe('ERC3643 Tests', () => {
                     await erc3643Issuer.mint(account_D, burnAmount)
                     await erc3643Issuer.mint(account_E, burnAmount)
 
-                    const erc20FacetD = erc20Facet.connect(signer_D)
-                    const erc20FacetE = erc20Facet.connect(signer_E)
-
                     // The burner (signer_A) needs approval from the token holders
-                    await erc20FacetD.approve(account_A, burnAmount)
-                    await erc20FacetE.approve(account_A, burnAmount)
+                    await erc20Facet
+                        .connect(signer_D)
+                        .approve(account_A, burnAmount)
+                    await erc20Facet
+                        .connect(signer_E)
+                        .approve(account_A, burnAmount)
                 })
 
                 it('GIVEN approved operator WHEN batchBurn THEN transaction succeeds', async () => {
@@ -2437,9 +2424,11 @@ describe('ERC3643 Tests', () => {
                     const initialBalanceE =
                         await erc1410SnapshotFacet.balanceOf(account_E)
 
-                    erc3643Facet = erc3643Facet.connect(signer_A)
-                    await expect(erc3643Facet.batchBurn(userAddresses, amounts))
-                        .to.not.be.reverted
+                    await expect(
+                        erc3643Facet
+                            .connect(signer_A)
+                            .batchBurn(userAddresses, amounts)
+                    ).to.not.be.reverted
 
                     const finalTotalSupply =
                         await erc1410SnapshotFacet.totalSupply()
@@ -2485,7 +2474,6 @@ describe('ERC3643 Tests', () => {
                     const freezeFlags = [true, true]
 
                     // Freeze accounts
-                    erc3643Facet = erc3643Facet.connect(signer_A)
                     await expect(
                         freezeFacet.batchSetAddressFrozen(
                             userAddresses,
@@ -2494,17 +2482,19 @@ describe('ERC3643 Tests', () => {
                     ).to.not.be.reverted
 
                     // Attempting transfers from frozen accounts should fail
-                    const erc20FacetD = erc20Facet.connect(signer_D)
                     await expect(
-                        erc20FacetD.transfer(account_A, transferAmount)
+                        erc20Facet
+                            .connect(signer_D)
+                            .transfer(account_A, transferAmount)
                     ).to.be.revertedWithCustomError(
                         controlList,
                         'AccountIsBlocked'
                     )
 
-                    const erc20FacetE = erc20Facet.connect(signer_E)
                     await expect(
-                        erc20FacetE.transfer(account_A, transferAmount)
+                        erc20Facet
+                            .connect(signer_E)
+                            .transfer(account_A, transferAmount)
                     ).to.be.revertedWithCustomError(
                         controlList,
                         'AccountIsBlocked'
@@ -2513,7 +2503,6 @@ describe('ERC3643 Tests', () => {
 
                 it('GIVEN frozen addresses WHEN batchSetAddressFrozen with false THEN transfers from those addresses succeed', async () => {
                     const userAddresses = [account_D, account_E]
-                    erc3643Facet = erc3643Facet.connect(signer_A)
                     // grant KYC to account_A
                     await kycFacet.grantKyc(
                         account_A,
@@ -2537,14 +2526,16 @@ describe('ERC3643 Tests', () => {
                         ])
                     ).to.not.be.reverted
 
-                    const erc20FacetD = erc20Facet.connect(signer_D)
                     await expect(
-                        erc20FacetD.transfer(account_A, transferAmount)
+                        erc20Facet
+                            .connect(signer_D)
+                            .transfer(account_A, transferAmount)
                     ).to.not.be.reverted
 
-                    const erc20FacetE = erc20Facet.connect(signer_E)
                     await expect(
-                        erc20FacetE.transfer(account_A, transferAmount)
+                        erc20Facet
+                            .connect(signer_E)
+                            .transfer(account_A, transferAmount)
                     ).to.not.be.reverted
 
                     // Check final balances to be sure
@@ -2560,13 +2551,10 @@ describe('ERC3643 Tests', () => {
                     const userAddresses = [account_D, account_E]
                     const freezeFlags = [true, true]
 
-                    freezeFacet = freezeFacet.connect(signer_F)
-
                     await expect(
-                        freezeFacet.batchSetAddressFrozen(
-                            userAddresses,
-                            freezeFlags
-                        )
+                        freezeFacet
+                            .connect(signer_F)
+                            .batchSetAddressFrozen(userAddresses, freezeFlags)
                     ).to.be.revertedWithCustomError(
                         accessControlFacet,
                         'AccountHasNoRoles'
@@ -2599,7 +2587,6 @@ describe('ERC3643 Tests', () => {
                     const initialFrozenE =
                         await freezeFacet.getFrozenTokens(account_E)
 
-                    erc3643Facet = erc3643Facet.connect(signer_A) // signer_A has FREEZE_MANAGER_ROLE
                     await expect(
                         freezeFacet.batchFreezePartialTokens(
                             userAddresses,
@@ -2639,7 +2626,6 @@ describe('ERC3643 Tests', () => {
                     await erc3643Issuer.mint(account_D, totalAmount)
                     await erc3643Issuer.mint(account_E, totalAmount)
 
-                    erc3643Facet = erc3643Facet.connect(signer_A) // signer_A has FREEZE_MANAGER_ROLE
                     await freezeFacet.freezePartialTokens(
                         account_D,
                         totalAmount
@@ -2724,11 +2710,9 @@ describe('ERC3643 Tests', () => {
 
             it('GIVEN a user with the agent role WHEN performing actions using ERC-1400 methods succeeds', async () => {
                 await accessControlFacet.grantRole(AGENT_ROLE, account_B)
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                erc1644Facet = erc1644Facet.connect(signer_B)
                 const amount = 1000
                 await expect(
-                    erc1410Facet.issueByPartition({
+                    erc1410Facet.connect(signer_B).issueByPartition({
                         partition: DEFAULT_PARTITION,
                         tokenHolder: account_E,
                         value: 4 * amount,
@@ -2737,42 +2721,48 @@ describe('ERC3643 Tests', () => {
                 ).to.emit(erc1410Facet, 'IssuedByPartition')
 
                 await expect(
-                    erc1644Facet.controllerRedeem(account_E, amount, '0x', '0x')
+                    erc1644Facet
+                        .connect(signer_B)
+                        .controllerRedeem(account_E, amount, '0x', '0x')
                 ).to.emit(erc1644Facet, 'ControllerRedemption')
                 await expect(
-                    erc1410Facet.controllerRedeemByPartition(
-                        DEFAULT_PARTITION,
-                        account_E,
-                        amount,
-                        '0x',
-                        '0x'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .controllerRedeemByPartition(
+                            DEFAULT_PARTITION,
+                            account_E,
+                            amount,
+                            '0x',
+                            '0x'
+                        )
                 ).to.emit(erc1410Facet, 'RedeemedByPartition')
                 await expect(
-                    erc1644Facet.controllerTransfer(
-                        account_E,
-                        account_D,
-                        amount,
-                        '0x',
-                        '0x'
-                    )
+                    erc1644Facet
+                        .connect(signer_B)
+                        .controllerTransfer(
+                            account_E,
+                            account_D,
+                            amount,
+                            '0x',
+                            '0x'
+                        )
                 ).to.emit(erc1644Facet, 'TransferByPartition')
                 await expect(
-                    erc1410Facet.controllerTransferByPartition(
-                        DEFAULT_PARTITION,
-                        account_E,
-                        account_D,
-                        amount,
-                        '0x',
-                        '0x'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .controllerTransferByPartition(
+                            DEFAULT_PARTITION,
+                            account_E,
+                            account_D,
+                            amount,
+                            '0x',
+                            '0x'
+                        )
                 ).to.emit(erc1410Facet, 'TransferByPartition')
             })
 
             it('GIVEN a user with the agent role WHEN performing actions using ERC-3643 methods succeeds', async () => {
                 await accessControlFacet.grantRole(AGENT_ROLE, account_B)
-                freezeFacet = freezeFacet.connect(signer_B)
-                erc3643Facet = erc3643Facet.connect(signer_B)
                 const amount = 1000
                 await erc1410Facet.issueByPartition({
                     partition: DEFAULT_PARTITION,
@@ -2780,16 +2770,24 @@ describe('ERC3643 Tests', () => {
                     value: amount,
                     data: '0x',
                 })
-                await expect(freezeFacet.freezePartialTokens(account_E, amount))
+                await expect(
+                    freezeFacet
+                        .connect(signer_B)
+                        .freezePartialTokens(account_E, amount)
+                )
                     .to.emit(freezeFacet, 'TokensFrozen')
                     .withArgs(account_E, amount, DEFAULT_PARTITION)
                 await expect(
-                    freezeFacet.unfreezePartialTokens(account_E, amount)
+                    freezeFacet
+                        .connect(signer_B)
+                        .unfreezePartialTokens(account_E, amount)
                 )
                     .to.emit(freezeFacet, 'TokensUnfrozen')
                     .withArgs(account_E, amount, DEFAULT_PARTITION)
                 await expect(
-                    erc3643Facet.forcedTransfer(account_E, account_D, amount)
+                    erc3643Facet
+                        .connect(signer_B)
+                        .forcedTransfer(account_E, account_D, amount)
                 )
                     .to.emit(erc1410Facet, 'TransferByPartition')
                     .withArgs(
@@ -2801,13 +2799,21 @@ describe('ERC3643 Tests', () => {
                         '0x',
                         '0x'
                     )
-                await expect(erc3643Facet.mint(account_E, amount))
+                await expect(
+                    erc3643Facet.connect(signer_B).mint(account_E, amount)
+                )
                     .to.emit(erc1594Facet, 'Issued')
                     .withArgs(account_B, account_E, amount, '0x')
-                await expect(erc3643Facet.burn(account_E, amount))
+                await expect(
+                    erc3643Facet.connect(signer_B).burn(account_E, amount)
+                )
                     .to.emit(erc1594Facet, 'Transfer')
                     .withArgs(account_E, ADDRESS_ZERO, amount)
-                await expect(freezeFacet.setAddressFrozen(account_E, true))
+                await expect(
+                    freezeFacet
+                        .connect(signer_B)
+                        .setAddressFrozen(account_E, true)
+                )
                     .to.emit(freezeFacet, 'AddressFrozen')
                     .withArgs(account_E, true, account_B)
             })
@@ -2815,82 +2821,68 @@ describe('ERC3643 Tests', () => {
 
         describe('AccessControl', () => {
             it('GIVEN an account without TREX_OWNER role WHEN setName THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc3643Facet = erc3643Facet.connect(signer_C)
-
                 // set name fails
-                await expect(erc3643Facet.setName(newName)).to.be.rejectedWith(
-                    'AccountHasNoRole'
-                )
+                await expect(
+                    erc3643Facet.connect(signer_C).setName(newName)
+                ).to.be.rejectedWith('AccountHasNoRole')
             })
             it('GIVEN an account without TREX_OWNER role WHEN setSymbol THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc3643Facet = erc3643Facet.connect(signer_C)
-
                 // set symbol fails
                 await expect(
-                    erc3643Facet.setSymbol(newSymbol)
+                    erc3643Facet.connect(signer_C).setSymbol(newSymbol)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
             it('GIVEN an account without TREX_OWNER role WHEN setOnchainID THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc3643Facet = erc3643Facet.connect(signer_C)
-
                 // set onchainID fails
                 await expect(
-                    erc3643Facet.setOnchainID(onchainId)
+                    erc3643Facet.connect(signer_C).setOnchainID(onchainId)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
             it('GIVEN an account without TREX_OWNER role WHEN setIdentityRegistry THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc3643Facet = erc3643Facet.connect(signer_C)
-
                 // set IdentityRegistry fails
                 await expect(
-                    erc3643Facet.setIdentityRegistry(identityRegistryAddress)
+                    erc3643Facet
+                        .connect(signer_C)
+                        .setIdentityRegistry(identityRegistryAddress)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
             it('GIVEN an account without TREX_OWNER role WHEN setCompliance THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc3643Facet = erc3643Facet.connect(signer_C)
-
                 // set compliance fails
                 await expect(
-                    erc3643Facet.setCompliance(complianceMockAddress)
+                    erc3643Facet
+                        .connect(signer_C)
+                        .setCompliance(complianceMockAddress)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
 
             it('GIVEN an account without FREEZE MANAGER role WHEN freezePartialTokens THEN transaction fails with AccountHasNoRole', async () => {
-                freezeFacet = freezeFacet.connect(signer_C)
-
                 await expect(
-                    freezeFacet.freezePartialTokens(account_A, 10)
+                    freezeFacet
+                        .connect(signer_C)
+                        .freezePartialTokens(account_A, 10)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
 
             it('GIVEN an account without FREEZE MANAGER role WHEN unfreezePartialTokens THEN transaction fails with AccountHasNoRole', async () => {
-                freezeFacet = freezeFacet.connect(signer_C)
-
                 await expect(
-                    freezeFacet.unfreezePartialTokens(account_A, 10)
+                    freezeFacet
+                        .connect(signer_C)
+                        .unfreezePartialTokens(account_A, 10)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
 
             it('GIVEN an account without FREEZE MANAGER role WHEN setAddressFrozen THEN transaction fails with AccountHasNoRole', async () => {
-                freezeFacet = freezeFacet.connect(signer_C)
-
                 await expect(
-                    freezeFacet.setAddressFrozen(account_A, true)
+                    freezeFacet
+                        .connect(signer_C)
+                        .setAddressFrozen(account_A, true)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
 
             it('GIVEN an account without admin role WHEN addAgent THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                erc3643Facet = erc3643Facet.connect(signer_C)
-
                 // add agent fails
                 await expect(
-                    erc3643Facet.addAgent(account_A)
+                    erc3643Facet.connect(signer_C).addAgent(account_A)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
         })
@@ -2955,20 +2947,19 @@ describe('ERC3643 Tests', () => {
             const adjustDecimals = 2
 
             async function setPreBalanceAdjustment() {
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-
-                await accessControlFacet.grantRole(
-                    ADJUSTMENT_BALANCE_ROLE,
-                    account_C
-                )
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
 
-                await accessControlFacet.grantRole(CAP_ROLE, account_A)
-                await accessControlFacet.grantRole(CONTROLLER_ROLE, account_A)
-                await accessControlFacet.grantRole(
-                    CORPORATE_ACTION_ROLE,
-                    account_B
-                )
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CAP_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROLLER_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CORPORATE_ACTION_ROLE, account_B)
                 // Using account C (with role)
                 adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
                 erc1410Facet = erc1410Facet.connect(signer_A)
@@ -2999,8 +2990,6 @@ describe('ERC3643 Tests', () => {
                     )
 
                 // HOLD
-                erc3643Facet = erc3643Facet.connect(signer_A)
-
                 await freezeFacet.freezePartialTokens(account_E, _AMOUNT)
 
                 const frozen_TotalAmount_Before =
@@ -3015,8 +3004,6 @@ describe('ERC3643 Tests', () => {
                 )
 
                 // scheduled two balance updates
-                equityFacet = equityFacet.connect(signer_B)
-
                 const balanceAdjustmentData = {
                     executionDate: dateToUnixTimestamp(
                         '2030-01-01T00:00:02Z'
@@ -3032,12 +3019,12 @@ describe('ERC3643 Tests', () => {
                     factor: adjustFactor,
                     decimals: adjustDecimals,
                 }
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData
-                )
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData_2
-                )
+                await equityFacet
+                    .connect(signer_B)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData)
+                await equityFacet
+                    .connect(signer_B)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData_2)
 
                 // wait for first scheduled balance adjustment only
                 await timeTravelFacet.changeSystemTimestamp(
@@ -4076,17 +4063,20 @@ describe('ERC3643 Tests', () => {
                 diamond.address
             )
 
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CONTROLLER_ROLE, account_A)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CONTROLLER_ROLE, account_A)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
         })
 
         it('GIVEN an account with issuer role WHEN mint THEN transaction fails with NotAllowedInMultiPartitionMode', async () => {
-            erc3643Facet = erc3643Facet.connect(signer_C)
-
             // transfer with data fails
             await expect(
-                erc3643Facet.mint(account_D, 2 * BALANCE_OF_C_ORIGINAL)
+                erc3643Facet
+                    .connect(signer_C)
+                    .mint(account_D, 2 * BALANCE_OF_C_ORIGINAL)
             ).to.be.revertedWithCustomError(
                 erc1410Facet,
                 'NotAllowedInMultiPartitionMode'
@@ -4094,11 +4084,11 @@ describe('ERC3643 Tests', () => {
         })
 
         it('GIVEN an initialized token WHEN burning THEN transaction fails with NotAllowedInMultiPartitionMode', async () => {
-            erc3643Facet = erc3643Facet.connect(signer_C)
-
             // burn with data fails
             await expect(
-                erc3643Facet.burn(account_C, 2 * BALANCE_OF_C_ORIGINAL)
+                erc3643Facet
+                    .connect(signer_C)
+                    .burn(account_C, 2 * BALANCE_OF_C_ORIGINAL)
             ).to.be.revertedWithCustomError(
                 erc1410Facet,
                 'NotAllowedInMultiPartitionMode'
@@ -4106,16 +4096,15 @@ describe('ERC3643 Tests', () => {
         })
 
         it('GIVEN an account with balance WHEN forcedTransfer THEN transaction fails with NotAllowedInMultiPartitionMode', async () => {
-            // Using account A (with role)
-            erc3643Facet = erc3643Facet.connect(signer_A)
-
             // transfer with data fails
             await expect(
-                erc3643Facet.forcedTransfer(
-                    account_A,
-                    account_D,
-                    2 * BALANCE_OF_C_ORIGINAL
-                )
+                erc3643Facet
+                    .connect(signer_A)
+                    .forcedTransfer(
+                        account_A,
+                        account_D,
+                        2 * BALANCE_OF_C_ORIGINAL
+                    )
             ).to.be.revertedWithCustomError(
                 erc1410Facet,
                 'NotAllowedInMultiPartitionMode'
diff --git a/packages/ats/contracts/test/unitTests/layer_1/accessControl/accessControl.test.ts b/packages/ats/contracts/test/unitTests/layer_1/accessControl/accessControl.test.ts
index ebb1c5c47..680149a56 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/accessControl/accessControl.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/accessControl/accessControl.test.ts
@@ -318,53 +318,42 @@ describe('Access Control Tests', () => {
     })
 
     it('GIVEN an account without administrative role WHEN grantRole THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non admin)
-        accessControlFacet = accessControlFacet.connect(signer_C)
-
         // grant role fails
         await expect(
-            accessControlFacet.grantRole(PAUSER_ROLE, account_D)
+            accessControlFacet
+                .connect(signer_C)
+                .grantRole(PAUSER_ROLE, account_D)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
     it('GIVEN an account without administrative role WHEN revokeRole THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non admin)
-        accessControlFacet = accessControlFacet.connect(signer_C)
-
         // revoke role fails
         await expect(
-            accessControlFacet.revokeRole(DEFAULT_ADMIN_ROLE, account_B)
+            accessControlFacet
+                .connect(signer_C)
+                .revokeRole(DEFAULT_ADMIN_ROLE, account_B)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
     it('GIVEN an account without administrative role WHEN applyRoles THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non admin)
-        accessControlFacet = accessControlFacet.connect(signer_C)
-
         // revoke role fails
         await expect(
-            accessControlFacet.applyRoles(
-                [DEFAULT_ADMIN_ROLE],
-                [true],
-                account_B
-            )
+            accessControlFacet
+                .connect(signer_C)
+                .applyRoles([DEFAULT_ADMIN_ROLE], [true], account_B)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
     it('GIVEN a list of roles and actives that is not equally long WHEN applyRoles THEN transaction fails with RolesAndActivesLengthMismatch', async () => {
-        // Using account C (non admin)
-        accessControlFacet = accessControlFacet.connect(signer_C)
-
         // revoke role fails
         await expect(
-            accessControlFacet.applyRoles([DEFAULT_ADMIN_ROLE], [], account_B)
+            accessControlFacet
+                .connect(signer_C)
+                .applyRoles([DEFAULT_ADMIN_ROLE], [], account_B)
         ).to.be.rejectedWith('RolesAndActivesLengthMismatch')
     })
 
     it('GIVEN a list of contradictory roles (enable and disbale) role WHEN applyRoles THEN transaction fails with ApplyRoleContradiction', async () => {
-        // Using account C (non admin)
-        accessControlFacet = accessControlFacet.connect(signer_A)
-
         const Roles_1 = [
             DEFAULT_ADMIN_ROLE,
             PAUSER_ROLE,
@@ -381,7 +370,9 @@ describe('Access Control Tests', () => {
 
         // revoke role fails
         await expect(
-            accessControlFacet.applyRoles(Roles_1, actives_1, account_B)
+            accessControlFacet
+                .connect(signer_A)
+                .applyRoles(Roles_1, actives_1, account_B)
         )
             .to.be.revertedWithCustomError(
                 accessControlFacet,
@@ -390,7 +381,9 @@ describe('Access Control Tests', () => {
             .withArgs(3, 6)
 
         await expect(
-            accessControlFacet.applyRoles(Roles_1, actives_2, account_B)
+            accessControlFacet
+                .connect(signer_A)
+                .applyRoles(Roles_1, actives_2, account_B)
         )
             .to.be.revertedWithCustomError(
                 accessControlFacet,
@@ -400,70 +393,60 @@ describe('Access Control Tests', () => {
     })
 
     it('GIVEN a paused Token WHEN grantRole THEN transaction fails with TokenIsPaused', async () => {
-        // Pausing the token
-        pauseFacet = pauseFacet.connect(signer_B)
-        await pauseFacet.pause()
-        // Using account A (admin)
-        accessControlFacet = accessControlFacet.connect(signer_A)
+        await pauseFacet.connect(signer_B).pause()
 
         // grant role fails
         await expect(
-            accessControlFacet.grantRole(PAUSER_ROLE, account_D)
+            accessControlFacet
+                .connect(signer_A)
+                .grantRole(PAUSER_ROLE, account_D)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN a paused Token WHEN revokeRole THEN transaction fails with TokenIsPaused', async () => {
-        // Pausing the token
-        pauseFacet = pauseFacet.connect(signer_B)
-        await pauseFacet.pause()
-        // Using account A (admin)
-        accessControlFacet = accessControlFacet.connect(signer_A)
+        await pauseFacet.connect(signer_B).pause()
 
         // revoke role fails
         await expect(
-            accessControlFacet.revokeRole(PAUSER_ROLE, account_B)
+            accessControlFacet
+                .connect(signer_A)
+                .revokeRole(PAUSER_ROLE, account_B)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN a paused Token WHEN renounce THEN transaction fails with TokenIsPaused', async () => {
         // Pausing the token
-        pauseFacet = pauseFacet.connect(signer_B)
-        await pauseFacet.pause()
-        // Using account B (has the role)
-        accessControlFacet = accessControlFacet.connect(signer_B)
+        await pauseFacet.connect(signer_B).pause()
 
         // revoke role fails
         await expect(
-            accessControlFacet.renounceRole(PAUSER_ROLE)
+            accessControlFacet.connect(signer_B).renounceRole(PAUSER_ROLE)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN an paused Token WHEN applyRoles THEN transaction fails with TokenIsPaused', async () => {
         // Pausing the token
-        pauseFacet = pauseFacet.connect(signer_B)
-        await pauseFacet.pause()
-        // Using account B (has the role)
-        accessControlFacet = accessControlFacet.connect(signer_B)
+        await pauseFacet.connect(signer_B).pause()
 
         // revoke role fails
         await expect(
-            accessControlFacet.applyRoles(
-                [DEFAULT_ADMIN_ROLE],
-                [true],
-                account_B
-            )
+            accessControlFacet
+                .connect(signer_B)
+                .applyRoles([DEFAULT_ADMIN_ROLE], [true], account_B)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN an account with administrative role WHEN grantRole THEN transaction succeeds', async () => {
-        // Using account A (admin)
-        accessControlFacet = accessControlFacet.connect(signer_A)
         // check that C does not have the role
         let check_C = await accessControlFacet.hasRole(PAUSER_ROLE, account_C)
         expect(check_C).to.equal(false)
 
         // grant Role
-        await expect(accessControlFacet.grantRole(PAUSER_ROLE, account_C))
+        await expect(
+            accessControlFacet
+                .connect(signer_A)
+                .grantRole(PAUSER_ROLE, account_C)
+        )
             .to.emit(accessControlFacet, 'RoleGranted')
             .withArgs(account_A, account_C, PAUSER_ROLE)
 
@@ -499,14 +482,16 @@ describe('Access Control Tests', () => {
     })
 
     it('GIVEN an account with administrative role WHEN revokeRole THEN transaction succeeds', async () => {
-        // Using account A (admin)
-        accessControlFacet = accessControlFacet.connect(signer_A)
         // check that B has the role
         let check_B = await accessControlFacet.hasRole(PAUSER_ROLE, account_B)
         expect(check_B).to.equal(true)
 
         // revoke Role
-        await expect(accessControlFacet.revokeRole(PAUSER_ROLE, account_B))
+        await expect(
+            accessControlFacet
+                .connect(signer_A)
+                .revokeRole(PAUSER_ROLE, account_B)
+        )
             .to.emit(accessControlFacet, 'RoleRevoked')
             .withArgs(account_A, account_B, PAUSER_ROLE)
 
@@ -535,14 +520,14 @@ describe('Access Control Tests', () => {
     })
 
     it('GIVEN an account with pauser role WHEN renouncing the pauser role THEN transaction succeeds', async () => {
-        // Using account A (admin)
-        accessControlFacet = accessControlFacet.connect(signer_B)
         // check that B has the role
         let check_B = await accessControlFacet.hasRole(PAUSER_ROLE, account_B)
         expect(check_B).to.equal(true)
 
         // revoke Role
-        await expect(accessControlFacet.renounceRole(PAUSER_ROLE))
+        await expect(
+            accessControlFacet.connect(signer_B).renounceRole(PAUSER_ROLE)
+        )
             .to.emit(accessControlFacet, 'RoleRenounced')
             .withArgs(account_B, PAUSER_ROLE)
 
@@ -571,18 +556,20 @@ describe('Access Control Tests', () => {
     })
 
     it('GIVEN an account with administrative role WHEN applyRoles THEN transaction succeeds', async () => {
-        // Using account A (admin)
-        accessControlFacet = accessControlFacet.connect(signer_A)
         // check that C does not have the role
-        await accessControlFacet.grantRole(PAUSER_ROLE, account_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(PAUSER_ROLE, account_C)
 
         // grant Role
         await expect(
-            accessControlFacet.applyRoles(
-                [PAUSER_ROLE, DEFAULT_ADMIN_ROLE],
-                [false, true],
-                account_C
-            )
+            accessControlFacet
+                .connect(signer_A)
+                .applyRoles(
+                    [PAUSER_ROLE, DEFAULT_ADMIN_ROLE],
+                    [false, true],
+                    account_C
+                )
         )
             .to.emit(accessControlFacet, 'RolesApplied')
             .withArgs(
@@ -638,18 +625,20 @@ describe('Access Control Tests', () => {
     })
 
     it('GIVEN an account with administrative role, if roles are duplicated but not contradictory WHEN applyRoles THEN transaction succeeds', async () => {
-        // Using account A (admin)
-        accessControlFacet = accessControlFacet.connect(signer_A)
         // check that C does not have the role
-        await accessControlFacet.grantRole(PAUSER_ROLE, account_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(PAUSER_ROLE, account_C)
 
         // grant Role
         await expect(
-            accessControlFacet.applyRoles(
-                [PAUSER_ROLE, DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_ROLE],
-                [true, false, false],
-                account_C
-            )
+            accessControlFacet
+                .connect(signer_A)
+                .applyRoles(
+                    [PAUSER_ROLE, DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_ROLE],
+                    [true, false, false],
+                    account_C
+                )
         )
             .to.emit(accessControlFacet, 'RolesApplied')
             .withArgs(
diff --git a/packages/ats/contracts/test/unitTests/layer_1/adjustBalances/adjustBalances.test.ts b/packages/ats/contracts/test/unitTests/layer_1/adjustBalances/adjustBalances.test.ts
index a03a6f38c..1a54bb6fc 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/adjustBalances/adjustBalances.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/adjustBalances/adjustBalances.test.ts
@@ -330,7 +330,7 @@ describe('Adjust Balances Tests', () => {
         equityFacet = await ethers.getContractAt('Equity', diamond.address)
 
         scheduledTasksFacet = await ethers.getContractAt(
-            'ScheduledTasksTimeTravel',
+            'ScheduledTasksFacetTimeTravel',
             diamond.address
         )
 
@@ -392,12 +392,11 @@ describe('Adjust Balances Tests', () => {
     })
 
     it('GIVEN an account without adjustBalances role WHEN adjustBalances THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non role)
-        adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
-
         // adjustBalances fails
         await expect(
-            adjustBalancesFacet.adjustBalances(adjustFactor, adjustDecimals)
+            adjustBalancesFacet
+                .connect(signer_C)
+                .adjustBalances(adjustFactor, adjustDecimals)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
@@ -412,46 +411,44 @@ describe('Adjust Balances Tests', () => {
             account_C
         )
 
-        // Using account C (with role)
-        adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
-
         // adjustBalances fails
         await expect(
-            adjustBalancesFacet.adjustBalances(adjustFactor, adjustDecimals)
+            adjustBalancesFacet
+                .connect(signer_C)
+                .adjustBalances(adjustFactor, adjustDecimals)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN a Token WHEN adjustBalances with factor set at 0 THEN transaction fails with FactorIsZero', async () => {
-        // Granting Role to account C and Pause
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
-
-        // Using account C (with role)
-        adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
 
         // adjustBalances fails
         await expect(
-            adjustBalancesFacet.adjustBalances(0, adjustDecimals)
+            adjustBalancesFacet
+                .connect(signer_C)
+                .adjustBalances(0, adjustDecimals)
         ).to.be.revertedWithCustomError(adjustBalancesFacet, 'FactorIsZero')
     })
 
     it('GIVEN an account with adjustBalance role WHEN adjustBalances THEN scheduled tasks get executed succeeds', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(ADJUSTMENT_BALANCE_ROLE, account_A)
-        await accessControlFacet.grantRole(ISSUER_ROLE, account_A)
-        await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_A)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(ADJUSTMENT_BALANCE_ROLE, account_A)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(ISSUER_ROLE, account_A)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(CORPORATE_ACTION_ROLE, account_A)
 
         await ssiManagementFacet.connect(signer_A).addIssuer(account_A)
         await kycFacet
             .connect(signer_B)
             .grantKyc(account_B, EMPTY_VC_ID, ZERO, MAX_UINT256, account_A)
 
-        erc1410Facet = erc1410Facet.connect(signer_A)
-        equityFacet = equityFacet.connect(signer_A)
-        adjustBalancesFacet = adjustBalancesFacet.connect(signer_A)
-
-        await erc1410Facet.issueByPartition({
+        await erc1410Facet.connect(signer_A).issueByPartition({
             partition: _PARTITION_ID_2,
             tokenHolder: account_B,
             value: balanceOf_B_Original,
@@ -470,7 +467,7 @@ describe('Adjust Balances Tests', () => {
             amount: dividendsAmountPerEquity,
         }
 
-        await equityFacet.setDividends(dividendData_1)
+        await equityFacet.connect(signer_A).setDividends(dividendData_1)
 
         const balanceAdjustmentExecutionDateInSeconds_1 =
             dateToUnixTimestamp(`2030-01-01T00:00:07Z`)
@@ -481,7 +478,9 @@ describe('Adjust Balances Tests', () => {
             decimals: adjustDecimals,
         }
 
-        await equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData_1)
+        await equityFacet
+            .connect(signer_A)
+            .setScheduledBalanceAdjustment(balanceAdjustmentData_1)
 
         const tasks_count_Before =
             await scheduledTasksFacet.scheduledTaskCount()
@@ -492,8 +491,7 @@ describe('Adjust Balances Tests', () => {
         )
 
         // balance adjustment
-        adjustBalancesFacet = adjustBalancesFacet.connect(signer_A)
-        await adjustBalancesFacet.adjustBalances(1, 0)
+        await adjustBalancesFacet.connect(signer_A).adjustBalances(1, 0)
 
         const tasks_count_After = await scheduledTasksFacet.scheduledTaskCount()
 
diff --git a/packages/ats/contracts/test/unitTests/layer_1/bond/bond.test.ts b/packages/ats/contracts/test/unitTests/layer_1/bond/bond.test.ts
index 3580ff2af..340243fcd 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/bond/bond.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/bond/bond.test.ts
@@ -222,7 +222,6 @@ import {
     Lock__factory,
     Pause__factory,
     AccessControl__factory,
-    BondUSATimeTravel__factory,
     BondUSAReadTimeTravel__factory,
     TimeTravel__factory,
     Kyc,
@@ -233,6 +232,9 @@ import {
     ControlList,
     ClearingActionsFacet,
     ProtectedPartitions,
+    BondUSAFacetTimeTravel__factory,
+    IBondStorageWrapper__factory,
+    IBondStorageWrapper,
 } from '@typechain'
 import {
     CORPORATE_ACTION_ROLE,
@@ -258,6 +260,7 @@ import {
     CONTROL_LIST_ROLE,
     CLEARING_ROLE,
     PROTECTED_PARTITIONS_ROLE,
+    TIME_PERIODS_S,
 } from '@scripts'
 import { grantRoleAndPauseToken } from '@test'
 import { loadFixture } from '@nomicfoundation/hardhat-network-helpers'
@@ -265,7 +268,7 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers'
 const numberOfUnits = 1000
 let startingDate = 0
 const numberOfCoupons = 50
-const frequency = 7
+const frequency = TIME_PERIODS_S.DAY
 const rate = 1
 let maturityDate = 0
 let firstCouponDate = 0
@@ -279,12 +282,14 @@ const _PARTITION_ID =
 let couponRecordDateInSeconds = 0
 let couponExecutionDateInSeconds = 0
 const couponRate = 5
+const couponPeriod = TIME_PERIODS_S.WEEK
 const EMPTY_VC_ID = EMPTY_STRING
 
 let couponData = {
     recordDate: couponRecordDateInSeconds.toString(),
     executionDate: couponExecutionDateInSeconds.toString(),
     rate: couponRate,
+    period: couponPeriod,
 }
 
 describe('Bond Tests', () => {
@@ -305,6 +310,7 @@ describe('Bond Tests', () => {
     let bondReadFacet: BondUSARead
     let accessControlFacet: AccessControl
     let pauseFacet: Pause
+    let bondStorageWrapper: IBondStorageWrapper
     let lockFacet: Lock
     let holdFacet: IHold
     let erc1410Facet: IERC1410
@@ -356,7 +362,7 @@ describe('Bond Tests', () => {
     }
 
     async function setFacets({ diamond }: { diamond: ResolverProxy }) {
-        bondFacet = BondUSATimeTravel__factory.connect(
+        bondFacet = BondUSAFacetTimeTravel__factory.connect(
             diamond.address,
             signer_A
         )
@@ -369,6 +375,10 @@ describe('Bond Tests', () => {
             signer_A
         )
         pauseFacet = Pause__factory.connect(diamond.address, signer_A)
+        bondStorageWrapper = IBondStorageWrapper__factory.connect(
+            diamond.address,
+            signer_A
+        )
         lockFacet = Lock__factory.connect(diamond.address, signer_A)
         holdFacet = IHold__factory.connect(diamond.address, signer_A)
         erc1410Facet = await ethers.getContractAt('IERC1410', diamond.address)
@@ -473,12 +483,13 @@ describe('Bond Tests', () => {
             recordDate: couponRecordDateInSeconds.toString(),
             executionDate: couponExecutionDateInSeconds.toString(),
             rate: couponRate,
+            period: couponPeriod,
         }
         await loadFixture(deploySecurityFixtureSinglePartition)
     })
 
     afterEach(async () => {
-        timeTravelFacet.resetSystemTimestamp()
+        await timeTravelFacet.resetSystemTimestamp()
     })
 
     describe('Single Partition', () => {
@@ -608,11 +619,11 @@ describe('Bond Tests', () => {
                 )
             })
             it('GIVEN all conditions are met WHEN redeeming at maturity THEN transaction succeeds and emits RedeemedByPartition', async () => {
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-                erc1410Facet = erc1410Facet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ISSUER_ROLE, account_C)
 
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_C).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
@@ -642,12 +653,9 @@ describe('Bond Tests', () => {
 
         describe('Coupons', () => {
             it('GIVEN an account without corporateActions role WHEN setCoupon THEN transaction fails with AccountHasNoRole', async () => {
-                // Using account C (non role)
-                bondFacet = bondFacet.connect(signer_C)
-
                 // set coupon fails
                 await expect(
-                    bondFacet.setCoupon(couponData)
+                    bondFacet.connect(signer_C).setCoupon(couponData)
                 ).to.be.rejectedWith('AccountHasNoRole')
             })
 
@@ -662,34 +670,26 @@ describe('Bond Tests', () => {
                     account_C
                 )
 
-                // Using account C (with role)
-                bondFacet = bondFacet.connect(signer_C)
-
                 // set coupon fails
                 await expect(
-                    bondFacet.setCoupon(couponData)
+                    bondFacet.connect(signer_C).setCoupon(couponData)
                 ).to.be.rejectedWith('TokenIsPaused')
             })
 
             it('GIVEN an account with corporateActions role WHEN setCoupon with wrong dates THEN transaction fails', async () => {
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(
-                    CORPORATE_ACTION_ROLE,
-                    account_C
-                )
-                // Using account C (with role)
-                bondFacet = bondFacet.connect(signer_C)
-
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CORPORATE_ACTION_ROLE, account_C)
                 // set coupon
                 const wrongcouponData_1 = {
                     recordDate: couponExecutionDateInSeconds.toString(),
                     executionDate: couponRecordDateInSeconds.toString(),
                     rate: couponRate,
+                    period: couponPeriod,
                 }
 
                 await expect(
-                    bondFacet.setCoupon(wrongcouponData_1)
+                    bondFacet.connect(signer_C).setCoupon(wrongcouponData_1)
                 ).to.be.revertedWithCustomError(bondFacet, 'WrongDates')
 
                 const wrongcouponData_2 = {
@@ -698,14 +698,61 @@ describe('Bond Tests', () => {
                     ).toString(),
                     executionDate: couponExecutionDateInSeconds.toString(),
                     rate: couponRate,
+                    period: couponPeriod,
                 }
 
                 await expect(
-                    bondFacet.setCoupon(wrongcouponData_2)
+                    bondFacet.connect(signer_C).setCoupon(wrongcouponData_2)
                 ).to.be.revertedWithCustomError(bondFacet, 'WrongTimestamp')
             })
 
-            it('GIVEN an account with corporateActions role WHEN setCoupon THEN transaction succeeds', async () => {
+            it('GIVEN an account with corporateActions role WHEN setCoupon with period THEN period is stored correctly', async () => {
+                // Granting Role to account C
+                accessControlFacet = accessControlFacet.connect(signer_A)
+                await accessControlFacet.grantRole(
+                    CORPORATE_ACTION_ROLE,
+                    account_C
+                )
+                // Using account C (with role)
+                bondFacet = bondFacet.connect(signer_C)
+
+                // Create coupon with specific period
+                const customPeriod = 3 * 24 * 60 * 60 // 3 days in seconds
+                const customCouponData = {
+                    recordDate: couponRecordDateInSeconds.toString(),
+                    executionDate: couponExecutionDateInSeconds.toString(),
+                    rate: couponRate,
+                    period: customPeriod,
+                }
+
+                // Set coupon and verify event includes period
+                await expect(bondFacet.setCoupon(customCouponData))
+                    .to.emit(bondFacet, 'CouponSet')
+                    .withArgs(
+                        '0x0000000000000000000000000000000000000000000000000000000000000033',
+                        numberOfCoupons + 1,
+                        account_C,
+                        couponRecordDateInSeconds,
+                        couponExecutionDateInSeconds,
+                        couponRate,
+                        customPeriod
+                    )
+
+                // Verify coupon data includes period
+                const registeredCoupon = await bondReadFacet.getCoupon(
+                    numberOfCoupons + 1
+                )
+                expect(registeredCoupon.coupon.period).to.equal(customPeriod)
+
+                // Verify couponFor data includes period
+                const couponFor = await bondReadFacet.getCouponFor(
+                    numberOfCoupons + 1,
+                    account_A
+                )
+                expect(couponFor.period).to.equal(customPeriod)
+            })
+
+            it('GIVEN an account with corporateActions role WHEN setCoupon with period 0 THEN transaction succeeds', async () => {
                 // Granting Role to account C
                 accessControlFacet = accessControlFacet.connect(signer_A)
                 await accessControlFacet.grantRole(
@@ -715,8 +762,34 @@ describe('Bond Tests', () => {
                 // Using account C (with role)
                 bondFacet = bondFacet.connect(signer_C)
 
+                // Test minimum valid period (exactly 1 day)
+                const minValidPeriodCouponData = {
+                    recordDate: couponRecordDateInSeconds.toString(),
+                    executionDate: couponExecutionDateInSeconds.toString(),
+                    rate: couponRate,
+                    period: 0,
+                }
+
+                await expect(bondFacet.setCoupon(minValidPeriodCouponData))
+                    .to.emit(bondFacet, 'CouponSet')
+                    .withArgs(
+                        '0x0000000000000000000000000000000000000000000000000000000000000033',
+                        numberOfCoupons + 1,
+                        account_C,
+                        couponRecordDateInSeconds,
+                        couponExecutionDateInSeconds,
+                        couponRate,
+                        0
+                    )
+            })
+
+            it('GIVEN an account with corporateActions role WHEN setCoupon THEN transaction succeeds', async () => {
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CORPORATE_ACTION_ROLE, account_C)
+
                 // set coupon
-                await expect(bondFacet.setCoupon(couponData))
+                await expect(bondFacet.connect(signer_C).setCoupon(couponData))
                     .to.emit(bondFacet, 'CouponSet')
                     .withArgs(
                         '0x0000000000000000000000000000000000000000000000000000000000000033',
@@ -724,7 +797,8 @@ describe('Bond Tests', () => {
                         account_C,
                         couponRecordDateInSeconds,
                         couponExecutionDateInSeconds,
-                        couponRate
+                        couponRate,
+                        couponPeriod
                     )
 
                 // check list members
@@ -771,34 +845,33 @@ describe('Bond Tests', () => {
             })
 
             it('GIVEN an account with corporateActions role WHEN setCoupon and lock THEN transaction succeeds', async () => {
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(
-                    CORPORATE_ACTION_ROLE,
-                    account_C
-                )
-                await accessControlFacet.grantRole(LOCKER_ROLE, account_C)
-                await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-                // Using account C (with role)
-                bondFacet = bondFacet.connect(signer_C)
-                lockFacet = lockFacet.connect(signer_C)
-                erc1410Facet = erc1410Facet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CORPORATE_ACTION_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(LOCKER_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ISSUER_ROLE, account_C)
 
                 // issue and lock
                 const TotalAmount = numberOfUnits
                 const LockedAmount = TotalAmount - 5
 
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_C).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: TotalAmount,
                     data: '0x',
                 })
 
-                await lockFacet.lock(LockedAmount, account_A, MAX_UINT256)
+                await lockFacet
+                    .connect(signer_C)
+                    .lock(LockedAmount, account_A, MAX_UINT256)
 
                 // set coupon
-                await expect(bondFacet.setCoupon(couponData))
+                await expect(bondFacet.connect(signer_C).setCoupon(couponData))
                     .to.emit(bondFacet, 'CouponSet')
                     .withArgs(
                         '0x0000000000000000000000000000000000000000000000000000000000000033',
@@ -806,14 +879,17 @@ describe('Bond Tests', () => {
                         account_C,
                         couponRecordDateInSeconds,
                         couponExecutionDateInSeconds,
-                        couponRate
+                        couponRate,
+                        couponPeriod
                     )
 
                 // check list members
                 await timeTravelFacet.changeSystemTimestamp(
                     couponRecordDateInSeconds + 1
                 )
-                await accessControlFacet.revokeRole(ISSUER_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .revokeRole(ISSUER_ROLE, account_C)
 
                 const couponFor = await bondReadFacet.getCouponFor(
                     numberOfCoupons + 1,
@@ -837,22 +913,18 @@ describe('Bond Tests', () => {
             })
 
             it('GIVEN an account with corporateActions role WHEN setCoupon and hold THEN transaction succeeds', async () => {
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(
-                    CORPORATE_ACTION_ROLE,
-                    account_C
-                )
-                await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-                // Using account C (with role)
-                bondFacet = bondFacet.connect(signer_C)
-                erc1410Facet = erc1410Facet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CORPORATE_ACTION_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ISSUER_ROLE, account_C)
 
                 // issue and hold
                 const TotalAmount = numberOfUnits
                 const HeldAmount = TotalAmount - 5
 
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_C).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: TotalAmount,
@@ -870,7 +942,7 @@ describe('Bond Tests', () => {
                 await holdFacet.createHoldByPartition(DEFAULT_PARTITION, hold)
 
                 // set coupon
-                await expect(bondFacet.setCoupon(couponData))
+                await expect(bondFacet.connect(signer_C).setCoupon(couponData))
                     .to.emit(bondFacet, 'CouponSet')
                     .withArgs(
                         '0x0000000000000000000000000000000000000000000000000000000000000033',
@@ -878,14 +950,17 @@ describe('Bond Tests', () => {
                         account_C,
                         couponRecordDateInSeconds,
                         couponExecutionDateInSeconds,
-                        couponRate
+                        couponRate,
+                        couponPeriod
                     )
 
                 // check list members
                 await timeTravelFacet.changeSystemTimestamp(
                     couponRecordDateInSeconds + 1
                 )
-                await accessControlFacet.revokeRole(ISSUER_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .revokeRole(ISSUER_ROLE, account_C)
 
                 const couponFor = await bondReadFacet.getCouponFor(
                     numberOfCoupons + 1,
@@ -911,10 +986,9 @@ describe('Bond Tests', () => {
             it('GIVEN an account with bondManager role WHEN setMaturityDate THEN transaction succeeds', async () => {
                 // * Arrange
                 // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(BOND_MANAGER_ROLE, account_C)
-                // Using account C (with role)
-                bondFacet = bondFacet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(BOND_MANAGER_ROLE, account_C)
                 // Get maturity date
                 const maturityDateBefore = (
                     await bondReadFacet.getBondDetails()
@@ -924,13 +998,11 @@ describe('Bond Tests', () => {
                     BigNumber.from(86400)
                 )
 
-                // * Act
-                // Set maturity date
-                const receipt =
-                    await bondFacet.updateMaturityDate(newMaturityDate)
-
-                // * Assert
-                await expect(receipt)
+                await expect(
+                    bondFacet
+                        .connect(signer_C)
+                        .updateMaturityDate(newMaturityDate)
+                )
                     .to.emit(bondFacet, 'MaturityDateUpdated')
                     .withArgs(
                         bondFacet.address,
@@ -947,10 +1019,9 @@ describe('Bond Tests', () => {
             it('GIVEN an account with bondManager role WHEN setMaturityDate to earlier date THEN transaction fails', async () => {
                 // * Arrange
                 // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(BOND_MANAGER_ROLE, account_C)
-                // Using account C (with role)
-                bondFacet = bondFacet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(BOND_MANAGER_ROLE, account_C)
                 // Get maturity date
                 const maturityDateBefore = (
                     await bondReadFacet.getBondDetails()
@@ -964,7 +1035,9 @@ describe('Bond Tests', () => {
                 // * Act & Assert
                 // Set maturity date
                 await expect(
-                    bondFacet.updateMaturityDate(dayBeforeCurrentMaturity)
+                    bondFacet
+                        .connect(signer_C)
+                        .updateMaturityDate(dayBeforeCurrentMaturity)
                 ).to.be.revertedWithCustomError(
                     bondFacet,
                     'BondMaturityDateWrong'
@@ -977,8 +1050,6 @@ describe('Bond Tests', () => {
 
             it('GIVEN an account without bondManager role WHEN setMaturityDate THEN transaction fails with AccountHasNoRole', async () => {
                 // * Arrange
-                // Using account C (without role)
-                bondFacet = bondFacet.connect(signer_C)
                 // Get maturity date
                 const maturityDateBefore = (
                     await bondReadFacet.getBondDetails()
@@ -991,7 +1062,9 @@ describe('Bond Tests', () => {
                 // * Act & Assert
                 // Set maturity date
                 await expect(
-                    bondFacet.updateMaturityDate(newMaturityDate)
+                    bondFacet
+                        .connect(signer_C)
+                        .updateMaturityDate(newMaturityDate)
                 ).to.be.rejectedWith('AccountHasNoRole')
                 // Ensure maturity date is not updated
                 const maturityDateAfter = (await bondReadFacet.getBondDetails())
@@ -1010,8 +1083,6 @@ describe('Bond Tests', () => {
                     signer_B,
                     account_C
                 )
-                // Using account C (with role)
-                bondFacet = bondFacet.connect(signer_C)
                 // Get maturity date
                 const maturityDateBefore = (
                     await bondReadFacet.getBondDetails()
@@ -1024,7 +1095,9 @@ describe('Bond Tests', () => {
                 // * Act & Assert
                 // Set maturity date
                 await expect(
-                    bondFacet.updateMaturityDate(newMaturityDate)
+                    bondFacet
+                        .connect(signer_C)
+                        .updateMaturityDate(newMaturityDate)
                 ).to.be.rejectedWith('TokenIsPaused')
                 // Ensure maturity date is not updated
                 const maturityDateAfter = (await bondReadFacet.getBondDetails())
@@ -1033,16 +1106,12 @@ describe('Bond Tests', () => {
             })
 
             it('Check number of created Coupon', async () => {
-                bondFacet = bondFacet.connect(signer_C)
-
                 const couponCount = await bondReadFacet.getCouponCount()
 
                 expect(couponCount).to.equal(numberOfCoupons)
             })
 
             it('Check Coupon', async () => {
-                bondFacet = bondFacet.connect(signer_C)
-
                 for (let i = 1; i <= numberOfCoupons; i++) {
                     const coupon = await bondReadFacet.getCoupon(i)
                     const couponFor = await bondReadFacet.getCouponFor(
@@ -1116,11 +1185,11 @@ describe('Bond Tests', () => {
 
             await setFacets({ diamond: newDiamond })
 
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-            erc1410Facet = erc1410Facet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
 
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: _PARTITION_ID,
                 tokenHolder: account_A,
                 value: amount,
@@ -1147,4 +1216,45 @@ describe('Bond Tests', () => {
                 )
         })
     })
+
+    describe('Bond Initialization Period Validation', () => {
+        it('GIVEN bond deployment with zero couponFrequency WHEN deployBondFromFactory THEN deployment fails with CouponFrequencyWrong', async () => {
+            const init_rbacs: Rbac[] = set_initRbacs()
+
+            await expect(
+                deployBondFromFactory({
+                    adminAccount: account_A,
+                    isWhiteList: false,
+                    isControllable: true,
+                    arePartitionsProtected: false,
+                    clearingActive: false,
+                    internalKycActivated: true,
+                    isMultiPartition: false,
+                    name: 'TEST_ZeroFreq',
+                    symbol: 'TZF',
+                    decimals: 6,
+                    isin: isinGenerator(),
+                    currency: '0x455552',
+                    numberOfUnits: numberOfUnits,
+                    nominalValue: 100,
+                    startingDate: startingDate,
+                    maturityDate: maturityDate,
+                    couponFrequency: 0, // Invalid: zero frequency
+                    couponRate: rate,
+                    firstCouponDate: firstCouponDate,
+                    regulationType: RegulationType.REG_D,
+                    regulationSubType: RegulationSubType.REG_D_506_B,
+                    countriesControlListType: countriesControlListType,
+                    listOfCountries: listOfCountries,
+                    info: info,
+                    init_rbacs: init_rbacs,
+                    factory: factory,
+                    businessLogicResolver: businessLogicResolver.address,
+                })
+            ).to.be.revertedWithCustomError(
+                bondStorageWrapper,
+                'CouponFrequencyWrong'
+            )
+        })
+    })
 })
diff --git a/packages/ats/contracts/test/unitTests/layer_1/cap/cap.test.ts b/packages/ats/contracts/test/unitTests/layer_1/cap/cap.test.ts
index b665e5580..9bbd2cce6 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/cap/cap.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/cap/cap.test.ts
@@ -448,113 +448,102 @@ describe('Cap Tests', () => {
     describe('Paused', () => {
         beforeEach(async () => {
             // Pausing the token
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
+            await pauseFacet.connect(signer_B).pause()
         })
 
         it('GIVEN a paused Token WHEN setMaxSupply THEN transaction fails with TokenIsPaused', async () => {
-            // Using account C (with role)
-            capFacet = capFacet.connect(signer_C)
-
             // transfer with data fails
-            await expect(capFacet.setMaxSupply(maxSupply)).to.be.rejectedWith(
-                'TokenIsPaused'
-            )
+            await expect(
+                capFacet.connect(signer_C).setMaxSupply(maxSupply)
+            ).to.be.rejectedWith('TokenIsPaused')
         })
 
         it('GIVEN a paused Token WHEN setMaxSupplyByPartition THEN transaction fails with TokenIsPaused', async () => {
-            // Using account C (with role)
-            capFacet = capFacet.connect(signer_C)
-
             // transfer from with data fails
             await expect(
-                capFacet.setMaxSupplyByPartition(
-                    _PARTITION_ID_1,
-                    maxSupplyByPartition
-                )
+                capFacet
+                    .connect(signer_C)
+                    .setMaxSupplyByPartition(
+                        _PARTITION_ID_1,
+                        maxSupplyByPartition
+                    )
             ).to.be.rejectedWith('TokenIsPaused')
         })
     })
 
     describe('AccessControl', () => {
         it('GIVEN an account without cap role WHEN setMaxSupply THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            capFacet = capFacet.connect(signer_C)
-
             // add to list fails
-            await expect(capFacet.setMaxSupply(maxSupply)).to.be.rejectedWith(
-                Error
-            )
+            await expect(
+                capFacet.connect(signer_C).setMaxSupply(maxSupply)
+            ).to.be.rejectedWith(Error)
         })
 
         it('GIVEN an account without cap role WHEN setMaxSupplyByPartition THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            capFacet = capFacet.connect(signer_C)
-
             // add to list fails
             await expect(
-                capFacet.setMaxSupplyByPartition(_PARTITION_ID_1, maxSupply)
+                capFacet
+                    .connect(signer_C)
+                    .setMaxSupplyByPartition(_PARTITION_ID_1, maxSupply)
             ).to.be.revertedWithCustomError(capFacet, 'AccountHasNoRole')
         })
     })
 
     describe('New Max Supply Too low or 0', () => {
         it('GIVEN a token WHEN setMaxSupply to 0 THEN transaction fails with NewMaxSupplyCannotBeZero', async () => {
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CAP_ROLE, account_C)
-
-            // Using account C (non role)
-            capFacet = capFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_C)
 
             // add to list fails
             await expect(
-                capFacet.setMaxSupply(0)
+                capFacet.connect(signer_C).setMaxSupply(0)
             ).to.be.revertedWithCustomError(
                 capFacet,
                 'NewMaxSupplyCannotBeZero'
             )
         })
         it('GIVEN a token WHEN setMaxSupply a value that is less than the current total supply THEN transaction fails with NewMaxSupplyTooLow', async () => {
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-            await accessControlFacet.grantRole(CAP_ROLE, account_C)
-
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            await erc1410Facet.issueByPartition({
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_C)
+
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_A,
                 value: maxSupply * 2,
                 data: '0x',
             })
 
-            // Using account C (non role)
-            capFacet = capFacet.connect(signer_C)
-
             // add to list fails
             await expect(
-                capFacet.setMaxSupply(maxSupply)
+                capFacet.connect(signer_C).setMaxSupply(maxSupply)
             ).to.be.revertedWithCustomError(capFacet, 'NewMaxSupplyTooLow')
         })
 
         it('GIVEN a token WHEN setMaxSupplyByPartition a value that is less than the current total supply THEN transaction fails with NewMaxSupplyForPartitionTooLow', async () => {
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-            await accessControlFacet.grantRole(CAP_ROLE, account_C)
-
-            erc1410Facet = erc1410Facet.connect(signer_C)
-            await erc1410Facet.issueByPartition({
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_C)
+
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_A,
                 value: maxSupply * 2,
                 data: '0x',
             })
 
-            // Using account C (non role)
-            capFacet = capFacet.connect(signer_C)
-
             // add to list fails
             await expect(
-                capFacet.setMaxSupplyByPartition(_PARTITION_ID_1, maxSupply)
+                capFacet
+                    .connect(signer_C)
+                    .setMaxSupplyByPartition(_PARTITION_ID_1, maxSupply)
             ).to.be.revertedWithCustomError(
                 capFacet,
                 'NewMaxSupplyForPartitionTooLow'
@@ -564,31 +553,29 @@ describe('Cap Tests', () => {
 
     describe('New Max Supply By Partition Too High', () => {
         it('GIVEN a token WHEN setMaxSupplyByPartition a value that is less than the current total supply THEN transaction fails with NewMaxSupplyByPartitionTooHigh', async () => {
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-            await accessControlFacet.grantRole(CAP_ROLE, account_C)
-
-            // Using account C (non role)
-            capFacet = capFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_C)
 
             // add to list fails
             await expect(
-                capFacet.setMaxSupplyByPartition(
-                    _PARTITION_ID_1,
-                    maxSupply * 100
-                )
+                capFacet
+                    .connect(signer_C)
+                    .setMaxSupplyByPartition(_PARTITION_ID_1, maxSupply * 100)
             ).to.eventually.be.rejectedWith('NewMaxSupplyByPartitionTooHigh')
         })
     })
 
     describe('New Max Supply OK', () => {
         it('GIVEN a token WHEN setMaxSupply THEN transaction succeeds', async () => {
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CAP_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_C)
 
-            capFacet = capFacet.connect(signer_C)
-
-            await expect(capFacet.setMaxSupply(maxSupply * 4))
+            await expect(capFacet.connect(signer_C).setMaxSupply(maxSupply * 4))
                 .to.emit(capFacet, 'MaxSupplySet')
                 .withArgs(account_C, maxSupply * 4, maxSupply * 2)
 
@@ -598,13 +585,14 @@ describe('Cap Tests', () => {
         })
 
         it('GIVEN a token WHEN setMaxSupplyByPartition THEN transaction succeeds', async () => {
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CAP_ROLE, account_C)
-
-            capFacet = capFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_C)
 
             await expect(
-                capFacet.setMaxSupplyByPartition(_PARTITION_ID_1, maxSupply * 2)
+                capFacet
+                    .connect(signer_C)
+                    .setMaxSupplyByPartition(_PARTITION_ID_1, maxSupply * 2)
             )
                 .to.emit(capFacet, 'MaxSupplyByPartitionSet')
                 .withArgs(account_C, _PARTITION_ID_1, maxSupply * 2, 0)
@@ -657,7 +645,7 @@ describe('Cap Tests', () => {
                         ((i + 1) * TIME) / 1000 +
                         1
                 )
-                await snapshotFacet.takeSnapshot()
+                await snapshotFacet.connect(signer_A).takeSnapshot()
             }
 
             const currentMaxSupply = await capFacet.getMaxSupply()
@@ -675,21 +663,23 @@ describe('Cap Tests', () => {
         }
 
         async function setPreBalanceAdjustment() {
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CAP_ROLE, account_C)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            await accessControlFacet.grantRole(SNAPSHOT_ROLE, account_A)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-
-            capFacet = capFacet.connect(signer_C)
-            equityFacet = equityFacet.connect(signer_C)
-            snapshotFacet = snapshotFacet.connect(signer_A)
-
-            await capFacet.setMaxSupply(maxSupply)
-            await capFacet.setMaxSupplyByPartition(
-                _PARTITION_ID_1,
-                maxSupplyByPartition
-            )
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CAP_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(SNAPSHOT_ROLE, account_A)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
+
+            await capFacet.connect(signer_C).setMaxSupply(maxSupply)
+            await capFacet
+                .connect(signer_C)
+                .setMaxSupplyByPartition(_PARTITION_ID_1, maxSupplyByPartition)
 
             await kycFacet.grantKyc(
                 account_C,
@@ -698,8 +688,7 @@ describe('Cap Tests', () => {
                 MAX_UINT256,
                 account_A
             )
-
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_C,
                 value: issueAmount,
diff --git a/packages/ats/contracts/test/unitTests/layer_1/clearing/clearing.test.ts b/packages/ats/contracts/test/unitTests/layer_1/clearing/clearing.test.ts
index 43f2ee1fd..084f43fa2 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/clearing/clearing.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/clearing/clearing.test.ts
@@ -3317,19 +3317,12 @@ describe('Clearing Tests', () => {
 
         describe('Balance Adjustments', () => {
             async function setPreBalanceAdjustment() {
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(
-                    ADJUSTMENT_BALANCE_ROLE,
-                    account_C
-                )
-                await accessControlFacet.grantRole(
-                    CORPORATE_ACTION_ROLE,
-                    account_A
-                )
-
-                // Using account C (with role)
-                adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CORPORATE_ACTION_ROLE, account_A)
             }
 
             it('GIVEN a clearing WHEN adjustBalances THEN clearing amount gets updated succeeds', async () => {
@@ -3427,14 +3420,11 @@ describe('Clearing Tests', () => {
                     )
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // scheduled two balance updates
-                equityFacet = equityFacet.connect(signer_A)
-
                 const balanceAdjustmentData = {
                     executionDate: dateToUnixTimestamp(
                         '2030-01-01T00:00:02Z'
@@ -3450,12 +3440,12 @@ describe('Clearing Tests', () => {
                     factor: adjustFactor,
                     decimals: adjustDecimals,
                 }
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData
-                )
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData_2
-                )
+                await equityFacet
+                    .connect(signer_A)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData)
+                await equityFacet
+                    .connect(signer_A)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData_2)
 
                 // wait for first scheduled balance adjustment only
                 await timeTravelFacet.changeSystemTimestamp(
@@ -3606,10 +3596,9 @@ describe('Clearing Tests', () => {
                     await holdFacet.getHeldAmountFor(account_A)
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // APPROVE CLEARINGS
                 for (let opTypeId = 1; opTypeId <= 3; opTypeId++) {
@@ -3800,10 +3789,9 @@ describe('Clearing Tests', () => {
                     await holdFacet.getHeldAmountFor(account_A)
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // CANCEL CLEARINGS
                 for (let opTypeId = 1; opTypeId <= 3; opTypeId++) {
@@ -3982,10 +3970,9 @@ describe('Clearing Tests', () => {
                     await holdFacet.getHeldAmountFor(account_A)
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 await timeTravelFacet.changeSystemTimestamp(
                     clearingOperation.expirationTimestamp + 1
@@ -4156,10 +4143,9 @@ describe('Clearing Tests', () => {
                     )
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // CLEARING AFTER BALANCE ADJUSTMENT
                 // CLEARING TRANSFER
diff --git a/packages/ats/contracts/test/unitTests/layer_1/controlList/controlList.test.ts b/packages/ats/contracts/test/unitTests/layer_1/controlList/controlList.test.ts
index 9fb692800..0a1e96350 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/controlList/controlList.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/controlList/controlList.test.ts
@@ -331,22 +331,16 @@ describe('Control List Tests', () => {
     })
 
     it('GIVEN an account without controlList role WHEN addToControlList THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non role)
-        controlListFacet = controlListFacet.connect(signer_C)
-
         // add to list fails
         await expect(
-            controlListFacet.addToControlList(account_D)
+            controlListFacet.connect(signer_C).addToControlList(account_D)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
     it('GIVEN an account without controlList role WHEN removeFromControlList THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non role)
-        controlListFacet = controlListFacet.connect(signer_C)
-
         // remove From list fails
         await expect(
-            controlListFacet.removeFromControlList(account_D)
+            controlListFacet.connect(signer_C).removeFromControlList(account_D)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
@@ -361,12 +355,9 @@ describe('Control List Tests', () => {
             account_C
         )
 
-        // Using account C (with role)
-        controlListFacet = controlListFacet.connect(signer_C)
-
         // add to list fails
         await expect(
-            controlListFacet.addToControlList(account_D)
+            controlListFacet.connect(signer_C).addToControlList(account_D)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
@@ -381,22 +372,17 @@ describe('Control List Tests', () => {
             account_C
         )
 
-        // Using account C (with role)
-        controlListFacet = controlListFacet.connect(signer_C)
-
         // remove from list fails
         await expect(
-            controlListFacet.removeFromControlList(account_D)
+            controlListFacet.connect(signer_C).removeFromControlList(account_D)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN an account with controlList role WHEN addToControlList and removeFromControlList THEN transaction succeeds', async () => {
         // ADD TO LIST ------------------------------------------------------------------
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(CONTROL_LIST_ROLE, account_C)
-        // Using account C (with role)
-        controlListFacet = controlListFacet.connect(signer_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(CONTROL_LIST_ROLE, account_C)
 
         // check that D and E are not in the list
         let check_D = await controlListFacet.isInControlList(account_D)
@@ -405,10 +391,14 @@ describe('Control List Tests', () => {
         expect(check_E).to.equal(false)
 
         // add to list
-        await expect(controlListFacet.addToControlList(account_D))
+        await expect(
+            controlListFacet.connect(signer_C).addToControlList(account_D)
+        )
             .to.emit(controlListFacet, 'AddedToControlList')
             .withArgs(account_C, account_D)
-        await expect(controlListFacet.addToControlList(account_E))
+        await expect(
+            controlListFacet.connect(signer_C).addToControlList(account_E)
+        )
             .to.emit(controlListFacet, 'AddedToControlList')
             .withArgs(account_C, account_E)
 
@@ -431,7 +421,9 @@ describe('Control List Tests', () => {
 
         // REMOVE FROM LIST ------------------------------------------------------------------
         // remove From list
-        await expect(controlListFacet.removeFromControlList(account_D))
+        await expect(
+            controlListFacet.connect(signer_C).removeFromControlList(account_D)
+        )
             .to.emit(controlListFacet, 'RemovedFromControlList')
             .withArgs(account_C, account_D)
 
diff --git a/packages/ats/contracts/test/unitTests/layer_1/corporateActions/corporateActions.test.ts b/packages/ats/contracts/test/unitTests/layer_1/corporateActions/corporateActions.test.ts
index 4499c7481..419cee717 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/corporateActions/corporateActions.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/corporateActions/corporateActions.test.ts
@@ -338,12 +338,11 @@ describe('Corporate Actions Tests', () => {
     })
 
     it('GIVEN an account without corporateActions role WHEN addCorporateAction THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non role)
-        corporateActionsFacet = corporateActionsFacet.connect(signer_C)
-
         // add to list fails
         await expect(
-            corporateActionsFacet.addCorporateAction(actionType, actionData)
+            corporateActionsFacet
+                .connect(signer_C)
+                .addCorporateAction(actionType, actionData)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
@@ -358,24 +357,22 @@ describe('Corporate Actions Tests', () => {
             account_C
         )
 
-        // Using account C (with role)
-        corporateActionsFacet = corporateActionsFacet.connect(signer_C)
-
         // add to list fails
         await expect(
-            corporateActionsFacet.addCorporateAction(actionType, actionData)
+            corporateActionsFacet
+                .connect(signer_C)
+                .addCorporateAction(actionType, actionData)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN an account with corporateActions role WHEN addCorporateAction THEN transaction succeeds', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-        // Using account C (with role)
-        corporateActionsFacet = corporateActionsFacet.connect(signer_C)
-
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(CORPORATE_ACTION_ROLE, account_C)
         // add to list
-        await corporateActionsFacet.addCorporateAction(actionType, actionData)
+        await corporateActionsFacet
+            .connect(signer_C)
+            .addCorporateAction(actionType, actionData)
 
         // check list members
         const listCount = await corporateActionsFacet.getCorporateActionCount()
diff --git a/packages/ats/contracts/test/unitTests/layer_1/equity/equity.test.ts b/packages/ats/contracts/test/unitTests/layer_1/equity/equity.test.ts
index f05cf1252..11fcc78de 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/equity/equity.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/equity/equity.test.ts
@@ -219,7 +219,7 @@ import {
     IFactory,
     BusinessLogicResolver,
     AccessControl__factory,
-    EquityUSATimeTravel__factory,
+    EquityUSAFacetTimeTravel__factory,
     Pause__factory,
     Lock__factory,
     IHold__factory,
@@ -330,7 +330,7 @@ describe('Equity Tests', () => {
             diamond.address,
             signer_A
         )
-        equityFacet = EquityUSATimeTravel__factory.connect(
+        equityFacet = EquityUSAFacetTimeTravel__factory.connect(
             diamond.address,
             signer_A
         )
@@ -447,12 +447,9 @@ describe('Equity Tests', () => {
 
     describe('Dividends', () => {
         it('GIVEN an account without corporateActions role WHEN setDividends THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            equityFacet = equityFacet.connect(signer_C)
-
             // set dividend fails
             await expect(
-                equityFacet.setDividends(dividendData)
+                equityFacet.connect(signer_C).setDividends(dividendData)
             ).to.be.rejectedWith('AccountHasNoRole')
         })
 
@@ -467,12 +464,9 @@ describe('Equity Tests', () => {
                 account_C
             )
 
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
-
             // set dividend fails
             await expect(
-                equityFacet.setDividends(dividendData)
+                equityFacet.connect(signer_C).setDividends(dividendData)
             ).to.be.rejectedWith('TokenIsPaused')
         })
 
@@ -481,10 +475,9 @@ describe('Equity Tests', () => {
                 dateToUnixTimestamp('2030-01-01T00:00:00Z')
             )
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
 
             // set dividend
             const wrongDividendData_1 = {
@@ -494,7 +487,7 @@ describe('Equity Tests', () => {
             }
 
             await expect(
-                equityFacet.setDividends(wrongDividendData_1)
+                equityFacet.connect(signer_C).setDividends(wrongDividendData_1)
             ).to.be.revertedWithCustomError(equityFacet, 'WrongDates')
 
             const wrongDividendData_2 = {
@@ -506,19 +499,20 @@ describe('Equity Tests', () => {
             }
 
             await expect(
-                equityFacet.setDividends(wrongDividendData_2)
+                equityFacet.connect(signer_C).setDividends(wrongDividendData_2)
             ).to.be.revertedWithCustomError(equityFacet, 'WrongTimestamp')
         })
 
         it('GIVEN an account with corporateActions role WHEN setDividends THEN transaction succeeds', async () => {
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
 
             // set dividend
-            await expect(equityFacet.setDividends(dividendData))
+            await expect(
+                equityFacet.connect(signer_C).setDividends(dividendData)
+            )
                 .to.emit(equityFacet, 'DividendSet')
                 .withArgs(
                     '0x0000000000000000000000000000000000000000000000000000000000000001',
@@ -570,30 +564,35 @@ describe('Equity Tests', () => {
 
         it('GIVEN an account with corporateActions role WHEN setDividends and lock THEN transaction succeeds', async () => {
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            await accessControlFacet.grantRole(LOCKER_ROLE, account_C)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
-            lockFacet = lockFacet.connect(signer_C)
-            erc1410Facet = erc1410Facet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(LOCKER_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
 
             // issue and lock
             const TotalAmount = number_Of_Shares
             const LockedAmount = TotalAmount - 5n
 
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: DEFAULT_PARTITION,
                 tokenHolder: account_A,
                 value: TotalAmount,
                 data: '0x',
             })
 
-            await lockFacet.lock(LockedAmount, account_A, 99999999999)
+            await lockFacet
+                .connect(signer_C)
+                .lock(LockedAmount, account_A, 99999999999)
 
             // set dividend
-            await expect(equityFacet.setDividends(dividendData))
+            await expect(
+                equityFacet.connect(signer_C).setDividends(dividendData)
+            )
                 .to.emit(equityFacet, 'DividendSet')
                 .withArgs(
                     '0x0000000000000000000000000000000000000000000000000000000000000001',
@@ -626,18 +625,18 @@ describe('Equity Tests', () => {
 
         it('GIVEN an account with corporateActions role WHEN setDividends and hold THEN transaction succeeds', async () => {
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
-            erc1410Facet = erc1410Facet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
 
             // issue and hold
             const TotalAmount = number_Of_Shares
             const HeldAmount = TotalAmount - 5n
 
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: DEFAULT_PARTITION,
                 tokenHolder: account_A,
                 value: TotalAmount,
@@ -655,7 +654,9 @@ describe('Equity Tests', () => {
             await holdFacet.createHoldByPartition(DEFAULT_PARTITION, hold)
 
             // set dividend
-            await expect(equityFacet.setDividends(dividendData))
+            await expect(
+                equityFacet.connect(signer_C).setDividends(dividendData)
+            )
                 .to.emit(equityFacet, 'DividendSet')
                 .withArgs(
                     '0x0000000000000000000000000000000000000000000000000000000000000001',
@@ -689,13 +690,10 @@ describe('Equity Tests', () => {
 
     describe('Voting rights', () => {
         it('GIVEN an account without corporateActions role WHEN setVoting THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            equityFacet = equityFacet.connect(signer_C)
-
             // set dividend fails
-            await expect(equityFacet.setVoting(votingData)).to.be.rejectedWith(
-                'AccountHasNoRole'
-            )
+            await expect(
+                equityFacet.connect(signer_C).setVoting(votingData)
+            ).to.be.rejectedWith('AccountHasNoRole')
         })
 
         it('GIVEN a paused Token WHEN setVoting THEN transaction fails with TokenIsPaused', async () => {
@@ -709,24 +707,20 @@ describe('Equity Tests', () => {
                 account_C
             )
 
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
-
             // set dividend fails
-            await expect(equityFacet.setVoting(votingData)).to.be.rejectedWith(
-                'TokenIsPaused'
-            )
+            await expect(
+                equityFacet.connect(signer_C).setVoting(votingData)
+            ).to.be.rejectedWith('TokenIsPaused')
         })
 
         it('GIVEN an account with corporateActions role WHEN setVoting THEN transaction succeeds', async () => {
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
 
             // set dividend
-            await expect(equityFacet.setVoting(votingData))
+            await expect(equityFacet.connect(signer_C).setVoting(votingData))
                 .to.emit(equityFacet, 'VotingSet')
                 .withArgs(
                     '0x0000000000000000000000000000000000000000000000000000000000000001',
@@ -765,29 +759,32 @@ describe('Equity Tests', () => {
 
         it('GIVEN an account with corporateActions role WHEN setVoting and lock THEN transaction succeeds', async () => {
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            await accessControlFacet.grantRole(LOCKER_ROLE, account_C)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_C)
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
-            lockFacet = lockFacet.connect(signer_C)
-            erc1410Facet = erc1410Facet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(LOCKER_ROLE, account_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_C)
 
             // issue and lock
             const TotalAmount = number_Of_Shares
             const LockedAmount = TotalAmount - 5n
 
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_C).issueByPartition({
                 partition: DEFAULT_PARTITION,
                 tokenHolder: account_A,
                 value: TotalAmount,
                 data: '0x',
             })
-            await lockFacet.lock(LockedAmount, account_A, 99999999999)
+            await lockFacet
+                .connect(signer_C)
+                .lock(LockedAmount, account_A, 99999999999)
 
             // set dividend
-            await expect(equityFacet.setVoting(votingData))
+            await expect(equityFacet.connect(signer_C).setVoting(votingData))
                 .to.emit(equityFacet, 'VotingSet')
                 .withArgs(
                     '0x0000000000000000000000000000000000000000000000000000000000000001',
@@ -818,12 +815,11 @@ describe('Equity Tests', () => {
 
     describe('Balance adjustments', () => {
         it('GIVEN an account without corporateActions role WHEN setBalanceAdjustment THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            equityFacet = equityFacet.connect(signer_C)
-
             // set dividend fails
             await expect(
-                equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData)
+                equityFacet
+                    .connect(signer_C)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData)
             ).to.be.rejectedWith('AccountHasNoRole')
         })
 
@@ -838,25 +834,25 @@ describe('Equity Tests', () => {
                 account_C
             )
 
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
-
             // set dividend fails
             await expect(
-                equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData)
+                equityFacet
+                    .connect(signer_C)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData)
             ).to.be.rejectedWith('TokenIsPaused')
         })
 
         it('GIVEN an account with corporateActions role WHEN setBalanceAdjustment THEN transaction succeeds', async () => {
             // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-            // Using account C (with role)
-            equityFacet = equityFacet.connect(signer_C)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_C)
 
             // set dividend
             await expect(
-                equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData)
+                equityFacet
+                    .connect(signer_C)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData)
             )
                 .to.emit(equityFacet, 'ScheduledBalanceAdjustmentSet')
                 .withArgs(
diff --git a/packages/ats/contracts/test/unitTests/layer_1/hold/hold.test.ts b/packages/ats/contracts/test/unitTests/layer_1/hold/hold.test.ts
index 7730e2d9e..19c00d6ef 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/hold/hold.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/hold/hold.test.ts
@@ -1712,50 +1712,54 @@ describe('Hold Tests', () => {
 
         describe('Adjust balances', () => {
             async function setPreBalanceAdjustment() {
-                // Granting Role to account C
-                accessControlFacet = accessControlFacet.connect(signer_A)
-                await accessControlFacet.grantRole(
-                    ADJUSTMENT_BALANCE_ROLE,
-                    account_C
-                )
-                await accessControlFacet.grantRole(ISSUER_ROLE, account_A)
-                await accessControlFacet.grantRole(CAP_ROLE, account_A)
-                await accessControlFacet.grantRole(CONTROLLER_ROLE, account_A)
-
-                // Using account C (with role)
-                adjustBalancesFacet = adjustBalancesFacet.connect(signer_C)
-                erc1410Facet = erc1410Facet.connect(signer_A)
-                capFacet = capFacet.connect(signer_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ADJUSTMENT_BALANCE_ROLE, account_C)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(ISSUER_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CAP_ROLE, account_A)
+                await accessControlFacet
+                    .connect(signer_A)
+                    .grantRole(CONTROLLER_ROLE, account_A)
 
-                await capFacet.setMaxSupply(maxSupply_Original)
-                await capFacet.setMaxSupplyByPartition(
-                    _PARTITION_ID_1,
-                    maxSupply_Partition_1_Original
-                )
-                await capFacet.setMaxSupplyByPartition(
-                    _PARTITION_ID_2,
-                    maxSupply_Partition_2_Original
-                )
+                await capFacet
+                    .connect(signer_A)
+                    .setMaxSupply(maxSupply_Original)
+                await capFacet
+                    .connect(signer_A)
+                    .setMaxSupplyByPartition(
+                        _PARTITION_ID_1,
+                        maxSupply_Partition_1_Original
+                    )
+                await capFacet
+                    .connect(signer_A)
+                    .setMaxSupplyByPartition(
+                        _PARTITION_ID_2,
+                        maxSupply_Partition_2_Original
+                    )
 
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_A).issueByPartition({
                     partition: _PARTITION_ID_1,
                     tokenHolder: account_A,
                     value: balanceOf_A_Original[0],
                     data: EMPTY_HEX_BYTES,
                 })
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_A).issueByPartition({
                     partition: _PARTITION_ID_2,
                     tokenHolder: account_A,
                     value: balanceOf_A_Original[1],
                     data: EMPTY_HEX_BYTES,
                 })
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_A).issueByPartition({
                     partition: _PARTITION_ID_1,
                     tokenHolder: account_B,
                     value: balanceOf_B_Original[0],
                     data: EMPTY_HEX_BYTES,
                 })
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_A).issueByPartition({
                     partition: _PARTITION_ID_2,
                     tokenHolder: account_B,
                     value: balanceOf_B_Original[1],
@@ -1774,7 +1778,6 @@ describe('Hold Tests', () => {
                     )
 
                 // HOLD
-                holdFacet = holdFacet.connect(signer_A)
                 const hold = {
                     amount: _AMOUNT,
                     expirationTimestamp: dateToUnixTimestamp(
@@ -1785,7 +1788,9 @@ describe('Hold Tests', () => {
                     data: EMPTY_HEX_BYTES,
                 }
 
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 const hold_TotalAmount_Before =
                     await holdFacet.getHeldAmountFor(account_A)
@@ -1798,13 +1803,11 @@ describe('Hold Tests', () => {
                     await holdFacet.getHoldForByPartition(holdIdentifier)
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // scheduled two balance updates
-                equityFacet = equityFacet.connect(signer_B)
 
                 const balanceAdjustmentData = {
                     executionDate: dateToUnixTimestamp(
@@ -1821,12 +1824,12 @@ describe('Hold Tests', () => {
                     factor: adjustFactor,
                     decimals: adjustDecimals,
                 }
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData
-                )
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData_2
-                )
+                await equityFacet
+                    .connect(signer_B)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData)
+                await equityFacet
+                    .connect(signer_B)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData_2)
 
                 // wait for first scheduled balance adjustment only
                 await timeTravelFacet.changeSystemTimestamp(
@@ -1893,7 +1896,6 @@ describe('Hold Tests', () => {
                     await ethers.provider.getBlock('latest')
                 ).timestamp
 
-                holdFacet = holdFacet.connect(signer_A)
                 const hold = {
                     amount: _AMOUNT,
                     expirationTimestamp: currentTimestamp + 10 * ONE_SECOND,
@@ -1902,10 +1904,14 @@ describe('Hold Tests', () => {
                     data: EMPTY_HEX_BYTES,
                 }
 
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 hold.expirationTimestamp = currentTimestamp + 100 * ONE_SECOND
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 const held_Amount_Before =
                     await holdFacet.getHeldAmountFor(account_A)
@@ -1916,10 +1922,9 @@ describe('Hold Tests', () => {
                     )
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // EXECUTE HOLD
                 await holdFacet
@@ -2001,7 +2006,6 @@ describe('Hold Tests', () => {
                     await ethers.provider.getBlock('latest')
                 ).timestamp
 
-                holdFacet = holdFacet.connect(signer_A)
                 const hold = {
                     amount: _AMOUNT,
                     expirationTimestamp: currentTimestamp + 10 * ONE_SECOND,
@@ -2010,10 +2014,14 @@ describe('Hold Tests', () => {
                     data: EMPTY_HEX_BYTES,
                 }
 
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 hold.expirationTimestamp = currentTimestamp + 100 * ONE_SECOND
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 const held_Amount_Before =
                     await holdFacet.getHeldAmountFor(account_A)
@@ -2024,10 +2032,9 @@ describe('Hold Tests', () => {
                     )
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // RELEASE HOLD
                 await holdFacet
@@ -2090,7 +2097,6 @@ describe('Hold Tests', () => {
                     await ethers.provider.getBlock('latest')
                 ).timestamp
 
-                holdFacet = holdFacet.connect(signer_A)
                 const hold = {
                     amount: _AMOUNT,
                     expirationTimestamp: currentTimestamp + ONE_SECOND,
@@ -2099,10 +2105,14 @@ describe('Hold Tests', () => {
                     data: EMPTY_HEX_BYTES,
                 }
 
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 hold.expirationTimestamp = currentTimestamp + 100 * ONE_SECOND
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 const held_Amount_Before =
                     await holdFacet.getHeldAmountFor(account_A)
@@ -2113,17 +2123,18 @@ describe('Hold Tests', () => {
                     )
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // RECLAIM HOLD
                 await time.setNextBlockTimestamp(
                     (await ethers.provider.getBlock('latest')).timestamp +
                         2 * ONE_SECOND
                 )
-                await holdFacet.reclaimHoldByPartition(holdIdentifier)
+                await holdFacet
+                    .connect(signer_B)
+                    .reclaimHoldByPartition(holdIdentifier)
 
                 const balance_After_Release =
                     await erc1410Facet.balanceOf(account_A)
@@ -2178,7 +2189,6 @@ describe('Hold Tests', () => {
                     await ethers.provider.getBlock('latest')
                 ).timestamp
 
-                holdFacet = holdFacet.connect(signer_A)
                 const hold = {
                     amount: _AMOUNT,
                     expirationTimestamp: currentTimestamp + 100 * ONE_SECOND,
@@ -2187,7 +2197,9 @@ describe('Hold Tests', () => {
                     data: EMPTY_HEX_BYTES,
                 }
 
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 const held_Amount_Before =
                     await holdFacet.getHeldAmountFor(account_A)
@@ -2198,14 +2210,14 @@ describe('Hold Tests', () => {
                     )
 
                 // adjustBalances
-                await adjustBalancesFacet.adjustBalances(
-                    adjustFactor,
-                    adjustDecimals
-                )
+                await adjustBalancesFacet
+                    .connect(signer_C)
+                    .adjustBalances(adjustFactor, adjustDecimals)
 
                 // HOLD AFTER BALANCE ADJUSTMENT
-                holdFacet = holdFacet.connect(signer_A)
-                await holdFacet.createHoldByPartition(_PARTITION_ID_1, hold)
+                await holdFacet
+                    .connect(signer_A)
+                    .createHoldByPartition(_PARTITION_ID_1, hold)
 
                 const balance_After_Hold =
                     await erc1410Facet.balanceOf(account_A)
diff --git a/packages/ats/contracts/test/unitTests/layer_1/lock/lock.test.ts b/packages/ats/contracts/test/unitTests/layer_1/lock/lock.test.ts
index eefcddf2f..bf7e61cd0 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/lock/lock.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/lock/lock.test.ts
@@ -926,13 +926,14 @@ describe('Lock Tests', () => {
                     )
 
                 // LOCK
-                lockFacet = lockFacet.connect(signer_A)
-                await lockFacet.lockByPartition(
-                    _PARTITION_ID_1,
-                    _AMOUNT,
-                    account_A,
-                    dateToUnixTimestamp('2030-01-01T00:00:01Z')
-                )
+                await lockFacet
+                    .connect(signer_A)
+                    .lockByPartition(
+                        _PARTITION_ID_1,
+                        _AMOUNT,
+                        account_A,
+                        dateToUnixTimestamp('2030-01-01T00:00:01Z')
+                    )
 
                 const lock_TotalAmount_Before =
                     await lockFacet.getLockedAmountFor(account_A)
@@ -954,8 +955,6 @@ describe('Lock Tests', () => {
                 )
 
                 // scheduled two balance updates
-                equityFacet = equityFacet.connect(signer_B)
-
                 const balanceAdjustmentData = {
                     executionDate: dateToUnixTimestamp(
                         '2030-01-01T00:00:02Z'
@@ -971,12 +970,12 @@ describe('Lock Tests', () => {
                     factor: adjustFactor,
                     decimals: adjustDecimals,
                 }
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData
-                )
-                await equityFacet.setScheduledBalanceAdjustment(
-                    balanceAdjustmentData_2
-                )
+                await equityFacet
+                    .connect(signer_B)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData)
+                await equityFacet
+                    .connect(signer_B)
+                    .setScheduledBalanceAdjustment(balanceAdjustmentData_2)
 
                 // wait for first scheduled balance adjustment only
                 await timeTravelFacet.changeSystemTimestamp(
@@ -1040,19 +1039,22 @@ describe('Lock Tests', () => {
                     await ethers.provider.getBlock('latest')
                 ).timestamp
 
-                lockFacet = lockFacet.connect(signer_A)
-                await lockFacet.lockByPartition(
-                    _PARTITION_ID_1,
-                    _AMOUNT,
-                    account_A,
-                    currentTimestamp + ONE_SECOND
-                )
-                await lockFacet.lockByPartition(
-                    _PARTITION_ID_1,
-                    _AMOUNT,
-                    account_A,
-                    currentTimestamp + 100 * ONE_SECOND
-                )
+                await lockFacet
+                    .connect(signer_A)
+                    .lockByPartition(
+                        _PARTITION_ID_1,
+                        _AMOUNT,
+                        account_A,
+                        currentTimestamp + ONE_SECOND
+                    )
+                await lockFacet
+                    .connect(signer_A)
+                    .lockByPartition(
+                        _PARTITION_ID_1,
+                        _AMOUNT,
+                        account_A,
+                        currentTimestamp + 100 * ONE_SECOND
+                    )
 
                 const locked_Amount_Before =
                     await lockFacet.getLockedAmountFor(account_A)
@@ -1073,11 +1075,9 @@ describe('Lock Tests', () => {
                     (await ethers.provider.getBlock('latest')).timestamp +
                         2 * ONE_SECOND
                 )
-                await lockFacet.releaseByPartition(
-                    _PARTITION_ID_1,
-                    1,
-                    account_A
-                )
+                await lockFacet
+                    .connect(signer_A)
+                    .releaseByPartition(_PARTITION_ID_1, 1, account_A)
 
                 const balance_After_Release =
                     await erc1410Facet.balanceOf(account_A)
@@ -1132,13 +1132,14 @@ describe('Lock Tests', () => {
                     await ethers.provider.getBlock('latest')
                 ).timestamp
 
-                lockFacet = lockFacet.connect(signer_A)
-                await lockFacet.lockByPartition(
-                    _PARTITION_ID_1,
-                    _AMOUNT,
-                    account_A,
-                    currentTimestamp + 100 * ONE_SECOND
-                )
+                await lockFacet
+                    .connect(signer_A)
+                    .lockByPartition(
+                        _PARTITION_ID_1,
+                        _AMOUNT,
+                        account_A,
+                        currentTimestamp + 100 * ONE_SECOND
+                    )
 
                 const locked_Amount_Before =
                     await lockFacet.getLockedAmountFor(account_A)
@@ -1155,13 +1156,14 @@ describe('Lock Tests', () => {
                 )
 
                 // LOCK AFTER BALANCE ADJUSTMENT
-                lockFacet = lockFacet.connect(signer_A)
-                await lockFacet.lockByPartition(
-                    _PARTITION_ID_1,
-                    _AMOUNT,
-                    account_A,
-                    currentTimestamp + 100 * ONE_SECOND
-                )
+                await lockFacet
+                    .connect(signer_A)
+                    .lockByPartition(
+                        _PARTITION_ID_1,
+                        _AMOUNT,
+                        account_A,
+                        currentTimestamp + 100 * ONE_SECOND
+                    )
 
                 const balance_After_Lock =
                     await erc1410Facet.balanceOf(account_A)
diff --git a/packages/ats/contracts/test/unitTests/layer_1/pause/pause.test.ts b/packages/ats/contracts/test/unitTests/layer_1/pause/pause.test.ts
index ee1c17663..6a5f95b83 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/pause/pause.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/pause/pause.test.ts
@@ -327,18 +327,15 @@ describe('Pause Tests', () => {
     })
 
     it('GIVEN an account without pause role WHEN pause THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account B (non role)
-        pauseFacet = pauseFacet.connect(signer_B)
         // pause fails
-        await expect(pauseFacet.pause()).to.be.rejectedWith('AccountHasNoRole')
+        await expect(pauseFacet.connect(signer_B).pause()).to.be.rejectedWith(
+            'AccountHasNoRole'
+        )
     })
 
     it('GIVEN an account without pause role WHEN unpause THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account B (non role)
-        pauseFacet = pauseFacet.connect(signer_B)
-
         // unpause fails
-        await expect(pauseFacet.unpause()).to.be.rejectedWith(
+        await expect(pauseFacet.connect(signer_B).unpause()).to.be.rejectedWith(
             'AccountHasNoRole'
         )
     })
@@ -355,35 +352,31 @@ describe('Pause Tests', () => {
         )
 
         // pause fails
-        pauseFacet = pauseFacet.connect(signer_B)
-        await expect(pauseFacet.pause()).to.be.revertedWithCustomError(
-            pauseFacet,
-            'TokenIsPaused'
-        )
+        await expect(
+            pauseFacet.connect(signer_B).pause()
+        ).to.be.revertedWithCustomError(pauseFacet, 'TokenIsPaused')
     })
 
     it('GIVEN an unpause Token WHEN unpause THEN transaction fails with TokenIsUnpaused', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(PAUSER_ROLE, account_B)
-        pauseFacet = pauseFacet.connect(signer_B)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(PAUSER_ROLE, account_B)
 
         // unpause fails
-        await expect(pauseFacet.unpause()).to.be.revertedWithCustomError(
-            pauseFacet,
-            'TokenIsUnpaused'
-        )
+        await expect(
+            pauseFacet.connect(signer_B).unpause()
+        ).to.be.revertedWithCustomError(pauseFacet, 'TokenIsUnpaused')
     })
 
     it('GIVEN an account with pause role WHEN pause and unpause THEN transaction succeeds', async () => {
         // PAUSE ------------------------------------------------------------------
         // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(PAUSER_ROLE, account_B)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(PAUSER_ROLE, account_B)
         // Pausing the token
-        pauseFacet = pauseFacet.connect(signer_B)
 
-        await expect(pauseFacet.pause())
+        await expect(pauseFacet.connect(signer_B).pause())
             .to.emit(pauseFacet, 'TokenPaused')
             .withArgs(account_B)
         // check is paused
@@ -392,7 +385,7 @@ describe('Pause Tests', () => {
 
         // UNPAUSE ------------------------------------------------------------------
         // remove From list
-        await expect(pauseFacet.unpause())
+        await expect(pauseFacet.connect(signer_B).unpause())
             .to.emit(pauseFacet, 'TokenUnpaused')
             .withArgs(account_B)
         // check is unpaused
diff --git a/packages/ats/contracts/test/unitTests/layer_1/protectedPartitions/protectedPartitions.test.ts b/packages/ats/contracts/test/unitTests/layer_1/protectedPartitions/protectedPartitions.test.ts
index 44aa49ed4..1b14208f1 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/protectedPartitions/protectedPartitions.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/protectedPartitions/protectedPartitions.test.ts
@@ -822,8 +822,8 @@ describe('ProtectedPartitions Tests', () => {
                 amount,
                 DEFAULT_PARTITION
             )
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
+
+            await pauseFacet.connect(signer_B).pause()
 
             await expect(
                 erc1410Facet.protectedTransferFromByPartition(
@@ -883,21 +883,20 @@ describe('ProtectedPartitions Tests', () => {
         it('GIVEN a blacklisted account WHEN performing a protected transfer from it THEN transaction fails with AccountIsBlocked', async () => {
             await setProtected()
 
-            controlListFacet = controlListFacet.connect(signer_B)
-            await controlListFacet.addToControlList(account_A)
-
-            erc1410Facet = erc1410Facet.connect(signer_B)
+            await controlListFacet.connect(signer_B).addToControlList(account_A)
 
             await expect(
-                erc1410Facet.protectedTransferFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    account_B,
-                    amount,
-                    MAX_UINT256,
-                    1,
-                    '0x1234'
-                )
+                erc1410Facet
+                    .connect(signer_B)
+                    .protectedTransferFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        account_B,
+                        amount,
+                        MAX_UINT256,
+                        1,
+                        '0x1234'
+                    )
             ).to.be.revertedWithCustomError(
                 controlListFacet,
                 'AccountIsBlocked'
@@ -907,21 +906,20 @@ describe('ProtectedPartitions Tests', () => {
         it('GIVEN a blacklisted account WHEN performing a protected transfer to it THEN transaction fails with AccountIsBlocked', async () => {
             await setProtected()
 
-            controlListFacet = controlListFacet.connect(signer_B)
-            await controlListFacet.addToControlList(account_B)
-
-            erc1410Facet = erc1410Facet.connect(signer_B)
+            await controlListFacet.connect(signer_B).addToControlList(account_B)
 
             await expect(
-                erc1410Facet.protectedTransferFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    account_B,
-                    amount,
-                    MAX_UINT256,
-                    1,
-                    '0x1234'
-                )
+                erc1410Facet
+                    .connect(signer_B)
+                    .protectedTransferFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        account_B,
+                        amount,
+                        MAX_UINT256,
+                        1,
+                        '0x1234'
+                    )
             ).to.be.revertedWithCustomError(
                 controlListFacet,
                 'AccountIsBlocked'
@@ -931,33 +929,34 @@ describe('ProtectedPartitions Tests', () => {
         it('GIVEN a non kyc account WHEN performing a protected transfer from or to THEN transaction fails with InvalidKycStatus', async () => {
             await setProtected()
 
-            kycFacet = kycFacet.connect(signer_B)
-            await kycFacet.revokeKyc(account_A)
-
-            erc1410Facet = erc1410Facet.connect(signer_B)
+            await kycFacet.connect(signer_B).revokeKyc(account_A)
 
             await expect(
-                erc1410Facet.protectedTransferFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    account_B,
-                    amount,
-                    MAX_UINT256,
-                    1,
-                    '0x1234'
-                )
+                erc1410Facet
+                    .connect(signer_B)
+                    .protectedTransferFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        account_B,
+                        amount,
+                        MAX_UINT256,
+                        1,
+                        '0x1234'
+                    )
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
 
             await expect(
-                erc1410Facet.protectedTransferFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_B,
-                    account_A,
-                    amount,
-                    MAX_UINT256,
-                    1,
-                    '0x1234'
-                )
+                erc1410Facet
+                    .connect(signer_B)
+                    .protectedTransferFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_B,
+                        account_A,
+                        amount,
+                        MAX_UINT256,
+                        1,
+                        '0x1234'
+                    )
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
         })
     })
@@ -971,8 +970,7 @@ describe('ProtectedPartitions Tests', () => {
                 amount,
                 DEFAULT_PARTITION
             )
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
+            await pauseFacet.connect(signer_B).pause()
 
             await expect(
                 erc1410Facet.protectedRedeemFromByPartition(
@@ -1029,20 +1027,19 @@ describe('ProtectedPartitions Tests', () => {
         it('GIVEN a blacklisted account WHEN performing a protected redeem from it THEN transaction fails with AccountIsBlocked', async () => {
             await setProtected()
 
-            controlListFacet = controlListFacet.connect(signer_B)
-            await controlListFacet.addToControlList(account_A)
-
-            erc1410Facet = erc1410Facet.connect(signer_B)
+            await controlListFacet.connect(signer_B).addToControlList(account_A)
 
             await expect(
-                erc1410Facet.protectedRedeemFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    amount,
-                    MAX_UINT256,
-                    1,
-                    '0x1234'
-                )
+                erc1410Facet
+                    .connect(signer_B)
+                    .protectedRedeemFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        amount,
+                        MAX_UINT256,
+                        1,
+                        '0x1234'
+                    )
             ).to.be.rejectedWith('AccountIsBlocked')
         })
 
@@ -1050,17 +1047,17 @@ describe('ProtectedPartitions Tests', () => {
             await setProtected()
             await kycFacet.connect(signer_B).revokeKyc(account_A)
 
-            erc1410Facet = erc1410Facet.connect(signer_B)
-
             await expect(
-                erc1410Facet.protectedRedeemFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    amount,
-                    MAX_UINT256,
-                    1,
-                    '0x1234'
-                )
+                erc1410Facet
+                    .connect(signer_B)
+                    .protectedRedeemFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        amount,
+                        MAX_UINT256,
+                        1,
+                        '0x1234'
+                    )
             ).to.be.revertedWithCustomError(kycFacet, 'InvalidKycStatus')
         })
     })
@@ -1069,8 +1066,7 @@ describe('ProtectedPartitions Tests', () => {
         it('GIVEN a paused security WHEN performing a protected hold THEN transaction fails with Paused', async () => {
             await setProtected()
 
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
+            await pauseFacet.connect(signer_B).pause()
 
             await expect(
                 holdFacet.protectedCreateHoldByPartition(
@@ -1163,8 +1159,7 @@ describe('ProtectedPartitions Tests', () => {
         it('GIVEN a paused security role WHEN protecting or unprotecting partitions THEN transaction fails with Paused', async () => {
             await setProtected()
 
-            pauseFacet = pauseFacet.connect(signer_B)
-            await pauseFacet.pause()
+            await pauseFacet.connect(signer_B).pause()
 
             protectedPartitionsFacet =
                 protectedPartitionsFacet.connect(signer_B)
@@ -1214,33 +1209,33 @@ describe('ProtectedPartitions Tests', () => {
         })
 
         it('GIVEN an unprotected partitions equity WHEN performing a protected transfer THEN transaction fails with PartitionsAreUnProtected', async () => {
-            erc1410Facet = erc1410Facet.connect(signer_B)
-
             await expect(
-                erc1410Facet.protectedTransferFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    account_B,
-                    amount,
-                    1,
-                    0,
-                    '0x1234'
-                )
+                erc1410Facet
+                    .connect(signer_B)
+                    .protectedTransferFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        account_B,
+                        amount,
+                        1,
+                        0,
+                        '0x1234'
+                    )
             ).to.be.rejectedWith('PartitionsAreUnProtected')
         })
 
         it('GIVEN an unprotected partitions equity WHEN performing a protected redeem THEN transaction fails with PartitionsAreUnProtected', async () => {
-            erc1410Facet = erc1410Facet.connect(signer_B)
-
             await expect(
-                erc1410Facet.protectedRedeemFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    amount,
-                    1,
-                    0,
-                    '0x1234'
-                )
+                erc1410Facet
+                    .connect(signer_B)
+                    .protectedRedeemFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        amount,
+                        1,
+                        0,
+                        '0x1234'
+                    )
             ).to.be.rejectedWith('PartitionsAreUnProtected')
         })
 
@@ -1266,18 +1261,17 @@ describe('ProtectedPartitions Tests', () => {
         it('GIVEN a protected partitions equity WHEN retrieving the protected partitions Status, result is true', async () => {
             const partitionsProtectedStatus =
                 await protectedPartitionsFacet.arePartitionsProtected()
-            await expect(partitionsProtectedStatus).to.be.true
+            expect(partitionsProtectedStatus).to.be.true
         })
 
         it('GIVEN an protected partitions equity AFTER unprotecting it THEN retrieving the protected partitions Status, result is false', async () => {
-            protectedPartitionsFacet =
-                protectedPartitionsFacet.connect(signer_B)
-
-            await protectedPartitionsFacet.unprotectPartitions()
+            await protectedPartitionsFacet
+                .connect(signer_B)
+                .unprotectPartitions()
 
             const partitionsProtectedStatus =
                 await protectedPartitionsFacet.arePartitionsProtected()
-            await expect(partitionsProtectedStatus).to.be.false
+            expect(partitionsProtectedStatus).to.be.false
         })
 
         describe('Transfer Tests', () => {
@@ -1297,12 +1291,10 @@ describe('ProtectedPartitions Tests', () => {
                     account_C
                 )
 
-                erc1410Facet = erc1410Facet.connect(signer_C)
-
                 await expect(
-                    erc1410Facet.operatorTransferByPartition(
-                        operatorTransferData
-                    )
+                    erc1410Facet
+                        .connect(signer_C)
+                        .operatorTransferByPartition(operatorTransferData)
                 ).to.be.rejectedWith('PartitionsAreProtectedAndNoRole')
             })
 
@@ -1336,35 +1328,34 @@ describe('ProtectedPartitions Tests', () => {
             })
 
             it('GIVEN a protected token WHEN performing a transferAndLock By Partition THEN transaction fails with PartitionsAreProtectedAndNoRole', async () => {
-                transferAndLockFacet = transferAndLockFacet.connect(signer_B)
-
                 await expect(
-                    transferAndLockFacet.transferAndLockByPartition(
-                        DEFAULT_PARTITION,
-                        account_B,
-                        amount,
-                        '0x1234',
-                        MAX_UINT256
-                    )
+                    transferAndLockFacet
+                        .connect(signer_B)
+                        .transferAndLockByPartition(
+                            DEFAULT_PARTITION,
+                            account_B,
+                            amount,
+                            '0x1234',
+                            MAX_UINT256
+                        )
                 ).to.be.rejectedWith('PartitionsAreProtectedAndNoRole')
             })
 
             it('GIVEN a protected token WHEN performing a transferAndLock THEN transaction fails with PartitionsAreProtectedAndNoRole', async () => {
-                transferAndLockFacet = transferAndLockFacet.connect(signer_B)
-
                 await expect(
-                    transferAndLockFacet.transferAndLock(
-                        account_B,
-                        amount,
-                        '0x1234',
-                        MAX_UINT256
-                    )
+                    transferAndLockFacet
+                        .connect(signer_B)
+                        .transferAndLock(
+                            account_B,
+                            amount,
+                            '0x1234',
+                            MAX_UINT256
+                        )
                 ).to.be.rejectedWith('PartitionsAreProtectedAndNoRole')
             })
 
             it('GIVEN a wrong deadline WHEN performing a protected transfer THEN transaction fails with ExpiredDeadline', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
@@ -1372,63 +1363,66 @@ describe('ProtectedPartitions Tests', () => {
                 })
 
                 await expect(
-                    erc1410Facet.protectedTransferFromByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        account_B,
-                        amount,
-                        1,
-                        1,
-                        '0x1234'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .protectedTransferFromByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            account_B,
+                            amount,
+                            1,
+                            1,
+                            '0x1234'
+                        )
                 ).to.be.rejectedWith('ExpiredDeadline')
             })
 
             it('GIVEN a wrong signature length WHEN performing a protected transfer THEN transaction fails with WrongSignatureLength', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
                     data: '0x',
                 })
                 await expect(
-                    erc1410Facet.protectedTransferFromByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        account_B,
-                        amount,
-                        MAX_UINT256,
-                        1,
-                        '0x01'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .protectedTransferFromByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            account_B,
+                            amount,
+                            MAX_UINT256,
+                            1,
+                            '0x01'
+                        )
                 ).to.be.rejectedWith('WrongSignatureLength')
             })
 
             it('GIVEN a wrong signature WHEN performing a protected transfer THEN transaction fails with WrongSignature', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
                     data: '0x',
                 })
                 await expect(
-                    erc1410Facet.protectedTransferFromByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        account_B,
-                        amount,
-                        MAX_UINT256,
-                        1,
-                        '0x0011223344112233441122334411223344112233441122334411223344112233441122334411223344112233441122334411223344112233441122334411223344'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .protectedTransferFromByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            account_B,
+                            amount,
+                            MAX_UINT256,
+                            1,
+                            '0x0011223344112233441122334411223344112233441122334411223344112233441122334411223344112233441122334411223344112233441122334411223344'
+                        )
                 ).to.be.rejectedWith('WrongSignature')
             })
 
             it('GIVEN a wrong nounce WHEN performing a protected transfer THEN transaction fails with WrongNounce', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
@@ -1437,15 +1431,17 @@ describe('ProtectedPartitions Tests', () => {
                 const deadline = MAX_UINT256
 
                 await expect(
-                    erc1410Facet.protectedTransferFromByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        account_B,
-                        amount,
-                        deadline,
-                        0,
-                        '0x1234'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .protectedTransferFromByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            account_B,
+                            amount,
+                            deadline,
+                            0,
+                            '0x1234'
+                        )
                 ).to.be.rejectedWith('WrongNounce')
             })
 
@@ -1474,18 +1470,13 @@ describe('ProtectedPartitions Tests', () => {
                     DEFAULT_PARTITION
                 )
 
-                erc1410Facet = erc1410Facet.connect(signer_A)
-
-                await erc1410Facet.authorizeOperatorByPartition(
-                    DEFAULT_PARTITION,
-                    account_C
-                )
-
-                erc1410Facet = erc1410Facet.connect(signer_C)
+                await erc1410Facet
+                    .connect(signer_A)
+                    .authorizeOperatorByPartition(DEFAULT_PARTITION, account_C)
 
-                await erc1410Facet.operatorTransferByPartition(
-                    operatorTransferData
-                )
+                await erc1410Facet
+                    .connect(signer_C)
+                    .operatorTransferByPartition(operatorTransferData)
             })
 
             it('GIVEN a protected token and a WILD CARD account WHEN performing a ERC1594 transfer with Data THEN transaction succeeds', async () => {
@@ -1515,14 +1506,14 @@ describe('ProtectedPartitions Tests', () => {
 
                 await erc20Facet.approve(account_C, amount)
 
-                erc1594Facet = erc1594Facet.connect(signer_C)
-
-                await erc1594Facet.transferFromWithData(
-                    account_A,
-                    account_B,
-                    amount,
-                    '0x1234'
-                )
+                await erc1594Facet
+                    .connect(signer_C)
+                    .transferFromWithData(
+                        account_A,
+                        account_B,
+                        amount,
+                        '0x1234'
+                    )
             })
 
             it('GIVEN a protected token and a WILD CARD account WHEN performing a ERC20 transfer THEN transaction succeeds', async () => {
@@ -1546,9 +1537,9 @@ describe('ProtectedPartitions Tests', () => {
 
                 await erc20Facet.approve(account_C, amount)
 
-                erc20Facet = erc20Facet.connect(signer_C)
-
-                await erc20Facet.transferFrom(account_A, account_B, amount)
+                await erc20Facet
+                    .connect(signer_C)
+                    .transferFrom(account_A, account_B, amount)
             })
 
             it('GIVEN a protected token and a WILD CARD account WHEN performing a transferAndLock By Partition THEN transaction succeeds', async () => {
@@ -1559,15 +1550,15 @@ describe('ProtectedPartitions Tests', () => {
                     DEFAULT_PARTITION
                 )
 
-                transferAndLockFacet = transferAndLockFacet.connect(signer_B)
-
-                await transferAndLockFacet.transferAndLockByPartition(
-                    DEFAULT_PARTITION,
-                    account_C,
-                    amount,
-                    '0x1234',
-                    MAX_UINT256
-                )
+                await transferAndLockFacet
+                    .connect(signer_B)
+                    .transferAndLockByPartition(
+                        DEFAULT_PARTITION,
+                        account_C,
+                        amount,
+                        '0x1234',
+                        MAX_UINT256
+                    )
             })
 
             it('GIVEN a protected token and a WILD CARD account WHEN performing a transferAndLock THEN transaction succeeds', async () => {
@@ -1578,19 +1569,12 @@ describe('ProtectedPartitions Tests', () => {
                     DEFAULT_PARTITION
                 )
 
-                transferAndLockFacet = transferAndLockFacet.connect(signer_B)
-
-                await transferAndLockFacet.transferAndLock(
-                    account_C,
-                    amount,
-                    '0x1234',
-                    MAX_UINT256
-                )
+                await transferAndLockFacet
+                    .connect(signer_B)
+                    .transferAndLock(account_C, amount, '0x1234', MAX_UINT256)
             })
 
             it('GIVEN a correct signature WHEN performing a protected transfer THEN transaction succeeds', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-
                 const deadline = MAX_UINT256
 
                 const message = {
@@ -1617,22 +1601,24 @@ describe('ProtectedPartitions Tests', () => {
                     message
                 )
 
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
                     data: '0x',
                 })
 
-                await erc1410Facet.protectedTransferFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    account_B,
-                    amount,
-                    deadline,
-                    1,
-                    signature
-                )
+                await erc1410Facet
+                    .connect(signer_B)
+                    .protectedTransferFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        account_B,
+                        amount,
+                        deadline,
+                        1,
+                        signature
+                    )
             })
         })
 
@@ -1653,16 +1639,16 @@ describe('ProtectedPartitions Tests', () => {
                     account_C
                 )
 
-                erc1410Facet = erc1410Facet.connect(signer_C)
-
                 await expect(
-                    erc1410Facet.operatorRedeemByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        amount,
-                        '0x1234',
-                        '0x1234'
-                    )
+                    erc1410Facet
+                        .connect(signer_C)
+                        .operatorRedeemByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            amount,
+                            '0x1234',
+                            '0x1234'
+                        )
                 ).to.be.rejectedWith('PartitionsAreProtected')
             })
 
@@ -1679,68 +1665,70 @@ describe('ProtectedPartitions Tests', () => {
             })
 
             it('GIVEN a wrong deadline WHEN performing a protected redeem THEN transaction fails with ExpiredDeadline', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
                     data: '0x',
                 })
                 await expect(
-                    erc1410Facet.protectedRedeemFromByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        amount,
-                        1,
-                        0,
-                        '0x1234'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .protectedRedeemFromByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            amount,
+                            1,
+                            0,
+                            '0x1234'
+                        )
                 ).to.be.rejectedWith('ExpiredDeadline')
             })
 
             it('GIVEN a wrong signature length WHEN performing a protected redeem THEN transaction fails with WrongSignatureLength', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
                     data: '0x',
                 })
                 await expect(
-                    erc1410Facet.protectedRedeemFromByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        amount,
-                        MAX_UINT256,
-                        1,
-                        '0x01'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .protectedRedeemFromByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            amount,
+                            MAX_UINT256,
+                            1,
+                            '0x01'
+                        )
                 ).to.be.rejectedWith('WrongSignatureLength')
             })
 
             it('GIVEN a wrong signature WHEN performing a protected redeem THEN transaction fails with WrongSignature', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
                     data: '0x',
                 })
                 await expect(
-                    erc1410Facet.protectedRedeemFromByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        amount,
-                        MAX_UINT256,
-                        1,
-                        '0x0011223344112233441122334411223344112233441122334411223344112233441122334411223344112233441122334411223344112233441122334411223344'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .protectedRedeemFromByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            amount,
+                            MAX_UINT256,
+                            1,
+                            '0x0011223344112233441122334411223344112233441122334411223344112233441122334411223344112233441122334411223344112233441122334411223344'
+                        )
                 ).to.be.rejectedWith('WrongSignature')
             })
 
             it('GIVEN a wrong nounce WHEN performing a protected redeem THEN transaction fails with WrongNounce', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
@@ -1749,20 +1737,20 @@ describe('ProtectedPartitions Tests', () => {
                 const deadline = MAX_UINT256
 
                 await expect(
-                    erc1410Facet.protectedRedeemFromByPartition(
-                        DEFAULT_PARTITION,
-                        account_A,
-                        amount,
-                        deadline,
-                        0,
-                        '0x1234'
-                    )
+                    erc1410Facet
+                        .connect(signer_B)
+                        .protectedRedeemFromByPartition(
+                            DEFAULT_PARTITION,
+                            account_A,
+                            amount,
+                            deadline,
+                            0,
+                            '0x1234'
+                        )
                 ).to.be.rejectedWith('WrongNounce')
             })
 
             it('GIVEN a correct signature WHEN performing a protected redeem THEN transaction succeeds', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-
                 const deadline = MAX_UINT256
 
                 const message = {
@@ -1788,21 +1776,23 @@ describe('ProtectedPartitions Tests', () => {
                     message
                 )
 
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
                     data: '0x',
                 })
 
-                await erc1410Facet.protectedRedeemFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    amount,
-                    deadline,
-                    1,
-                    signature
-                )
+                await erc1410Facet
+                    .connect(signer_B)
+                    .protectedRedeemFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        amount,
+                        deadline,
+                        1,
+                        signature
+                    )
             })
         })
 
@@ -2281,8 +2271,6 @@ describe('ProtectedPartitions Tests', () => {
             })
 
             it('GIVEN a successful protected transfer THEN compliance contract is called', async () => {
-                erc1410Facet = erc1410Facet.connect(signer_B)
-
                 const deadline = MAX_UINT256
 
                 const message = {
@@ -2300,22 +2288,24 @@ describe('ProtectedPartitions Tests', () => {
                     message
                 )
 
-                await erc1410Facet.issueByPartition({
+                await erc1410Facet.connect(signer_B).issueByPartition({
                     partition: DEFAULT_PARTITION,
                     tokenHolder: account_A,
                     value: amount,
                     data: '0x',
                 })
 
-                await erc1410Facet.protectedTransferFromByPartition(
-                    DEFAULT_PARTITION,
-                    account_A,
-                    account_B,
-                    amount,
-                    deadline,
-                    1,
-                    signature
-                )
+                await erc1410Facet
+                    .connect(signer_B)
+                    .protectedTransferFromByPartition(
+                        DEFAULT_PARTITION,
+                        account_A,
+                        account_B,
+                        amount,
+                        deadline,
+                        1,
+                        signature
+                    )
                 expect(await complianceMock.transferredHit()).to.equal(1)
             })
         })
diff --git a/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledBalanceAdjustments/scheduledBalanceAdjustments.test.ts b/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledBalanceAdjustments/scheduledBalanceAdjustments.test.ts
index 13761aa3f..05b3f03e7 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledBalanceAdjustments/scheduledBalanceAdjustments.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledBalanceAdjustments/scheduledBalanceAdjustments.test.ts
@@ -349,11 +349,9 @@ describe('Scheduled BalanceAdjustments Tests', () => {
     })
 
     it('GIVEN a token WHEN triggerBalanceAdjustments THEN transaction succeeds', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-        // Using account C (with role)
-        equityFacet = equityFacet.connect(signer_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(CORPORATE_ACTION_ROLE, account_C)
 
         // set balanceAdjustment
         const balanceAdjustmentExecutionDateInSeconds_1 = dateToUnixTimestamp(
@@ -383,9 +381,15 @@ describe('Scheduled BalanceAdjustments Tests', () => {
             factor: balanceAdjustmentsFactor,
             decimals: balanceAdjustmentsDecimals,
         }
-        await equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData_2)
-        await equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData_3)
-        await equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData_1)
+        await equityFacet
+            .connect(signer_C)
+            .setScheduledBalanceAdjustment(balanceAdjustmentData_2)
+        await equityFacet
+            .connect(signer_C)
+            .setScheduledBalanceAdjustment(balanceAdjustmentData_3)
+        await equityFacet
+            .connect(signer_C)
+            .setScheduledBalanceAdjustment(balanceAdjustmentData_1)
 
         const balanceAdjustment_2_Id =
             '0x0000000000000000000000000000000000000000000000000000000000000001'
@@ -430,11 +434,12 @@ describe('Scheduled BalanceAdjustments Tests', () => {
         )
 
         // AFTER FIRST SCHEDULED BalanceAdjustmentS ------------------------------------------------------------------
-        scheduledTasksFacet = scheduledTasksFacet.connect(signer_A)
         await timeTravelFacet.changeSystemTimestamp(
             balanceAdjustmentExecutionDateInSeconds_1 + 1
         )
-        await scheduledTasksFacet.triggerPendingScheduledTasks()
+        await scheduledTasksFacet
+            .connect(signer_A)
+            .triggerPendingScheduledTasks()
 
         scheduledBalanceAdjustmentCount =
             await scheduledBalanceAdjustmentsFacet.scheduledBalanceAdjustmentCount()
@@ -465,7 +470,7 @@ describe('Scheduled BalanceAdjustments Tests', () => {
         await timeTravelFacet.changeSystemTimestamp(
             balanceAdjustmentExecutionDateInSeconds_2 + 1
         )
-        await scheduledTasksFacet.triggerScheduledTasks(100)
+        await scheduledTasksFacet.connect(signer_A).triggerScheduledTasks(100)
 
         scheduledBalanceAdjustmentCount =
             await scheduledBalanceAdjustmentsFacet.scheduledBalanceAdjustmentCount()
@@ -490,7 +495,7 @@ describe('Scheduled BalanceAdjustments Tests', () => {
         await timeTravelFacet.changeSystemTimestamp(
             balanceAdjustmentExecutionDateInSeconds_3 + 1
         )
-        await scheduledTasksFacet.triggerScheduledTasks(0)
+        await scheduledTasksFacet.connect(signer_A).triggerScheduledTasks(0)
 
         scheduledBalanceAdjustmentCount =
             await scheduledBalanceAdjustmentsFacet.scheduledBalanceAdjustmentCount()
diff --git a/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledSnapshots/scheduledSnapshots.test.ts b/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledSnapshots/scheduledSnapshots.test.ts
index 766f85dbd..030f03c18 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledSnapshots/scheduledSnapshots.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledSnapshots/scheduledSnapshots.test.ts
@@ -348,11 +348,9 @@ describe('Scheduled Snapshots Tests', () => {
     })
 
     it('GIVEN a token WHEN triggerSnapshots THEN transaction succeeds', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
-        // Using account C (with role)
-        equityFacet = equityFacet.connect(signer_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(CORPORATE_ACTION_ROLE, account_C)
 
         // set dividend
         const dividendsRecordDateInSeconds_1 = dateToUnixTimestamp(
@@ -383,9 +381,9 @@ describe('Scheduled Snapshots Tests', () => {
             executionDate: dividendsExecutionDateInSeconds.toString(),
             amount: dividendsAmountPerEquity,
         }
-        await equityFacet.setDividends(dividendData_2)
-        await equityFacet.setDividends(dividendData_3)
-        await equityFacet.setDividends(dividendData_1)
+        await equityFacet.connect(signer_C).setDividends(dividendData_2)
+        await equityFacet.connect(signer_C).setDividends(dividendData_3)
+        await equityFacet.connect(signer_C).setDividends(dividendData_1)
 
         const dividend_2_Id =
             '0x0000000000000000000000000000000000000000000000000000000000000001'
@@ -395,8 +393,6 @@ describe('Scheduled Snapshots Tests', () => {
             '0x0000000000000000000000000000000000000000000000000000000000000003'
 
         // check schedled snapshots
-        scheduledSnapshotsFacet = scheduledSnapshotsFacet.connect(signer_A)
-
         let scheduledSnapshotCount =
             await scheduledSnapshotsFacet.scheduledSnapshotCount()
         let scheduledSnapshots =
@@ -418,12 +414,12 @@ describe('Scheduled Snapshots Tests', () => {
         expect(scheduledSnapshots[2].data).to.equal(dividend_1_Id)
 
         // AFTER FIRST SCHEDULED SNAPSHOTS ------------------------------------------------------------------
-        scheduledTasksFacet = scheduledTasksFacet.connect(signer_A)
-
         await timeTravelFacet.changeSystemTimestamp(
             dividendsRecordDateInSeconds_1 + 1
         )
-        await expect(scheduledTasksFacet.triggerPendingScheduledTasks())
+        await expect(
+            scheduledTasksFacet.connect(signer_A).triggerPendingScheduledTasks()
+        )
             .to.emit(scheduledSnapshotsFacet, 'SnapshotTriggered')
             .withArgs(account_A, 1)
 
@@ -447,7 +443,9 @@ describe('Scheduled Snapshots Tests', () => {
         await timeTravelFacet.changeSystemTimestamp(
             dividendsRecordDateInSeconds_2 + 1
         )
-        await expect(scheduledTasksFacet.triggerScheduledTasks(100))
+        await expect(
+            scheduledTasksFacet.connect(signer_A).triggerScheduledTasks(100)
+        )
             .to.emit(scheduledSnapshotsFacet, 'SnapshotTriggered')
             .withArgs(account_A, 2)
 
@@ -467,7 +465,9 @@ describe('Scheduled Snapshots Tests', () => {
         await timeTravelFacet.changeSystemTimestamp(
             dividendsRecordDateInSeconds_3 + 1
         )
-        await expect(scheduledTasksFacet.triggerScheduledTasks(0))
+        await expect(
+            scheduledTasksFacet.connect(signer_A).triggerScheduledTasks(0)
+        )
             .to.emit(scheduledSnapshotsFacet, 'SnapshotTriggered')
             .withArgs(account_A, 3)
 
diff --git a/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledTasks/scheduledTasks.test.ts b/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledTasks/scheduledTasks.test.ts
index 5b24ca14d..7cbdabf48 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledTasks/scheduledTasks.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledTasks/scheduledTasks.test.ts
@@ -391,37 +391,30 @@ describe('Scheduled Tasks Tests', () => {
 
     it('GIVEN a paused Token WHEN triggerTasks THEN transaction fails with TokenIsPaused', async () => {
         // Pausing the token
-        pauseFacet = pauseFacet.connect(signer_B)
-        await pauseFacet.pause()
-
-        // Using account C (with role)
-        scheduledTasksFacet = scheduledTasksFacet.connect(signer_C)
+        await pauseFacet.connect(signer_B).pause()
 
         // trigger scheduled snapshots
         await expect(
-            scheduledTasksFacet.triggerPendingScheduledTasks()
+            scheduledTasksFacet.connect(signer_C).triggerPendingScheduledTasks()
         ).to.be.rejectedWith('TokenIsPaused')
         await expect(
-            scheduledTasksFacet.triggerScheduledTasks(1)
+            scheduledTasksFacet.connect(signer_C).triggerScheduledTasks(1)
         ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN a token WHEN triggerTasks THEN transaction succeeds', async () => {
         // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(CORPORATE_ACTION_ROLE, account_C)
 
-        erc1410Facet = erc1410Facet.connect(signer_B)
-        await erc1410Facet.issueByPartition({
+        await erc1410Facet.connect(signer_B).issueByPartition({
             partition: _PARTITION_ID_1,
             tokenHolder: account_A,
             value: INITIAL_AMOUNT,
             data: '0x',
         })
 
-        // Using account C (with role)
-        equityFacet = equityFacet.connect(signer_C)
-
         // set dividend
         const dividendsRecordDateInSeconds_1 = dateToUnixTimestamp(
             '2030-01-01T00:00:15Z'
@@ -443,8 +436,8 @@ describe('Scheduled Tasks Tests', () => {
             executionDate: dividendsExecutionDateInSeconds.toString(),
             amount: dividendsAmountPerEquity,
         }
-        await equityFacet.setDividends(dividendData_2)
-        await equityFacet.setDividends(dividendData_1)
+        await equityFacet.connect(signer_C).setDividends(dividendData_2)
+        await equityFacet.connect(signer_C).setDividends(dividendData_1)
 
         const balanceAdjustmentExecutionDateInSeconds_1 = dateToUnixTimestamp(
             '2030-01-01T00:00:16Z'
@@ -468,11 +461,14 @@ describe('Scheduled Tasks Tests', () => {
             decimals: balanceAdjustmentsDecimals_2,
         }
 
-        await equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData_2)
-        await equityFacet.setScheduledBalanceAdjustment(balanceAdjustmentData_1)
+        await equityFacet
+            .connect(signer_C)
+            .setScheduledBalanceAdjustment(balanceAdjustmentData_2)
+        await equityFacet
+            .connect(signer_C)
+            .setScheduledBalanceAdjustment(balanceAdjustmentData_1)
 
         // check schedled tasks
-        scheduledTasksFacet = scheduledTasksFacet.connect(signer_A)
 
         let scheduledTasksCount = await scheduledTasksFacet.scheduledTaskCount()
         let scheduledTasks = await scheduledTasksFacet.getScheduledTasks(0, 100)
@@ -497,8 +493,6 @@ describe('Scheduled Tasks Tests', () => {
         expect(scheduledTasks[3].data).to.equal(SNAPSHOT_TASK_TYPE)
 
         // AFTER FIRST SCHEDULED TASKS ------------------------------------------------------------------
-        scheduledTasksFacet = scheduledTasksFacet.connect(signer_A)
-
         await timeTravelFacet.changeSystemTimestamp(
             balanceAdjustmentExecutionDateInSeconds_1 + 1
         )
@@ -518,7 +512,9 @@ describe('Scheduled Tasks Tests', () => {
         expect(BalanceOf_A_Dividend_1.decimals).to.equal(DECIMALS_INIT)
 
         // triggering from the queue
-        await scheduledTasksFacet.triggerPendingScheduledTasks()
+        await scheduledTasksFacet
+            .connect(signer_A)
+            .triggerPendingScheduledTasks()
 
         scheduledTasksCount = await scheduledTasksFacet.scheduledTaskCount()
 
@@ -550,7 +546,7 @@ describe('Scheduled Tasks Tests', () => {
         )
 
         // triggering from the queue
-        await scheduledTasksFacet.triggerScheduledTasks(100)
+        await scheduledTasksFacet.connect(signer_A).triggerScheduledTasks(100)
 
         scheduledTasksCount = await scheduledTasksFacet.scheduledTaskCount()
 
diff --git a/packages/ats/contracts/test/unitTests/layer_1/security/security.test.ts b/packages/ats/contracts/test/unitTests/layer_1/security/security.test.ts
index dc12c28e1..c639bf292 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/security/security.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/security/security.test.ts
@@ -331,23 +331,21 @@ describe('Security Tests', () => {
                 TotalTokenHolders_1
             )
 
-            erc1410ManagementFacet = erc1410ManagementFacet.connect(signer_A)
-
-            await erc1410ManagementFacet.issueByPartition({
+            await erc1410ManagementFacet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_A,
                 value: 1,
                 data: '0x',
             })
 
-            await erc1410ManagementFacet.issueByPartition({
+            await erc1410ManagementFacet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_B,
                 value: 1,
                 data: '0x',
             })
 
-            await erc1410ManagementFacet.issueByPartition({
+            await erc1410ManagementFacet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_2,
                 tokenHolder: account_C,
                 value: 1,
@@ -374,23 +372,21 @@ describe('Security Tests', () => {
         })
 
         it('Check Security Total Holders and Holders when removing', async () => {
-            erc1410ManagementFacet = erc1410ManagementFacet.connect(signer_A)
-
-            await erc1410ManagementFacet.issueByPartition({
+            await erc1410ManagementFacet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_A,
                 value: 1,
                 data: '0x',
             })
 
-            await erc1410ManagementFacet.issueByPartition({
+            await erc1410ManagementFacet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_B,
                 value: 1,
                 data: '0x',
             })
 
-            await erc1410ManagementFacet.issueByPartition({
+            await erc1410ManagementFacet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_2,
                 tokenHolder: account_C,
                 value: 1,
@@ -404,13 +400,9 @@ describe('Security Tests', () => {
                 TotalTokenHolders_1
             )
 
-            erc1410TokenHolderFacet = erc1410TokenHolderFacet.connect(signer_B)
-
-            await erc1410TokenHolderFacet.redeemByPartition(
-                _PARTITION_ID_1,
-                1,
-                '0x'
-            )
+            await erc1410TokenHolderFacet
+                .connect(signer_B)
+                .redeemByPartition(_PARTITION_ID_1, 1, '0x')
 
             const TotalTokenHolders_2 =
                 await securityFacet.getTotalSecurityHolders()
@@ -419,13 +411,9 @@ describe('Security Tests', () => {
                 TotalTokenHolders_2
             )
 
-            erc1410TokenHolderFacet = erc1410TokenHolderFacet.connect(signer_A)
-
-            await erc1410TokenHolderFacet.redeemByPartition(
-                _PARTITION_ID_1,
-                1,
-                '0x'
-            )
+            await erc1410TokenHolderFacet
+                .connect(signer_A)
+                .redeemByPartition(_PARTITION_ID_1, 1, '0x')
 
             const TotalTokenHolders_3 =
                 await securityFacet.getTotalSecurityHolders()
@@ -434,13 +422,9 @@ describe('Security Tests', () => {
                 TotalTokenHolders_3
             )
 
-            erc1410TokenHolderFacet = erc1410TokenHolderFacet.connect(signer_C)
-
-            await erc1410TokenHolderFacet.redeemByPartition(
-                _PARTITION_ID_2,
-                1,
-                '0x'
-            )
+            await erc1410TokenHolderFacet
+                .connect(signer_C)
+                .redeemByPartition(_PARTITION_ID_2, 1, '0x')
 
             const TotalTokenHolders_4 =
                 await securityFacet.getTotalSecurityHolders()
@@ -470,9 +454,7 @@ describe('Security Tests', () => {
         })
 
         it('Check Security Total Holders and Holders when replacing', async () => {
-            erc1410ManagementFacet = erc1410ManagementFacet.connect(signer_A)
-
-            await erc1410ManagementFacet.issueByPartition({
+            await erc1410ManagementFacet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_A,
                 value: 1,
diff --git a/packages/ats/contracts/test/unitTests/layer_1/securityUSA/securityUSA.test.ts b/packages/ats/contracts/test/unitTests/layer_1/securityUSA/securityUSA.test.ts
index 63afae65d..9db97b337 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/securityUSA/securityUSA.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/securityUSA/securityUSA.test.ts
@@ -207,13 +207,7 @@ import { expect } from 'chai'
 import { ethers } from 'hardhat'
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers.js'
 import { isinGenerator } from '@thomaschaplin/isin-generator'
-import {
-    type ResolverProxy,
-    type EquityUSA,
-    type BondUSARead,
-    BusinessLogicResolver,
-    IFactory,
-} from '@typechain'
+import { type BondUSARead, BusinessLogicResolver, IFactory } from '@typechain'
 import {
     Rbac,
     deployBondFromFactory,
@@ -223,6 +217,7 @@ import {
     deployAtsFullInfrastructure,
     DeployAtsFullInfrastructureCommand,
     MAX_UINT256,
+    TIME_PERIODS_S,
 } from '@scripts'
 
 const countriesControlListType = true
@@ -235,13 +230,12 @@ const numberOfUnits = 1000
 let currentTimeInSeconds = 0
 let startingDate = 0
 const numberOfCoupons = 50
-const frequency = 7
+const frequency = TIME_PERIODS_S.DAY
 const rate = 1
 let maturityDate = startingDate + numberOfCoupons * frequency
 let firstCouponDate = startingDate + 1
 
 describe('Security USA Tests', () => {
-    let diamond: ResolverProxy
     let signer_A: SignerWithAddress
     let signer_B: SignerWithAddress
 
@@ -249,7 +243,6 @@ describe('Security USA Tests', () => {
 
     let factory: IFactory
     let businessLogicResolver: BusinessLogicResolver
-    let equityUSAFacet: EquityUSA
     let bondUSAFacet: BondUSARead
 
     before(async () => {
@@ -282,7 +275,7 @@ describe('Security USA Tests', () => {
 
     describe('equity USA', () => {
         it('Given regulation type REG_S and subtype NONE WHEN Read regulation data from Equity USA THEN all ok', async () => {
-            diamond = await deployEquityFromFactory({
+            const diamond = await deployEquityFromFactory({
                 adminAccount: account_A,
                 isWhiteList: false,
                 isControllable: true,
@@ -315,13 +308,11 @@ describe('Security USA Tests', () => {
                 factory,
             })
 
-            equityUSAFacet = await ethers.getContractAt(
+            const equityUSAFacet = await ethers.getContractAt(
                 'EquityUSA',
-                diamond.address
+                diamond.address,
+                signer_B
             )
-            // Using account C (non role)
-            equityUSAFacet = equityUSAFacet.connect(signer_B)
-
             // retrieve security regulation data
             const regulation = await equityUSAFacet.getSecurityRegulationData()
 
@@ -358,7 +349,7 @@ describe('Security USA Tests', () => {
         })
 
         it('Given regulation type REG_D and subtype REG_D_506_B WHEN Read regulation data from Equity USA THEN all ok', async () => {
-            diamond = await deployEquityFromFactory({
+            const diamond = await deployEquityFromFactory({
                 adminAccount: account_A,
                 isWhiteList: false,
                 isControllable: true,
@@ -391,12 +382,11 @@ describe('Security USA Tests', () => {
                 factory,
             })
 
-            equityUSAFacet = await ethers.getContractAt(
+            const equityUSAFacet = await ethers.getContractAt(
                 'EquityUSA',
-                diamond.address
+                diamond.address,
+                signer_B
             )
-            // Using account C (non role)
-            equityUSAFacet = equityUSAFacet.connect(signer_B)
 
             // retrieve security regulation data
             const regulation = await equityUSAFacet.getSecurityRegulationData()
@@ -434,7 +424,7 @@ describe('Security USA Tests', () => {
         })
 
         it('Given regulation type REG_D and subtype REG_D_506_C WHEN Read regulation data from Equity USA THEN all ok', async () => {
-            diamond = await deployEquityFromFactory({
+            const diamond = await deployEquityFromFactory({
                 adminAccount: account_A,
                 isWhiteList: false,
                 isControllable: true,
@@ -467,12 +457,11 @@ describe('Security USA Tests', () => {
                 factory,
             })
 
-            equityUSAFacet = await ethers.getContractAt(
+            const equityUSAFacet = await ethers.getContractAt(
                 'EquityUSA',
-                diamond.address
+                diamond.address,
+                signer_B
             )
-            // Using account C (non role)
-            equityUSAFacet = equityUSAFacet.connect(signer_B)
 
             // retrieve security regulation data
             const regulation = await equityUSAFacet.getSecurityRegulationData()
@@ -512,7 +501,7 @@ describe('Security USA Tests', () => {
 
     describe('bond USA', () => {
         it('Given regulation type REG_S and subtype NONE WHEN Read regulation data from Bond USA THEN all ok', async () => {
-            diamond = await deployBondFromFactory({
+            const diamond = await deployBondFromFactory({
                 adminAccount: account_A,
                 isWhiteList: false,
                 isControllable: true,
@@ -546,8 +535,6 @@ describe('Security USA Tests', () => {
                 'BondUSARead',
                 diamond.address
             )
-            // Using account C (non role)
-            bondUSAFacet = bondUSAFacet.connect(signer_B)
 
             // retrieve security regulation data
             const regulation = await bondUSAFacet.getSecurityRegulationData()
@@ -585,7 +572,7 @@ describe('Security USA Tests', () => {
         })
 
         it('Given regulation type REG_D and subtype REG_D_506_B WHEN Read regulation data from Bond USA THEN all ok', async () => {
-            diamond = await deployBondFromFactory({
+            const diamond = await deployBondFromFactory({
                 adminAccount: account_A,
                 isWhiteList: false,
                 isControllable: true,
@@ -619,9 +606,6 @@ describe('Security USA Tests', () => {
                 'BondUSARead',
                 diamond.address
             )
-            // Using account C (non role)
-            bondUSAFacet = bondUSAFacet.connect(signer_B)
-
             // retrieve security regulation data
             const regulation = await bondUSAFacet.getSecurityRegulationData()
 
@@ -658,7 +642,7 @@ describe('Security USA Tests', () => {
         })
 
         it('Given regulation type REG_D and subtype REG_D_506_C WHEN Read regulation data from Bond USA THEN all ok', async () => {
-            diamond = await deployBondFromFactory({
+            const diamond = await deployBondFromFactory({
                 adminAccount: account_A,
                 isWhiteList: false,
                 isControllable: true,
@@ -692,9 +676,6 @@ describe('Security USA Tests', () => {
                 'BondUSARead',
                 diamond.address
             )
-            // Using account C (non role)
-            bondUSAFacet = bondUSAFacet.connect(signer_B)
-
             // retrieve security regulation data
             const regulation = await bondUSAFacet.getSecurityRegulationData()
 
diff --git a/packages/ats/contracts/test/unitTests/layer_1/snapshots/snapshots.test.ts b/packages/ats/contracts/test/unitTests/layer_1/snapshots/snapshots.test.ts
index 6305a09a8..a78a09c02 100644
--- a/packages/ats/contracts/test/unitTests/layer_1/snapshots/snapshots.test.ts
+++ b/packages/ats/contracts/test/unitTests/layer_1/snapshots/snapshots.test.ts
@@ -400,13 +400,10 @@ describe('Snapshots Tests', () => {
     })
 
     it('GIVEN an account without snapshot role WHEN takeSnapshot THEN transaction fails with AccountHasNoRole', async () => {
-        // Using account C (non role)
-        snapshotFacet = snapshotFacet.connect(signer_C)
-
         // snapshot fails
-        await expect(snapshotFacet.takeSnapshot()).to.be.rejectedWith(
-            'AccountHasNoRole'
-        )
+        await expect(
+            snapshotFacet.connect(signer_C).takeSnapshot()
+        ).to.be.rejectedWith('AccountHasNoRole')
     })
 
     it('GIVEN a paused Token WHEN takeSnapshot THEN transaction fails with TokenIsPaused', async () => {
@@ -420,13 +417,9 @@ describe('Snapshots Tests', () => {
             account_C
         )
 
-        // Using account C (with role)
-        snapshotFacet = snapshotFacet.connect(signer_C)
-
-        // snapshot fails
-        await expect(snapshotFacet.takeSnapshot()).to.be.rejectedWith(
-            'TokenIsPaused'
-        )
+        await expect(
+            snapshotFacet.connect(signer_C).takeSnapshot()
+        ).to.be.rejectedWith('TokenIsPaused')
     })
 
     it('GIVEN no snapshot WHEN reading snapshot values THEN transaction fails', async () => {
@@ -479,10 +472,12 @@ describe('Snapshots Tests', () => {
     })
 
     it('GIVEN an account with snapshot role WHEN takeSnapshot THEN transaction succeeds', async () => {
-        // Granting Role to account C
-        accessControlFacet = accessControlFacet.connect(signer_A)
-        await accessControlFacet.grantRole(SNAPSHOT_ROLE, account_C)
-        await accessControlFacet.grantRole(ISSUER_ROLE, account_A)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(SNAPSHOT_ROLE, account_C)
+        await accessControlFacet
+            .connect(signer_A)
+            .grantRole(ISSUER_ROLE, account_A)
 
         await ssiManagementFacet.addIssuer(account_A)
         await kycFacet.grantKyc(
@@ -499,13 +494,8 @@ describe('Snapshots Tests', () => {
             MAX_UINT256,
             account_A
         )
-        // Using account C (with role)
-        snapshotFacet = snapshotFacet.connect(signer_C)
-        erc1410Facet = erc1410Facet.connect(signer_A)
-        lockFacet = lockFacet.connect(signer_B)
-        holdFacet = holdFacet.connect(signer_B)
 
-        await erc1410Facet.issueByPartition({
+        await erc1410Facet.connect(signer_A).issueByPartition({
             partition: _PARTITION_ID_1,
             tokenHolder: account_C,
             value: balanceOf_C_Original,
@@ -513,53 +503,56 @@ describe('Snapshots Tests', () => {
         })
 
         // snapshot
-        await expect(snapshotFacet.takeSnapshot())
+        await expect(snapshotFacet.connect(signer_C).takeSnapshot())
             .to.emit(snapshotFacet, 'SnapshotTaken')
             .withArgs(account_C, 1)
 
-        await erc1410Facet.issueByPartition({
+        await erc1410Facet.connect(signer_A).issueByPartition({
             partition: _PARTITION_ID_1,
             tokenHolder: account_A,
             value: amount,
             data: '0x',
         })
-        await erc1410Facet.issueByPartition({
+        await erc1410Facet.connect(signer_A).issueByPartition({
             partition: _PARTITION_ID_2,
             tokenHolder: account_A,
             value: amount,
             data: '0x',
         })
-        erc1410Facet = erc1410Facet.connect(signer_C)
 
         const basicTransferInfo = {
             to: account_A,
             value: amount,
         }
 
-        await erc1410Facet.transferByPartition(
-            _PARTITION_ID_1,
-            basicTransferInfo,
-            '0x'
-        )
+        await erc1410Facet
+            .connect(signer_C)
+            .transferByPartition(_PARTITION_ID_1, basicTransferInfo, '0x')
 
-        await lockFacet.lockByPartition(
-            _PARTITION_ID_1,
-            lockedAmountOf_A_Partition_1,
-            account_A,
-            MAX_UINT256
-        )
-        await lockFacet.lockByPartition(
-            _PARTITION_ID_1,
-            lockedAmountOf_C_Partition_1,
-            account_C,
-            MAX_UINT256
-        )
-        await lockFacet.lockByPartition(
-            _PARTITION_ID_2,
-            lockedAmountOf_A_Partition_2,
-            account_A,
-            MAX_UINT256
-        )
+        await lockFacet
+            .connect(signer_B)
+            .lockByPartition(
+                _PARTITION_ID_1,
+                lockedAmountOf_A_Partition_1,
+                account_A,
+                MAX_UINT256
+            )
+        await lockFacet
+            .connect(signer_B)
+            .lockByPartition(
+                _PARTITION_ID_1,
+                lockedAmountOf_C_Partition_1,
+                account_C,
+                MAX_UINT256
+            )
+        await lockFacet
+            .connect(signer_B)
+            .lockByPartition(
+                _PARTITION_ID_2,
+                lockedAmountOf_A_Partition_2,
+                account_A,
+                MAX_UINT256
+            )
 
         const hold = {
             amount: 0,
@@ -584,7 +577,7 @@ describe('Snapshots Tests', () => {
             .connect(signer_A)
             .createHoldByPartition(_PARTITION_ID_2, hold)
 
-        await snapshotFacet.takeSnapshot()
+        await snapshotFacet.connect(signer_C).takeSnapshot()
 
         // check snapshot
         const snapshot_Balance_Of_A_1 = await snapshotFacet.balanceOfAtSnapshot(
@@ -946,11 +939,15 @@ describe('Snapshots Tests', () => {
 
     describe('Scheduled tasks', async () => {
         it('GIVEN an account with snapshot role WHEN takeSnapshot THEN scheduled tasks get executed succeeds', async () => {
-            // Granting Role to account C
-            accessControlFacet = accessControlFacet.connect(signer_A)
-            await accessControlFacet.grantRole(SNAPSHOT_ROLE, account_A)
-            await accessControlFacet.grantRole(ISSUER_ROLE, account_A)
-            await accessControlFacet.grantRole(CORPORATE_ACTION_ROLE, account_A)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(SNAPSHOT_ROLE, account_A)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(ISSUER_ROLE, account_A)
+            await accessControlFacet
+                .connect(signer_A)
+                .grantRole(CORPORATE_ACTION_ROLE, account_A)
 
             await ssiManagementFacet.addIssuer(account_A)
             await kycFacet.grantKyc(
@@ -968,16 +965,13 @@ describe('Snapshots Tests', () => {
                 account_A
             )
 
-            snapshotFacet = snapshotFacet.connect(signer_A)
-            erc1410Facet = erc1410Facet.connect(signer_A)
-            equityFacet = equityFacet.connect(signer_A)
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_1,
                 tokenHolder: account_C,
                 value: balanceOf_C_Original,
                 data: '0x',
             })
-            await erc1410Facet.issueByPartition({
+            await erc1410Facet.connect(signer_A).issueByPartition({
                 partition: _PARTITION_ID_2,
                 tokenHolder: account_B,
                 value: balanceOf_B_Original,
@@ -1013,9 +1007,9 @@ describe('Snapshots Tests', () => {
                 executionDate: dividendsExecutionDateInSeconds.toString(),
                 amount: dividendsAmountPerEquity,
             }
-            await equityFacet.setDividends(dividendData_1)
-            await equityFacet.setDividends(dividendData_2)
-            await equityFacet.setDividends(dividendData_3)
+            await equityFacet.connect(signer_A).setDividends(dividendData_1)
+            await equityFacet.connect(signer_A).setDividends(dividendData_2)
+            await equityFacet.connect(signer_A).setDividends(dividendData_3)
 
             const balanceAdjustmentExecutionDateInSeconds_1 =
                 dateToUnixTimestamp('2030-01-01T00:00:07Z')
@@ -1049,15 +1043,15 @@ describe('Snapshots Tests', () => {
                 factor: balanceAdjustmentsFactor_3,
                 decimals: balanceAdjustmentsDecimals_3,
             }
-            await equityFacet.setScheduledBalanceAdjustment(
-                balanceAdjustmentData_1
-            )
-            await equityFacet.setScheduledBalanceAdjustment(
-                balanceAdjustmentData_2
-            )
-            await equityFacet.setScheduledBalanceAdjustment(
-                balanceAdjustmentData_3
-            )
+            await equityFacet
+                .connect(signer_A)
+                .setScheduledBalanceAdjustment(balanceAdjustmentData_1)
+            await equityFacet
+                .connect(signer_A)
+                .setScheduledBalanceAdjustment(balanceAdjustmentData_2)
+            await equityFacet
+                .connect(signer_A)
+                .setScheduledBalanceAdjustment(balanceAdjustmentData_3)
 
             //-------------------------
             await timeTravelFacet.changeSystemTimestamp(
@@ -1065,7 +1059,7 @@ describe('Snapshots Tests', () => {
             )
 
             // snapshot
-            await snapshotFacet.takeSnapshot()
+            await snapshotFacet.connect(signer_A).takeSnapshot()
 
             const adjustmentFactor_1 = balanceAdjustmentsFactor_1
             const adjustmentFactor_2 =
diff --git a/packages/ats/contracts/test/unitTests/resolver/BusinessLogicResolver.test.ts b/packages/ats/contracts/test/unitTests/resolver/BusinessLogicResolver.test.ts
index 140f1e6a7..8889e6799 100644
--- a/packages/ats/contracts/test/unitTests/resolver/BusinessLogicResolver.test.ts
+++ b/packages/ats/contracts/test/unitTests/resolver/BusinessLogicResolver.test.ts
@@ -252,17 +252,15 @@ describe('BusinessLogicResolver', () => {
 
     async function deployBusinessLogicResolverFixture() {
         businessLogicResolver = await (
-            await ethers.getContractFactory('BusinessLogicResolver')
+            await ethers.getContractFactory('BusinessLogicResolver', signer_A)
         ).deploy()
 
-        businessLogicResolver = businessLogicResolver.connect(signer_A)
-
         await businessLogicResolver.initialize_BusinessLogicResolver()
         accessControl = await ethers.getContractAt(
             'AccessControl',
-            businessLogicResolver.address
+            businessLogicResolver.address,
+            signer_A
         )
-        accessControl = accessControl.connect(signer_A)
         await accessControl.grantRole(PAUSER_ROLE, account_B)
 
         pause = await ethers.getContractAt(
@@ -289,14 +287,10 @@ describe('BusinessLogicResolver', () => {
     describe('Paused', () => {
         beforeEach(async () => {
             // Pausing the token
-            pause = pause.connect(signer_B)
-            await pause.pause()
+            await pause.connect(signer_B).pause()
         })
 
         it('GIVEN a paused Token WHEN registrying logics THEN transaction fails with TokenIsPaused', async () => {
-            // Using account C (with role)
-            businessLogicResolver = businessLogicResolver.connect(signer_A)
-
             // transfer with data fails
             await expect(
                 businessLogicResolver.registerBusinessLogics(
@@ -308,14 +302,11 @@ describe('BusinessLogicResolver', () => {
 
     describe('AccessControl', () => {
         it('GIVEN an account without admin role WHEN registrying logics THEN transaction fails with AccountHasNoRole', async () => {
-            // Using account C (non role)
-            businessLogicResolver = businessLogicResolver.connect(signer_C)
-
             // add to list fails
             await expect(
-                businessLogicResolver.registerBusinessLogics(
-                    BUSINESS_LOGIC_KEYS.slice(0, 2)
-                )
+                businessLogicResolver
+                    .connect(signer_C)
+                    .registerBusinessLogics(BUSINESS_LOGIC_KEYS.slice(0, 2))
             ).to.be.rejectedWith('AccountHasNoRole')
         })
     })
diff --git a/packages/ats/contracts/test/unitTests/resolver/diamondCutManager.test.ts b/packages/ats/contracts/test/unitTests/resolver/diamondCutManager.test.ts
index 310b10391..71e106d72 100644
--- a/packages/ats/contracts/test/unitTests/resolver/diamondCutManager.test.ts
+++ b/packages/ats/contracts/test/unitTests/resolver/diamondCutManager.test.ts
@@ -588,8 +588,6 @@ describe('DiamondCutManager', () => {
     })
 
     it('GIVEN a resolver WHEN adding a new configuration with configId at 0 THEN fails with DefaultValueForConfigurationIdNotPermitted', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_A)
-
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             []
         equityFacetIdList.forEach((id, index) =>
@@ -600,16 +598,16 @@ describe('DiamondCutManager', () => {
         )
 
         await expect(
-            diamondCutManager.createConfiguration(
-                '0x0000000000000000000000000000000000000000000000000000000000000000',
-                facetConfigurations
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createConfiguration(
+                    '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    facetConfigurations
+                )
         ).to.be.rejectedWith('DefaultValueForConfigurationIdNotPermitted')
     })
 
     it('GIVEN a resolver and a non admin user WHEN adding a new configuration THEN fails with AccountHasNoRole', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_B)
-
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             []
         equityFacetIdList.forEach((id, index) =>
@@ -620,18 +618,14 @@ describe('DiamondCutManager', () => {
         )
 
         await expect(
-            diamondCutManager.createConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations
-            )
+            diamondCutManager
+                .connect(signer_B)
+                .createConfiguration(EQUITY_CONFIG_ID, facetConfigurations)
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
     it('GIVEN a paused resolver WHEN adding a new configuration THEN fails with TokenIsPaused', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_A)
-        pause = pause.connect(signer_B)
-
-        await pause.pause()
+        await pause.connect(signer_B).pause()
 
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             []
@@ -643,18 +637,15 @@ describe('DiamondCutManager', () => {
         )
 
         await expect(
-            diamondCutManager.createConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createConfiguration(EQUITY_CONFIG_ID, facetConfigurations)
         ).to.be.rejectedWith('TokenIsPaused')
 
-        await pause.unpause()
+        await pause.connect(signer_B).unpause()
     })
 
     it('GIVEN a resolver WHEN adding a new configuration with a non registered facet THEN fails with FacetIdNotRegistered', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_A)
-
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             [
                 {
@@ -664,16 +655,13 @@ describe('DiamondCutManager', () => {
             ]
 
         await expect(
-            diamondCutManager.createConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createConfiguration(EQUITY_CONFIG_ID, facetConfigurations)
         ).to.be.rejectedWith('FacetIdNotRegistered')
     })
 
     it('GIVEN a resolver WHEN adding a new configuration with a duplicated facet THEN fails with DuplicatedFacetInConfiguration', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_A)
-
         // Add a duplicated facet
         const facetsIds = [...equityFacetIdList, equityFacetIdList[0]]
         // Add a duplicated version
@@ -692,10 +680,9 @@ describe('DiamondCutManager', () => {
         })
 
         await expect(
-            diamondCutManager.createConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createConfiguration(EQUITY_CONFIG_ID, facetConfigurations)
         ).to.be.rejectedWith('DuplicatedFacetInConfiguration')
     })
 
@@ -708,20 +695,14 @@ describe('DiamondCutManager', () => {
             })
         )
 
-        businessLogicResolver = deployedContracts.businessLogicResolver.contract
-
-        accessControl = AccessControlFacet__factory.connect(
-            businessLogicResolver.address,
+        const accessControl = AccessControlFacet__factory.connect(
+            deployedContracts.businessLogicResolver.contract.address,
             signer_A
         )
         await accessControl.grantRole(PAUSER_ROLE, account_B)
 
-        pause = PauseFacet__factory.connect(
-            businessLogicResolver.address,
-            signer_A
-        )
-        diamondCutManager = DiamondCutManager__factory.connect(
-            businessLogicResolver.address,
+        const diamondCutManager = DiamondCutManager__factory.connect(
+            deployedContracts.businessLogicResolver.contract.address,
             signer_A
         )
 
@@ -760,8 +741,6 @@ describe('DiamondCutManager', () => {
     })
 
     it('GIVEN a resolver WHEN adding a new configuration with configId at 0 with createBatchConfiguration THEN fails with DefaultValueForConfigurationIdNotPermitted', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_A)
-
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             []
         equityFacetIdList.forEach((id, index) =>
@@ -772,17 +751,17 @@ describe('DiamondCutManager', () => {
         )
 
         await expect(
-            diamondCutManager.createBatchConfiguration(
-                '0x0000000000000000000000000000000000000000000000000000000000000000',
-                facetConfigurations,
-                false
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createBatchConfiguration(
+                    '0x0000000000000000000000000000000000000000000000000000000000000000',
+                    facetConfigurations,
+                    false
+                )
         ).to.be.rejectedWith('DefaultValueForConfigurationIdNotPermitted')
     })
 
     it('GIVEN a resolver and a non admin user WHEN adding a new configuration with createBatchConfiguration THEN fails with AccountHasNoRole', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_B)
-
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             []
         equityFacetIdList.forEach((id, index) =>
@@ -793,19 +772,18 @@ describe('DiamondCutManager', () => {
         )
 
         await expect(
-            diamondCutManager.createBatchConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations,
-                false
-            )
+            diamondCutManager
+                .connect(signer_B)
+                .createBatchConfiguration(
+                    EQUITY_CONFIG_ID,
+                    facetConfigurations,
+                    false
+                )
         ).to.be.rejectedWith('AccountHasNoRole')
     })
 
     it('GIVEN a paused resolver WHEN adding a new configuration with createBatchConfiguration THEN fails with TokenIsPaused', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_A)
-        pause = pause.connect(signer_B)
-
-        await pause.pause()
+        await pause.connect(signer_B).pause()
 
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             []
@@ -817,19 +795,19 @@ describe('DiamondCutManager', () => {
         )
 
         await expect(
-            diamondCutManager.createBatchConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations,
-                false
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createBatchConfiguration(
+                    EQUITY_CONFIG_ID,
+                    facetConfigurations,
+                    false
+                )
         ).to.be.rejectedWith('TokenIsPaused')
 
-        await pause.unpause()
+        await pause.connect(signer_B).unpause()
     })
 
     it('GIVEN a resolver WHEN adding a new configuration with a non registered facet using createBatchConfiguration THEN fails with FacetIdNotRegistered', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_A)
-
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             [
                 {
@@ -839,17 +817,17 @@ describe('DiamondCutManager', () => {
             ]
 
         await expect(
-            diamondCutManager.createBatchConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations,
-                false
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createBatchConfiguration(
+                    EQUITY_CONFIG_ID,
+                    facetConfigurations,
+                    false
+                )
         ).to.be.rejectedWith('FacetIdNotRegistered')
     })
 
     it('GIVEN a resolver WHEN adding a new configuration with a duplicated facet using createBatchConfiguration THEN fails with DuplicatedFacetInConfiguration', async () => {
-        diamondCutManager = diamondCutManager.connect(signer_A)
-
         // Add a duplicated facet
         const facetsIds = [...equityFacetIdList, equityFacetIdList[0]]
         // Add a duplicated version
@@ -868,11 +846,13 @@ describe('DiamondCutManager', () => {
         })
 
         await expect(
-            diamondCutManager.createBatchConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations,
-                false
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createBatchConfiguration(
+                    EQUITY_CONFIG_ID,
+                    facetConfigurations,
+                    false
+                )
         ).to.be.rejectedWith('DuplicatedFacetInConfiguration')
     })
 
@@ -884,7 +864,6 @@ describe('DiamondCutManager', () => {
             blackListedSelectors
         )
 
-        diamondCutManager = diamondCutManager.connect(signer_A)
         const facetConfigurations: IDiamondCutManager.FacetConfigurationStruct[] =
             []
         equityFacetIdList.forEach((id, index) =>
@@ -895,10 +874,9 @@ describe('DiamondCutManager', () => {
         )
 
         await expect(
-            diamondCutManager.createConfiguration(
-                EQUITY_CONFIG_ID,
-                facetConfigurations
-            )
+            diamondCutManager
+                .connect(signer_A)
+                .createConfiguration(EQUITY_CONFIG_ID, facetConfigurations)
         )
             .to.be.revertedWithCustomError(
                 diamondCutManager,
diff --git a/packages/ats/contracts/test/unitTests/resolverProxy/resolverProxy.test.ts b/packages/ats/contracts/test/unitTests/resolverProxy/resolverProxy.test.ts
index f179ea8f5..be2a4bfe1 100644
--- a/packages/ats/contracts/test/unitTests/resolverProxy/resolverProxy.test.ts
+++ b/packages/ats/contracts/test/unitTests/resolverProxy/resolverProxy.test.ts
@@ -524,13 +524,12 @@ describe('ResolverProxy Tests', () => {
             await ethers.getContractFactory('ResolverProxy')
         ).deploy(resolver.address, CONFIG_ID, 1, rbac)
 
-        let diamondCut = await ethers.getContractAt(
+        const diamondCut = await ethers.getContractAt(
             'DiamondCutFacet',
-            resolverProxy.address
+            resolverProxy.address,
+            signer_A
         )
 
-        diamondCut = diamondCut.connect(signer_A)
-
         await expect(diamondCut.updateConfigVersion(100)).to.be.rejectedWith(
             'ResolverProxyConfigurationNoRegistered'
         )
@@ -564,9 +563,10 @@ describe('ResolverProxy Tests', () => {
             await ethers.getContractFactory('ResolverProxy')
         ).deploy(resolver.address, CONFIG_ID, oldVersion, rbac)
 
-        let diamondCut = await ethers.getContractAt(
+        const diamondCut = await ethers.getContractAt(
             'DiamondCutFacet',
-            resolverProxy.address
+            resolverProxy.address,
+            signer_A
         )
 
         let result = await diamondCut.getConfigInfo()
@@ -575,8 +575,6 @@ describe('ResolverProxy Tests', () => {
         expect(result.configurationId_).to.equal(CONFIG_ID)
         expect(result.version_).to.equal(oldVersion)
 
-        diamondCut = diamondCut.connect(signer_A)
-
         const newVersion = 0
 
         await diamondCut.updateConfigVersion(newVersion)
@@ -643,13 +641,12 @@ describe('ResolverProxy Tests', () => {
             await ethers.getContractFactory('ResolverProxy')
         ).deploy(resolver.address, CONFIG_ID, 1, rbac)
 
-        let diamondCut = await ethers.getContractAt(
+        const diamondCut = await ethers.getContractAt(
             'DiamondCutFacet',
-            resolverProxy.address
+            resolverProxy.address,
+            signer_A
         )
 
-        diamondCut = diamondCut.connect(signer_A)
-
         await expect(
             diamondCut.updateConfig(CONFIG_ID_2, 1)
         ).to.be.rejectedWith('ResolverProxyConfigurationNoRegistered')
@@ -684,9 +681,10 @@ describe('ResolverProxy Tests', () => {
             await ethers.getContractFactory('ResolverProxy')
         ).deploy(resolver.address, CONFIG_ID, oldVersion, rbac)
 
-        let diamondCut = await ethers.getContractAt(
+        const diamondCut = await ethers.getContractAt(
             'DiamondCutFacet',
-            resolverProxy.address
+            resolverProxy.address,
+            signer_A
         )
 
         let result = await diamondCut.getConfigInfo()
@@ -695,8 +693,6 @@ describe('ResolverProxy Tests', () => {
         expect(result.configurationId_).to.equal(CONFIG_ID)
         expect(result.version_).to.equal(oldVersion)
 
-        diamondCut = diamondCut.connect(signer_A)
-
         const newVersion = 0
 
         await diamondCut.updateConfig(CONFIG_ID_2, newVersion)
@@ -767,13 +763,12 @@ describe('ResolverProxy Tests', () => {
             await ethers.getContractFactory('ResolverProxy')
         ).deploy(resolver.address, CONFIG_ID, 1, rbac)
 
-        let diamondCut = await ethers.getContractAt(
+        const diamondCut = await ethers.getContractAt(
             'DiamondCutFacet',
-            resolverProxy.address
+            resolverProxy.address,
+            signer_A
         )
 
-        diamondCut = diamondCut.connect(signer_A)
-
         await expect(
             diamondCut.updateResolver(resolver_2.address, CONFIG_ID_2, 1)
         ).to.be.rejectedWith('ResolverProxyConfigurationNoRegistered')
@@ -814,9 +809,10 @@ describe('ResolverProxy Tests', () => {
             await ethers.getContractFactory('ResolverProxy')
         ).deploy(resolver.address, CONFIG_ID, oldVersion, rbac)
 
-        let diamondCut = await ethers.getContractAt(
+        const diamondCut = await ethers.getContractAt(
             'DiamondCutFacet',
-            resolverProxy.address
+            resolverProxy.address,
+            signer_A
         )
 
         let result = await diamondCut.getConfigInfo()
@@ -825,8 +821,6 @@ describe('ResolverProxy Tests', () => {
         expect(result.configurationId_).to.equal(CONFIG_ID)
         expect(result.version_).to.equal(oldVersion)
 
-        diamondCut = diamondCut.connect(signer_A)
-
         const newVersion = 0
 
         await diamondCut.updateResolver(
diff --git a/packages/ats/sdk/.eslintignore b/packages/ats/sdk/.eslintignore
index 234a92b35..8f577ea3e 100644
--- a/packages/ats/sdk/.eslintignore
+++ b/packages/ats/sdk/.eslintignore
@@ -1,5 +1,4 @@
-/**/*.js
-/**/*d.ts
+
 /tmp
 /example
 /src_old
diff --git a/packages/ats/sdk/__tests__/fixtures/bond/BondFixture.ts b/packages/ats/sdk/__tests__/fixtures/bond/BondFixture.ts
index aca82eb76..e26850742 100644
--- a/packages/ats/sdk/__tests__/fixtures/bond/BondFixture.ts
+++ b/packages/ats/sdk/__tests__/fixtures/bond/BondFixture.ts
@@ -206,6 +206,7 @@
 import { CreateBondCommand } from '@command/bond/create/CreateBondCommand';
 import { SetCouponCommand } from '@command/bond/coupon/set/SetCouponCommand';
 import { createFixture } from '../config';
+import { TIME_PERIODS_S } from '@core/Constants';
 import ContractId from '@domain/context/contract/ContractId';
 import {
   ContractIdPropFixture,
@@ -246,6 +247,8 @@ import { GetCouponHoldersQuery } from '@query/bond/coupons/getCouponHolders/GetC
 import { GetTotalCouponHoldersQuery } from '@query/bond/coupons/getTotalCouponHolders/GetTotalCouponHoldersQuery';
 import GetCouponHoldersRequest from '@port/in/request/bond/GetCouponHoldersRequest';
 import GetTotalCouponHoldersRequest from '@port/in/request/bond/GetTotalCouponHoldersRequest';
+import { CreateTrexSuiteBondCommand } from '@command/bond/createTrexSuite/CreateTrexSuiteBondCommand';
+import { CreateTrexSuiteBondRequest } from 'src';
 
 export const SetCouponCommandFixture = createFixture<SetCouponCommand>(
   (command) => {
@@ -259,6 +262,9 @@ export const SetCouponCommandFixture = createFixture<SetCouponCommand>(
     command.rate.faker((faker) =>
       faker.number.int({ min: 100, max: 999 }).toString(),
     );
+    command.period.faker((faker) =>
+      faker.number.int({ min: 86400, max: 31536000 }).toString(),
+    );
   },
 );
 
@@ -295,14 +301,77 @@ export const CreateBondCommandFixture = createFixture<CreateBondCommand>(
       faker.number.int({ min: 1, max: 5 }),
     );
     command.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
+    command.externalControlListsIds?.as(() => [
+      HederaIdPropsFixture.create().value,
+    ]);
+    command.externalKycListsIds?.as(() => [
+      HederaIdPropsFixture.create().value,
+    ]);
+    command.complianceId?.as(() => HederaIdPropsFixture.create().value);
+    command.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
+  },
+);
+
+export const CreateTrexSuiteBondCommandFixture =
+  createFixture<CreateTrexSuiteBondCommand>((command) => {
+    command.salt.faker((faker) => faker.string.alphanumeric({ length: 32 }));
+    command.owner.faker((faker) => faker.finance.accountName());
+    command.irs.faker((faker) => faker.finance.iban());
+    command.onchainId.faker((faker) => faker.finance.ethereumAddress());
+    command.irAgents.faker((faker) => [faker.finance.ethereumAddress()]);
+    command.tokenAgents.faker((faker) => [faker.finance.ethereumAddress()]);
+    command.compliancesModules.faker((faker) => [
+      faker.string.alphanumeric({ length: 32 }),
+    ]);
+    command.complianceSettings.faker((faker) => [
+      faker.string.alphanumeric({ length: 32 }),
+    ]);
+    command.claimTopics.faker((faker) => [
+      faker.number.int({ min: 1, max: 10 }),
+    ]);
+    command.issuers.faker((faker) => [faker.finance.ethereumAddress()]);
+    command.issuerClaims.faker((faker) => [
+      faker.number.int({ min: 1, max: 10 }),
+    ]);
+
+    command.security.fromFixture(SecurityPropsFixture);
+    command.currency.faker((faker) => faker.finance.currencyCode());
+    command.nominalValue.faker((faker) =>
+      faker.finance.amount({ min: 1, max: 10, dec: 2 }),
+    );
+    command.startingDate.faker((faker) =>
+      faker.date.recent().getTime().toString(),
+    );
+    command.maturityDate.faker((faker) =>
+      faker.date.future({ years: 2 }).getTime().toString(),
+    );
+    command.couponFrequency.faker((faker) =>
+      faker.number.int({ min: 1, max: 12 }).toString(),
+    );
+    command.couponRate.faker((faker) =>
+      faker.finance.amount({ min: 1, max: 10, dec: 2 }),
+    );
+    command.firstCouponDate.faker((faker) =>
+      faker.date.soon({ days: 30 }).getTime().toString(),
+    );
+    command.factory.as(
+      () => new ContractId(ContractIdPropFixture.create().value),
+    );
+    command.resolver.as(
+      () => new ContractId(ContractIdPropFixture.create().value),
+    );
+    command.configId.as(() => HederaIdPropsFixture.create().value);
+    command.configVersion.faker((faker) =>
+      faker.number.int({ min: 1, max: 5 }),
+    );
+    command.diamondOwnerAccount.as(() => HederaIdPropsFixture.create().value);
     command.externalControlLists?.as(() => [
       HederaIdPropsFixture.create().value,
     ]);
     command.externalKycLists?.as(() => [HederaIdPropsFixture.create().value]);
     command.compliance?.as(() => HederaIdPropsFixture.create().value);
     command.identityRegistry?.as(() => HederaIdPropsFixture.create().value);
-  },
-);
+  });
 
 export const UpdateMaturityDateCommandFixture =
   createFixture<UpdateMaturityDateCommand>((command) => {
@@ -498,11 +567,13 @@ export const CreateBondRequestFixture = createFixture<CreateBondRequest>(
     );
     request.configVersion.as(() => 1);
     request.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
-    request.externalPauses?.as(() => [HederaIdPropsFixture.create().value]);
-    request.externalControlLists?.as(() => [
+    request.externalPausesIds?.as(() => [HederaIdPropsFixture.create().value]);
+    request.externalControlListsIds?.as(() => [
+      HederaIdPropsFixture.create().value,
+    ]);
+    request.externalKycListsIds?.as(() => [
       HederaIdPropsFixture.create().value,
     ]);
-    request.externalKycLists?.as(() => [HederaIdPropsFixture.create().value]);
     request.complianceId?.as(() => HederaIdPropsFixture.create().value);
     request.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
   },
@@ -525,6 +596,7 @@ export const SetCouponRequestFixture = createFixture<SetCouponRequest>(
     request.executionTimestamp.faker((faker) =>
       faker.date.future().getTime().toString(),
     );
+    request.period.as(() => TIME_PERIODS_S.DAY.toString());
   },
 );
 
@@ -571,3 +643,118 @@ export const RedeemAtMaturityByPartitionRequestFixture =
     request.sourceId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
   });
+
+export const CreateTrexSuiteBondRequestFixture =
+  createFixture<CreateTrexSuiteBondRequest>((request) => {
+    request.salt.faker((faker) => faker.string.alphanumeric({ length: 32 }));
+    request.owner.faker((faker) => faker.finance.accountName());
+    request.irs.faker((faker) => faker.finance.iban());
+    request.onchainId.faker((faker) => faker.finance.ethereumAddress());
+    request.irAgents.faker((faker) => [faker.finance.ethereumAddress()]);
+    request.tokenAgents.faker((faker) => [faker.finance.ethereumAddress()]);
+    request.compliancesModules.faker((faker) => [
+      faker.string.alphanumeric({ length: 32 }),
+    ]);
+    request.complianceSettings.faker((faker) => [
+      faker.string.alphanumeric({ length: 32 }),
+    ]);
+    request.claimTopics.faker((faker) => [
+      faker.number.int({ min: 1, max: 10 }),
+    ]);
+    request.issuers.faker((faker) => [faker.finance.ethereumAddress()]);
+    request.issuerClaims.faker((faker) => [
+      faker.number.int({ min: 1, max: 10 }),
+    ]);
+    request.name.faker((faker) => faker.company.name());
+    request.symbol.faker((faker) =>
+      faker.string.alpha({ length: 3, casing: 'upper' }),
+    );
+    request.isin.faker((faker) => `US${faker.string.numeric(9)}`);
+    request.decimals.faker((faker) => faker.number.int({ min: 0, max: 18 }));
+    request.isWhiteList.faker((faker) => faker.datatype.boolean());
+    request.isControllable.faker((faker) => faker.datatype.boolean());
+    request.arePartitionsProtected.faker((faker) => faker.datatype.boolean());
+    request.clearingActive.faker((faker) => faker.datatype.boolean());
+    request.internalKycActivated.faker((faker) => faker.datatype.boolean());
+    request.isMultiPartition.faker((faker) => faker.datatype.boolean());
+    request.numberOfUnits?.as(() => '0');
+    const regulationType = CastRegulationType.toNumber(
+      faker.helpers.arrayElement(
+        Object.values(RegulationType).filter(
+          (type) => type !== RegulationType.NONE,
+        ),
+      ),
+    );
+    request.regulationType?.as(() => regulationType);
+    request.regulationSubType?.faker((faker) =>
+      regulationType === CastRegulationType.toNumber(RegulationType.REG_S)
+        ? CastRegulationSubType.toNumber(RegulationSubType.NONE)
+        : CastRegulationSubType.toNumber(
+            faker.helpers.arrayElement(
+              Object.values(RegulationSubType).filter(
+                (subType) => subType !== RegulationSubType.NONE,
+              ),
+            ),
+          ),
+    );
+    request.isCountryControlListWhiteList.faker((faker) =>
+      faker.datatype.boolean(),
+    );
+    request.countries?.faker((faker) =>
+      faker.helpers
+        .arrayElements(
+          Array.from({ length: 5 }, () =>
+            faker.location.countryCode({ variant: 'alpha-2' }),
+          ),
+          { min: 1, max: 5 },
+        )
+        .join(','),
+    );
+    request.info.faker((faker) => faker.lorem.words());
+    request.currency.faker(
+      (faker) =>
+        `0x${Buffer.from(faker.finance.currencyCode()).toString('hex')}`,
+    );
+    request.nominalValue.faker((faker) =>
+      faker.finance.amount({ min: 1, max: 10, dec: 2 }),
+    );
+    let startingDate: Date;
+    request.startingDate.faker((faker) => {
+      startingDate = faker.date.recent();
+      return startingDate.getTime().toString();
+    });
+    let maturityDate: Date;
+    request.maturityDate.faker((faker) => {
+      maturityDate = faker.date.future({ years: 2 });
+      return maturityDate.getTime().toString();
+    });
+    request.couponFrequency.faker((faker) =>
+      faker.number.int({ min: 1, max: 12 }).toString(),
+    );
+    request.couponRate.faker((faker) =>
+      faker.finance.amount({ min: 1, max: 10, dec: 2 }),
+    );
+    request.firstCouponDate.faker((faker) => {
+      return faker.date
+        .between({
+          from: startingDate,
+          to: maturityDate,
+        })
+        .getTime()
+        .toString();
+    });
+
+    request.configId.faker(
+      (faker) =>
+        `0x000000000000000000000000000000000000000000000000000000000000000${faker.number.int({ min: 1, max: 9 })}`,
+    );
+    request.configVersion.as(() => 1);
+    request.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
+    request.externalPauses?.as(() => [HederaIdPropsFixture.create().value]);
+    request.externalControlLists?.as(() => [
+      HederaIdPropsFixture.create().value,
+    ]);
+    request.externalKycLists?.as(() => [HederaIdPropsFixture.create().value]);
+    request.complianceId?.as(() => HederaIdPropsFixture.create().value);
+    request.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
+  });
diff --git a/packages/ats/sdk/__tests__/fixtures/clearing/ClearingFixture.ts b/packages/ats/sdk/__tests__/fixtures/clearing/ClearingFixture.ts
index 3b97f8a44..fbae5e035 100644
--- a/packages/ats/sdk/__tests__/fixtures/clearing/ClearingFixture.ts
+++ b/packages/ats/sdk/__tests__/fixtures/clearing/ClearingFixture.ts
@@ -396,7 +396,7 @@ export const ClearingCreateHoldByPartitionRequestFixture =
   createFixture<ClearingCreateHoldByPartitionRequest>((request) => {
     request.securityId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
-    request.escrow.as(() => HederaIdPropsFixture.create().value);
+    request.escrowId.as(() => HederaIdPropsFixture.create().value);
     request.targetId.as(() => HederaIdPropsFixture.create().value);
     request.amount.faker((faker) =>
       faker.number.int({ min: 1, max: 10 }).toString(),
@@ -413,7 +413,7 @@ export const ClearingCreateHoldFromByPartitionRequestFixture =
   createFixture<ClearingCreateHoldFromByPartitionRequest>((request) => {
     request.securityId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
-    request.escrow.as(() => HederaIdPropsFixture.create().value);
+    request.escrowId.as(() => HederaIdPropsFixture.create().value);
     request.sourceId.as(() => HederaIdPropsFixture.create().value);
     request.targetId.as(() => HederaIdPropsFixture.create().value);
     request.amount.faker((faker) =>
@@ -431,7 +431,7 @@ export const ProtectedClearingCreateHoldByPartitionRequestFixture =
   createFixture<ProtectedClearingCreateHoldByPartitionRequest>((request) => {
     request.securityId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
-    request.escrow.as(() => HederaIdPropsFixture.create().value);
+    request.escrowId.as(() => HederaIdPropsFixture.create().value);
     request.sourceId.as(() => HederaIdPropsFixture.create().value);
     request.targetId.as(() => HederaIdPropsFixture.create().value);
     request.amount.faker((faker) =>
@@ -530,7 +530,7 @@ export const OperatorClearingCreateHoldByPartitionRequestFixture =
   createFixture<OperatorClearingCreateHoldByPartitionRequest>((request) => {
     request.securityId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
-    request.escrow.as(() => HederaIdPropsFixture.create().value);
+    request.escrowId.as(() => HederaIdPropsFixture.create().value);
     request.sourceId.as(() => HederaIdPropsFixture.create().value);
     request.targetId.as(() => HederaIdPropsFixture.create().value);
     request.amount.faker((faker) =>
@@ -662,7 +662,7 @@ export const ClearingCreateHoldByPartitionCommandFixture =
     command.securityId.as(() => HederaIdPropsFixture.create().value);
     command.partitionId.as(() => PartitionIdFixture.create().value);
     command.targetId.as(() => HederaIdPropsFixture.create().value);
-    command.escrow.as(() => HederaIdPropsFixture.create().value);
+    command.escrowId.as(() => HederaIdPropsFixture.create().value);
     command.amount.faker((faker) =>
       faker.number.int({ min: 0, max: 1000 }).toString(),
     );
@@ -742,7 +742,7 @@ export const ClearingHoldCreationFixture = createFixture<ClearingHoldCreation>(
     props.expirationTimestamp.faker((faker) => faker.date.future());
     props.data.faker((faker) => faker.lorem.words());
     props.operatorData.faker((faker) => faker.lorem.words());
-    props.holdEscrow.as(() => HederaIdPropsFixture.create().value);
+    props.holdEscrowId.as(() => HederaIdPropsFixture.create().value);
     props.holdExpirationTimestamp.faker((faker) => faker.date.future());
     props.holdTo.as(() => HederaIdPropsFixture.create().value);
     props.holdData.faker((faker) => faker.lorem.words());
diff --git a/packages/ats/sdk/__tests__/fixtures/equity/EquityFixture.ts b/packages/ats/sdk/__tests__/fixtures/equity/EquityFixture.ts
index 0a5949f24..7cbe6e09b 100644
--- a/packages/ats/sdk/__tests__/fixtures/equity/EquityFixture.ts
+++ b/packages/ats/sdk/__tests__/fixtures/equity/EquityFixture.ts
@@ -265,6 +265,8 @@ import GetDividendHoldersRequest from '@port/in/request/equity/GetDividendHolder
 import GetTotalDividendHoldersRequest from '@port/in/request/equity/GetTotalDividendHoldersRequest';
 import GetVotingHoldersRequest from '@port/in/request/equity/GetVotingHoldersRequest';
 import GetTotalVotingHoldersRequest from '@port/in/request/equity/GetTotalVotingHoldersRequest';
+import { CreateTrexSuiteEquityCommand } from '@command/equity/createTrexSuite/CreateTrexSuiteEquityCommand';
+import { CreateTrexSuiteEquityRequest } from 'src';
 
 export const CreateEquityRequestFixture = createFixture<CreateEquityRequest>(
   (request) => {
@@ -340,11 +342,13 @@ export const CreateEquityRequestFixture = createFixture<CreateEquityRequest>(
     );
     request.configVersion.as(() => 1);
     request.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
-    request.externalPauses?.as(() => [HederaIdPropsFixture.create().value]);
-    request.externalControlLists?.as(() => [
+    request.externalPausesIds?.as(() => [HederaIdPropsFixture.create().value]);
+    request.externalControlListsIds?.as(() => [
+      HederaIdPropsFixture.create().value,
+    ]);
+    request.externalKycListsIds?.as(() => [
       HederaIdPropsFixture.create().value,
     ]);
-    request.externalKycLists?.as(() => [HederaIdPropsFixture.create().value]);
     request.complianceId?.as(() => HederaIdPropsFixture.create().value);
     request.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
   },
@@ -592,6 +596,68 @@ export const GetTotalVotingHoldersQueryFixture =
 
 export const CreateEquityCommandFixture = createFixture<CreateEquityCommand>(
   (command) => {
+    command.security.fromFixture(SecurityPropsFixture);
+    command.currency.faker((faker) => faker.finance.currencyCode());
+    command.nominalValue.faker((faker) =>
+      faker.finance.amount({ min: 1, max: 10, dec: 2 }),
+    );
+    command.votingRight.faker((faker) => faker.datatype.boolean());
+    command.informationRight.faker((faker) => faker.datatype.boolean());
+    command.liquidationRight.faker((faker) => faker.datatype.boolean());
+    command.subscriptionRight.faker((faker) => faker.datatype.boolean());
+    command.conversionRight.faker((faker) => faker.datatype.boolean());
+    command.redemptionRight.faker((faker) => faker.datatype.boolean());
+    command.putRight.faker((faker) => faker.datatype.boolean());
+    command.dividendRight.faker((faker) => faker.datatype.boolean());
+    command.currency.faker((faker) =>
+      faker.string.hexadecimal({ length: 6, casing: 'lower', prefix: '0x' }),
+    );
+    command.factory?.as(
+      () => new ContractId(ContractIdPropFixture.create().value),
+    );
+    command.resolver?.as(
+      () => new ContractId(ContractIdPropFixture.create().value),
+    );
+    command.configId?.faker((faker) =>
+      faker.string.hexadecimal({ length: 64, casing: 'lower', prefix: '0x' }),
+    );
+    command.configVersion?.faker((faker) =>
+      faker.number.int({ min: 1, max: 5 }),
+    );
+    command.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
+    command.externalControlListsIds?.as(() => [
+      HederaIdPropsFixture.create().value,
+    ]);
+    command.externalKycListsIds?.as(() => [
+      HederaIdPropsFixture.create().value,
+    ]);
+    command.complianceId?.as(() => HederaIdPropsFixture.create().value);
+    command.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
+  },
+);
+
+export const CreateTrexSuiteEquityCommandFixture =
+  createFixture<CreateTrexSuiteEquityCommand>((command) => {
+    command.salt.faker((faker) => faker.string.alphanumeric({ length: 32 }));
+    command.owner.faker((faker) => faker.finance.accountName());
+    command.irs.faker((faker) => faker.finance.iban());
+    command.onchainId.faker((faker) => faker.finance.ethereumAddress());
+    command.irAgents.faker((faker) => [faker.finance.ethereumAddress()]);
+    command.tokenAgents.faker((faker) => [faker.finance.ethereumAddress()]);
+    command.compliancesModules.faker((faker) => [
+      faker.string.alphanumeric({ length: 32 }),
+    ]);
+    command.complianceSettings.faker((faker) => [
+      faker.string.alphanumeric({ length: 32 }),
+    ]);
+    command.claimTopics.faker((faker) => [
+      faker.number.int({ min: 1, max: 10 }),
+    ]);
+    command.issuers.faker((faker) => [faker.finance.ethereumAddress()]);
+    command.issuerClaims.faker((faker) => [
+      faker.number.int({ min: 1, max: 10 }),
+    ]);
+
     command.security.fromFixture(SecurityPropsFixture);
     command.currency.faker((faker) => faker.finance.currencyCode());
     command.nominalValue.faker((faker) =>
@@ -627,8 +693,7 @@ export const CreateEquityCommandFixture = createFixture<CreateEquityCommand>(
     command.externalKycLists?.as(() => [HederaIdPropsFixture.create().value]);
     command.compliance?.as(() => HederaIdPropsFixture.create().value);
     command.identityRegistry?.as(() => HederaIdPropsFixture.create().value);
-  },
-);
+  });
 
 export const SetScheduledBalanceAdjustmentCommandFixture =
   createFixture<SetScheduledBalanceAdjustmentCommand>((command) => {
@@ -716,3 +781,105 @@ export const VotingRightsFixture = createFixture<VotingRights>((props) => {
   props.recordTimeStamp.faker((faker) => faker.date.past());
   props.snapshotId?.faker((faker) => faker.number.int({ min: 1, max: 999 }));
 });
+
+export const CreateTrexSuiteEquityRequestFixture =
+  createFixture<CreateTrexSuiteEquityRequest>((request) => {
+    request.salt.faker((faker) => faker.string.alphanumeric({ length: 32 }));
+    request.owner.faker((faker) => faker.finance.accountName());
+    request.irs.faker((faker) => faker.finance.iban());
+    request.onchainId.faker((faker) => faker.finance.ethereumAddress());
+    request.irAgents.faker((faker) => [faker.finance.ethereumAddress()]);
+    request.tokenAgents.faker((faker) => [faker.finance.ethereumAddress()]);
+    request.compliancesModules.faker((faker) => [
+      faker.string.alphanumeric({ length: 32 }),
+    ]);
+    request.complianceSettings.faker((faker) => [
+      faker.string.alphanumeric({ length: 32 }),
+    ]);
+    request.claimTopics.faker((faker) => [
+      faker.number.int({ min: 1, max: 10 }),
+    ]);
+    request.issuers.faker((faker) => [faker.finance.ethereumAddress()]);
+    request.issuerClaims.faker((faker) => [
+      faker.number.int({ min: 1, max: 10 }),
+    ]);
+    request.name.faker((faker) => faker.company.name());
+    request.symbol.faker((faker) =>
+      faker.string.alpha({ length: 3, casing: 'upper' }),
+    );
+    request.isin.faker((faker) => `US${faker.string.numeric(9)}`);
+    request.decimals.faker((faker) => faker.number.int({ min: 0, max: 18 }));
+    request.isWhiteList.faker((faker) => faker.datatype.boolean());
+    request.isControllable.faker((faker) => faker.datatype.boolean());
+    request.arePartitionsProtected.faker((faker) => faker.datatype.boolean());
+    request.clearingActive.faker((faker) => faker.datatype.boolean());
+    request.internalKycActivated.faker((faker) => faker.datatype.boolean());
+    request.isMultiPartition.faker((faker) => faker.datatype.boolean());
+    const regulationType = CastRegulationType.toNumber(
+      faker.helpers.arrayElement(
+        Object.values(RegulationType).filter(
+          (type) => type !== RegulationType.NONE,
+        ),
+      ),
+    );
+    request.regulationType?.as(() => regulationType);
+    request.regulationSubType?.faker((faker) =>
+      regulationType === CastRegulationType.toNumber(RegulationType.REG_S)
+        ? CastRegulationSubType.toNumber(RegulationSubType.NONE)
+        : CastRegulationSubType.toNumber(
+            faker.helpers.arrayElement(
+              Object.values(RegulationSubType).filter(
+                (subType) => subType !== RegulationSubType.NONE,
+              ),
+            ),
+          ),
+    );
+    request.isCountryControlListWhiteList.faker((faker) =>
+      faker.datatype.boolean(),
+    );
+    request.numberOfShares.faker((faker) =>
+      faker.number.int({ min: 1, max: 10 }).toString(),
+    );
+    request.countries?.faker((faker) =>
+      faker.helpers
+        .arrayElements(
+          Array.from({ length: 5 }, () =>
+            faker.location.countryCode({ variant: 'alpha-2' }),
+          ),
+          { min: 1, max: 5 },
+        )
+        .join(','),
+    );
+    request.info.faker((faker) => faker.lorem.words());
+    request.currency.faker(
+      (faker) =>
+        `0x${Buffer.from(faker.finance.currencyCode()).toString('hex')}`,
+    );
+    request.dividendRight.faker((faker) =>
+      CastDividendType.toNumber(
+        faker.helpers.arrayElement(Object.values(DividendType)),
+      ),
+    );
+    request.nominalValue.faker((faker) =>
+      faker.finance.amount({ min: 1, max: 10, dec: 2 }),
+    );
+    request.votingRight.faker((faker) => faker.datatype.boolean());
+    request.liquidationRight.faker((faker) => faker.datatype.boolean());
+    request.subscriptionRight.faker((faker) => faker.datatype.boolean());
+    request.conversionRight.faker((faker) => faker.datatype.boolean());
+    request.redemptionRight.faker((faker) => faker.datatype.boolean());
+    request.putRight.faker((faker) => faker.datatype.boolean());
+    request.configId.faker(
+      (faker) =>
+        `0x000000000000000000000000000000000000000000000000000000000000000${faker.number.int({ min: 1, max: 9 })}`,
+    );
+    request.configVersion.as(() => 1);
+    request.diamondOwnerAccount.as(() => HederaIdPropsFixture.create().value);
+    request.externalPauses?.as(() => [HederaIdPropsFixture.create().value]);
+    request.externalControlLists?.as(() => [
+      HederaIdPropsFixture.create().value,
+    ]);
+    request.externalKycLists?.as(() => [HederaIdPropsFixture.create().value]);
+    request.complianceId?.as(() => HederaIdPropsFixture.create().value);
+    request.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
+  });
diff --git a/packages/ats/sdk/__tests__/fixtures/hold/HoldFixture.ts b/packages/ats/sdk/__tests__/fixtures/hold/HoldFixture.ts
index 0ac621539..6436ac5e0 100644
--- a/packages/ats/sdk/__tests__/fixtures/hold/HoldFixture.ts
+++ b/packages/ats/sdk/__tests__/fixtures/hold/HoldFixture.ts
@@ -236,7 +236,7 @@ export const CreateHoldByPartitionRequestFixture =
   createFixture<CreateHoldByPartitionRequest>((request) => {
     request.securityId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
-    request.escrow.as(() => HederaIdPropsFixture.create().value);
+    request.escrowId.as(() => HederaIdPropsFixture.create().value);
     request.targetId.as(() => HederaIdPropsFixture.create().value);
     request.amount.faker((faker) =>
       faker.number.int({ min: 1, max: 10 }).toString(),
@@ -250,7 +250,7 @@ export const CreateHoldFromByPartitionRequestFixture =
   createFixture<CreateHoldFromByPartitionRequest>((request) => {
     request.securityId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
-    request.escrow.as(() => HederaIdPropsFixture.create().value);
+    request.escrowId.as(() => HederaIdPropsFixture.create().value);
     request.sourceId.as(() => HederaIdPropsFixture.create().value);
     request.targetId.as(() => HederaIdPropsFixture.create().value);
     request.amount.faker((faker) =>
@@ -265,7 +265,7 @@ export const ControllerCreateHoldByPartitionRequestFixture =
   createFixture<ControllerCreateHoldByPartitionRequest>((request) => {
     request.securityId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
-    request.escrow.as(() => HederaIdPropsFixture.create().value);
+    request.escrowId.as(() => HederaIdPropsFixture.create().value);
     request.sourceId.as(() => HederaIdPropsFixture.create().value);
     request.targetId.as(() => HederaIdPropsFixture.create().value);
     request.amount.faker((faker) =>
@@ -280,7 +280,7 @@ export const ProtectedCreateHoldByPartitionRequestFixture =
   createFixture<ProtectedCreateHoldByPartitionRequest>((request) => {
     request.securityId.as(() => HederaIdPropsFixture.create().value);
     request.partitionId.as(() => PartitionIdFixture.create().value);
-    request.escrow.as(() => HederaIdPropsFixture.create().value);
+    request.escrowId.as(() => HederaIdPropsFixture.create().value);
     request.sourceId.as(() => HederaIdPropsFixture.create().value);
     request.targetId.as(() => HederaIdPropsFixture.create().value);
     request.amount.faker((faker) =>
@@ -420,7 +420,7 @@ export const CreateHoldCommandFixture =
   createFixture<ProtectedCreateHoldByPartitionCommand>((command) => {
     command.securityId.as(() => HederaIdPropsFixture.create().value);
     command.partitionId.as(() => PartitionIdFixture.create().value);
-    command.escrow.as(() => HederaIdPropsFixture.create().value);
+    command.escrowId.as(() => HederaIdPropsFixture.create().value);
     command.targetId.as(() => HederaIdPropsFixture.create().value);
     command.amount.faker(
       (faker) =>
diff --git a/packages/ats/sdk/__tests__/fixtures/trexFactroy/TrexFactoryFixture.ts b/packages/ats/sdk/__tests__/fixtures/trexFactroy/TrexFactoryFixture.ts
new file mode 100644
index 000000000..bf52b6c6d
--- /dev/null
+++ b/packages/ats/sdk/__tests__/fixtures/trexFactroy/TrexFactoryFixture.ts
@@ -0,0 +1,215 @@
+/*
+																 Apache License
+													 Version 2.0, January 2004
+												http://www.apache.org/licenses/
+
+	 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+	 1. Definitions.
+
+			"License" shall mean the terms and conditions for use, reproduction,
+			and distribution as defined by Sections 1 through 9 of this document.
+
+			"Licensor" shall mean the copyright owner or entity authorized by
+			the copyright owner that is granting the License.
+
+			"Legal Entity" shall mean the union of the acting entity and all
+			other entities that control, are controlled by, or are under common
+			control with that entity. For the purposes of this definition,
+			"control" means (i) the power, direct or indirect, to cause the
+			direction or management of such entity, whether by contract or
+			otherwise, or (ii) ownership of fifty percent (50%) or more of the
+			outstanding shares, or (iii) beneficial ownership of such entity.
+
+			"You" (or "Your") shall mean an individual or Legal Entity
+			exercising permissions granted by this License.
+
+			"Source" form shall mean the preferred form for making modifications,
+			including but not limited to software source code, documentation
+			source, and configuration files.
+
+			"Object" form shall mean any form resulting from mechanical
+			transformation or translation of a Source form, including but
+			not limited to compiled object code, generated documentation,
+			and conversions to other media types.
+
+			"Work" shall mean the work of authorship, whether in Source or
+			Object form, made available under the License, as indicated by a
+			copyright notice that is included in or attached to the work
+			(an example is provided in the Appendix below).
+
+			"Derivative Works" shall mean any work, whether in Source or Object
+			form, that is based on (or derived from) the Work and for which the
+			editorial revisions, annotations, elaborations, or other modifications
+			represent, as a whole, an original work of authorship. For the purposes
+			of this License, Derivative Works shall not include works that remain
+			separable from, or merely link (or bind by name) to the interfaces of,
+			the Work and Derivative Works thereof.
+
+			"Contribution" shall mean any work of authorship, including
+			the original version of the Work and any modifications or additions
+			to that Work or Derivative Works thereof, that is intentionally
+			submitted to Licensor for inclusion in the Work by the copyright owner
+			or by an individual or Legal Entity authorized to submit on behalf of
+			the copyright owner. For the purposes of this definition, "submitted"
+			means any form of electronic, verbal, or written communication sent
+			to the Licensor or its representatives, including but not limited to
+			communication on electronic mailing lists, source code control systems,
+			and issue tracking systems that are managed by, or on behalf of, the
+			Licensor for the purpose of discussing and improving the Work, but
+			excluding communication that is conspicuously marked or otherwise
+			designated in writing by the copyright owner as "Not a Contribution."
+
+			"Contributor" shall mean Licensor and any individual or Legal Entity
+			on behalf of whom a Contribution has been received by Licensor and
+			subsequently incorporated within the Work.
+
+	 2. Grant of Copyright License. Subject to the terms and conditions of
+			this License, each Contributor hereby grants to You a perpetual,
+			worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+			copyright license to reproduce, prepare Derivative Works of,
+			publicly display, publicly perform, sublicense, and distribute the
+			Work and such Derivative Works in Source or Object form.
+
+	 3. Grant of Patent License. Subject to the terms and conditions of
+			this License, each Contributor hereby grants to You a perpetual,
+			worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+			(except as stated in this section) patent license to make, have made,
+			use, offer to sell, sell, import, and otherwise transfer the Work,
+			where such license applies only to those patent claims licensable
+			by such Contributor that are necessarily infringed by their
+			Contribution(s) alone or by combination of their Contribution(s)
+			with the Work to which such Contribution(s) was submitted. If You
+			institute patent litigation against any entity (including a
+			cross-claim or counterclaim in a lawsuit) alleging that the Work
+			or a Contribution incorporated within the Work constitutes direct
+			or contributory patent infringement, then any patent licenses
+			granted to You under this License for that Work shall terminate
+			as of the date such litigation is filed.
+
+	 4. Redistribution. You may reproduce and distribute copies of the
+			Work or Derivative Works thereof in any medium, with or without
+			modifications, and in Source or Object form, provided that You
+			meet the following conditions:
+
+			(a) You must give any other recipients of the Work or
+					Derivative Works a copy of this License; and
+
+			(b) You must cause any modified files to carry prominent notices
+					stating that You changed the files; and
+
+			(c) You must retain, in the Source form of any Derivative Works
+					that You distribute, all copyright, patent, trademark, and
+					attribution notices from the Source form of the Work,
+					excluding those notices that do not pertain to any part of
+					the Derivative Works; and
+
+			(d) If the Work includes a "NOTICE" text file as part of its
+					distribution, then any Derivative Works that You distribute must
+					include a readable copy of the attribution notices contained
+					within such NOTICE file, excluding those notices that do not
+					pertain to any part of the Derivative Works, in at least one
+					of the following places: within a NOTICE text file distributed
+					as part of the Derivative Works; within the Source form or
+					documentation, if provided along with the Derivative Works; or,
+					within a display generated by the Derivative Works, if and
+					wherever such third-party notices normally appear. The contents
+					of the NOTICE file are for informational purposes only and
+					do not modify the License. You may add Your own attribution
+					notices within Derivative Works that You distribute, alongside
+					or as an addendum to the NOTICE text from the Work, provided
+					that such additional attribution notices cannot be construed
+					as modifying the License.
+
+			You may add Your own copyright statement to Your modifications and
+			may provide additional or different license terms and conditions
+			for use, reproduction, or distribution of Your modifications, or
+			for any such Derivative Works as a whole, provided Your use,
+			reproduction, and distribution of the Work otherwise complies with
+			the conditions stated in this License.
+
+	 5. Submission of Contributions. Unless You explicitly state otherwise,
+			any Contribution intentionally submitted for inclusion in the Work
+			by You to the Licensor shall be under the terms and conditions of
+			this License, without any additional terms or conditions.
+			Notwithstanding the above, nothing herein shall supersede or modify
+			the terms of any separate license agreement you may have executed
+			with Licensor regarding such Contributions.
+
+	 6. Trademarks. This License does not grant permission to use the trade
+			names, trademarks, service marks, or product names of the Licensor,
+			except as required for reasonable and customary use in describing the
+			origin of the Work and reproducing the content of the NOTICE file.
+
+	 7. Disclaimer of Warranty. Unless required by applicable law or
+			agreed to in writing, Licensor provides the Work (and each
+			Contributor provides its Contributions) on an "AS IS" BASIS,
+			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+			implied, including, without limitation, any warranties or conditions
+			of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+			PARTICULAR PURPOSE. You are solely responsible for determining the
+			appropriateness of using or redistributing the Work and assume any
+			risks associated with Your exercise of permissions under this License.
+
+	 8. Limitation of Liability. In no event and under no legal theory,
+			whether in tort (including negligence), contract, or otherwise,
+			unless required by applicable law (such as deliberate and grossly
+			negligent acts) or agreed to in writing, shall any Contributor be
+			liable to You for damages, including any direct, indirect, special,
+			incidental, or consequential damages of any character arising as a
+			result of this License or out of the use or inability to use the
+			Work (including but not limited to damages for loss of goodwill,
+			work stoppage, computer failure or malfunction, or any and all
+			other commercial damages or losses), even if such Contributor
+			has been advised of the possibility of such damages.
+
+	 9. Accepting Warranty or Additional Liability. While redistributing
+			the Work or Derivative Works thereof, You may choose to offer,
+			and charge a fee for, acceptance of support, warranty, indemnity,
+			or other liability obligations and/or rights consistent with this
+			License. However, in accepting such obligations, You may act only
+			on Your own behalf and on Your sole responsibility, not on behalf
+			of any other Contributor, and only if You agree to indemnify,
+			defend, and hold each Contributor harmless for any liability
+			incurred by, or claims asserted against, such Contributor by reason
+			of your accepting any such warranty or additional liability.
+
+	 END OF TERMS AND CONDITIONS
+
+	 APPENDIX: How to apply the Apache License to your work.
+
+			To apply the Apache License to your work, attach the following
+			boilerplate notice, with the fields enclosed by brackets "[]"
+			replaced with your own identifying information. (Don't include
+			the brackets!)  The text should be enclosed in the appropriate
+			comment syntax for the file format. We also recommend that a
+			file or class name and description of purpose be included on the
+			same "printed page" as the copyright notice for easier
+			identification within third-party archives.
+
+	 Copyright [yyyy] [name of copyright owner]
+
+	 Licensed under the Apache License, Version 2.0 (the "License");
+	 you may not use this file except in compliance with the License.
+	 You may obtain a copy of the License at
+
+			 http://www.apache.org/licenses/LICENSE-2.0
+
+	 Unless required by applicable law or agreed to in writing, software
+	 distributed under the License is distributed on an "AS IS" BASIS,
+	 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	 See the License for the specific language governing permissions and
+	 limitations under the License.
+
+*/
+
+import { createFixture } from '../config';
+import { GetTokenBySaltQuery } from '@query/factory/trex/getTokenBySalt/GetTokenBySaltQuery';
+import { HederaIdPropsFixture } from '../shared/DataFixture';
+
+export const GetTokenQueryFixture = createFixture<GetTokenBySaltQuery>(
+  (query) => {
+    query.salt.faker((faker) => faker.string.alphanumeric());
+    query.factory?.as(() => HederaIdPropsFixture.create().value);
+  },
+);
diff --git a/packages/ats/sdk/__tests__/port/in/Bond.test.ts b/packages/ats/sdk/__tests__/port/in/Bond.test.ts
index 218f13991..01184744d 100644
--- a/packages/ats/sdk/__tests__/port/in/Bond.test.ts
+++ b/packages/ats/sdk/__tests__/port/in/Bond.test.ts
@@ -226,6 +226,7 @@ import {
   FACTORY_ADDRESS,
   RESOLVER_ADDRESS,
 } from '@test/config';
+import { TIME_PERIODS_S } from '@core/Constants';
 import ConnectRequest from '@port/in/request/network/ConnectRequest';
 import { MirrorNode } from '@domain/context/network/MirrorNode';
 import { JsonRpcRelay } from '@domain/context/network/JsonRpcRelay';
@@ -444,6 +445,7 @@ describe('🧪 Bond test', () => {
         rate: rate,
         recordTimestamp: recordTimestamp.toString(),
         executionTimestamp: executionTimestamp.toString(),
+        period: TIME_PERIODS_S.DAY.toString(),
       }),
     );
 
diff --git a/packages/ats/sdk/__tests__/port/in/Security.test.ts b/packages/ats/sdk/__tests__/port/in/Security.test.ts
index be80395c1..f8804fb47 100644
--- a/packages/ats/sdk/__tests__/port/in/Security.test.ts
+++ b/packages/ats/sdk/__tests__/port/in/Security.test.ts
@@ -1037,7 +1037,7 @@ describe('🧪 Security tests', () => {
             securityId: equity.evmDiamondAddress!,
             partitionId: _PARTITION_ID_1,
             amount: heldAmount,
-            escrow: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
+            escrowId: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
             targetId: CLIENT_ACCOUNT_ECDSA.evmAddress!.toString(),
             expirationDate: expirationTimeStamp,
           }),
@@ -1368,7 +1368,7 @@ describe('🧪 Security tests', () => {
             deadline: '9999999999',
             nonce: 3,
             signature: 'vvvv',
-            escrow: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
+            escrowId: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
           }),
         )
       ).payload,
@@ -1489,7 +1489,7 @@ describe('🧪 Security tests', () => {
               securityId: equity.evmDiamondAddress!,
               partitionId: _PARTITION_ID_1,
               amount: clearedAmount,
-              escrow: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
+              escrowId: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
               targetId: CLIENT_ACCOUNT_ECDSA.evmAddress!.toString(),
               clearingExpirationDate: expirationTimeStamp,
               holdExpirationDate: expirationTimeStamp,
@@ -1532,7 +1532,7 @@ describe('🧪 Security tests', () => {
       expect(clearing.expirationDate).toEqual(date);
       expect(clearing.data).toEqual('0x');
       expect(clearing.operatorData).toEqual('0x');
-      expect(clearing.holdEscrow).toEqual(
+      expect(clearing.holdEscrowId).toEqual(
         CLIENT_ACCOUNT_ECDSA_A.id!.toString(),
       );
       expect(clearing.holdExpirationDate).toEqual(date);
@@ -2123,7 +2123,7 @@ describe('🧪 Security tests', () => {
               partitionId: _PARTITION_ID_1,
               amount: clearedAmount,
               sourceId: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
-              escrow: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
+              escrowId: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
               targetId: CLIENT_ACCOUNT_ECDSA.evmAddress!.toString(),
               clearingExpirationDate: expirationTimeStamp,
               holdExpirationDate: expirationTimeStamp,
@@ -2289,7 +2289,7 @@ describe('🧪 Security tests', () => {
               deadline: '9999999999',
               nonce: 3,
               signature: 'vvvv',
-              escrow: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
+              escrowId: CLIENT_ACCOUNT_ECDSA_A.evmAddress!.toString(),
             }),
           )
         ).payload,
diff --git a/packages/ats/sdk/package.json b/packages/ats/sdk/package.json
index 8377e42f3..c9bf30636 100644
--- a/packages/ats/sdk/package.json
+++ b/packages/ats/sdk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hashgraph/asset-tokenization-sdk",
   "description": "Asset Tokenization SDK for Hedera",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "main": "./build/cjs/src/index.js",
   "module": "./build/esm/src/index.js",
   "types": "./build/esm/src/index.d.ts",
@@ -76,5 +76,9 @@
   "overrides": {
     "ws": "7.5.10",
     "elliptic": "6.6.1"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   }
 }
diff --git a/packages/ats/sdk/src/app/service/log/LogService.unit.test.ts b/packages/ats/sdk/src/app/service/log/LogService.unit.test.ts
index 30155f0a7..15701c222 100644
--- a/packages/ats/sdk/src/app/service/log/LogService.unit.test.ts
+++ b/packages/ats/sdk/src/app/service/log/LogService.unit.test.ts
@@ -270,7 +270,7 @@ describe('LogService', () => {
         super(code, message);
       }
 
-      toString() {
+      toString(): string {
         return `BaseError: ${this.message}`;
       }
     }
diff --git a/packages/ats/sdk/src/app/service/transaction/TransactionService.ts b/packages/ats/sdk/src/app/service/transaction/TransactionService.ts
index 10be9b580..f0eae5722 100644
--- a/packages/ats/sdk/src/app/service/transaction/TransactionService.ts
+++ b/packages/ats/sdk/src/app/service/transaction/TransactionService.ts
@@ -311,9 +311,12 @@ export default class TransactionService extends Service {
     }
 
     if (
-      ['CreateEquityCommandHandler', 'CreateBondCommandHandler'].some(
-        (handler) => className.includes(handler),
-      )
+      [
+        'CreateEquityCommandHandler',
+        'CreateBondCommandHandler',
+        'CreateTrexSuiteBondCommandHandler',
+        'CreateTrexSuiteEquityCommandHandler',
+      ].some((handler) => className.includes(handler))
     ) {
       const data = results.map((result) =>
         result.substring(BYTES_32_LENGTH - ADDRESS_LENGTH + 2),
diff --git a/packages/ats/sdk/src/app/service/validation/ValidationService.ts b/packages/ats/sdk/src/app/service/validation/ValidationService.ts
index 7350885cb..290280e72 100644
--- a/packages/ats/sdk/src/app/service/validation/ValidationService.ts
+++ b/packages/ats/sdk/src/app/service/validation/ValidationService.ts
@@ -266,6 +266,8 @@ import { GetBondDetailsQuery } from '@query/bond/get/getBondDetails/GetBondDetai
 import { OperationNotAllowed } from '@domain/context/security/error/operations/OperationNotAllowed';
 import { IsInternalKycActivatedQuery } from '@query/security/kyc/isInternalKycActivated/IsInternalKycActivatedQuery';
 import { IsExternallyGrantedQuery } from '@query/security/externalKycLists/isExternallyGranted/IsExternallyGrantedQuery';
+import { GetTokenBySaltQuery } from '@query/factory/trex/getTokenBySalt/GetTokenBySaltQuery';
+import { InvalidTrexTokenSalt } from '@domain/context/factory/error/InvalidTrexTokenSalt';
 
 @singleton()
 export default class ValidationService extends Service {
@@ -438,13 +440,8 @@ export default class ValidationService extends Service {
       ),
     );
 
-    if (res.payload != '0x01') {
-      throw ContractsErrorMapper.mapError(
-        res.payload,
-        operatorId,
-        sourceId,
-        targetId,
-      );
+    if (res.payload[0] != '0x01') {
+      throw ContractsErrorMapper.mapError(res.payload[0], res.payload[1]);
     }
   }
 
@@ -453,20 +450,14 @@ export default class ValidationService extends Service {
     sourceId: string,
     amount: string,
     partitionId: string,
-    operatorId: string,
   ): Promise<void> {
     this.queryBus = Injectable.resolve<QueryBus>(QueryBus);
     const res = await this.queryBus.execute(
       new CanRedeemByPartitionQuery(securityId, sourceId, partitionId, amount),
     );
 
-    if (res.payload != '0x01') {
-      throw ContractsErrorMapper.mapError(
-        res.payload,
-        operatorId,
-        sourceId,
-        undefined,
-      );
+    if (res.payload[0] != '0x01') {
+      throw ContractsErrorMapper.mapError(res.payload[0], res.payload[1]);
     }
   }
 
@@ -694,6 +685,17 @@ export default class ValidationService extends Service {
     }
   }
 
+  async checkTrexTokenSaltExists(factory: string, salt: string): Promise<void> {
+    this.queryBus = Injectable.resolve<QueryBus>(QueryBus);
+    const exists = (
+      await this.queryBus.execute(new GetTokenBySaltQuery(factory, salt))
+    ).token;
+
+    if (!exists) {
+      throw new InvalidTrexTokenSalt(salt);
+    }
+  }
+
   private async checkUserInControlList(
     controListType: SecurityControlListType,
     controlListMembers: string[],
diff --git a/packages/ats/sdk/src/app/service/validation/ValidationService.unit.test.ts b/packages/ats/sdk/src/app/service/validation/ValidationService.unit.test.ts
index 1f73acf61..a45e10e52 100644
--- a/packages/ats/sdk/src/app/service/validation/ValidationService.unit.test.ts
+++ b/packages/ats/sdk/src/app/service/validation/ValidationService.unit.test.ts
@@ -656,7 +656,7 @@ describe('ValidationService', () => {
 
   describe('checkCanTransfer', () => {
     it('should work when transfer is possible', async () => {
-      queryBusMock.execute.mockResolvedValueOnce({ payload: '0x01' });
+      queryBusMock.execute.mockResolvedValueOnce({ payload: ['0x01', 'test'] });
 
       await expect(
         service.checkCanTransfer(
@@ -702,7 +702,7 @@ describe('ValidationService', () => {
 
   describe('checkCanRedeem', () => {
     it('should work when redeem', async () => {
-      queryBusMock.execute.mockResolvedValueOnce({ payload: '0x01' });
+      queryBusMock.execute.mockResolvedValueOnce({ payload: ['0x01', 'test'] });
 
       await expect(
         service.checkCanRedeem(
@@ -710,7 +710,6 @@ describe('ValidationService', () => {
           sourceId.value,
           amount.value.toString(),
           partitionId.value,
-          operatorId.value,
         ),
       ).resolves.toBeUndefined();
 
@@ -737,7 +736,6 @@ describe('ValidationService', () => {
           sourceId.value,
           partitionId.value,
           amount.value.toString(),
-          operatorId.value,
         ),
       ).rejects.toThrow('Transfer failed');
     });
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommand.ts b/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommand.ts
index c8da552a4..cee0eb249 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommand.ts
@@ -219,6 +219,7 @@ export class SetCouponCommand extends Command<SetCouponCommandResponse> {
     public readonly recordDate: string,
     public readonly executionDate: string,
     public readonly rate: string,
+    public readonly period: string,
   ) {
     super();
   }
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommandHandler.ts
index b8a6ff16f..9bc7bc7b3 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommandHandler.ts
@@ -225,7 +225,7 @@ export class SetCouponCommandHandler
 
   async execute(command: SetCouponCommand): Promise<SetCouponCommandResponse> {
     try {
-      const { address, recordDate, executionDate, rate } = command;
+      const { address, recordDate, executionDate, rate, period } = command;
       const handler = this.transactionService.getHandler();
 
       const securityEvmAddress =
@@ -236,6 +236,7 @@ export class SetCouponCommandHandler
         BigDecimal.fromString(recordDate),
         BigDecimal.fromString(executionDate),
         BigDecimal.fromString(rate),
+        BigDecimal.fromString(period),
         address,
       );
 
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommandHandler.unit.test.ts
index 98fca7427..7158e8858 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/SetCouponCommandHandler.unit.test.ts
@@ -314,6 +314,7 @@ describe('SetCouponCommandHandler', () => {
       BigDecimal.fromString(command.recordDate),
       BigDecimal.fromString(command.executionDate),
       BigDecimal.fromString(command.rate),
+      BigDecimal.fromString(command.period),
       command.address,
     );
     expect(transactionServiceMock.getTransactionResult).toHaveBeenCalledWith(
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/error/SetCouponCommandError.ts b/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/error/SetCouponCommandError.ts
index 0a92fff6b..a5b0986a2 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/error/SetCouponCommandError.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/coupon/set/error/SetCouponCommandError.ts
@@ -204,11 +204,20 @@
 */
 
 import { CommandError } from '@command/error/CommandError';
-import BaseError from '@core/error/BaseError';
+import BaseError, { ErrorCode } from '@core/error/BaseError';
 
 export class SetCouponCommandError extends CommandError {
   constructor(error: Error) {
+    const errorCode = SetCouponCommandError.mapErrorToCode(error);
     const msg = `An error occurred while setting the coupon: ${error.message}`;
-    super(msg, error instanceof BaseError ? error.errorCode : undefined);
+    super(msg, errorCode);
+  }
+
+  private static mapErrorToCode(error: Error): ErrorCode | undefined {
+    if (error instanceof BaseError) {
+      return error.errorCode;
+    }
+
+    return undefined;
   }
 }
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/create/CreateBondCommand.ts b/packages/ats/sdk/src/app/usecase/command/bond/create/CreateBondCommand.ts
index 01226d830..25bf90417 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/create/CreateBondCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/create/CreateBondCommand.ts
@@ -233,11 +233,11 @@ export class CreateBondCommand extends Command<CreateBondCommandResponse> {
     public readonly configId?: string,
     public readonly configVersion?: number,
     public readonly diamondOwnerAccount?: string,
-    public readonly externalPauses?: string[],
-    public readonly externalControlLists?: string[],
-    public readonly externalKycLists?: string[],
-    public readonly compliance?: string,
-    public readonly identityRegistry?: string,
+    public readonly externalPausesIds?: string[],
+    public readonly externalControlListsIds?: string[],
+    public readonly externalKycListsIds?: string[],
+    public readonly complianceId?: string,
+    public readonly identityRegistryId?: string,
   ) {
     super();
   }
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/create/CreateBondCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/bond/create/CreateBondCommandHandler.ts
index 739398a2a..59c06be69 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/create/CreateBondCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/create/CreateBondCommandHandler.ts
@@ -261,11 +261,11 @@ export class CreateBondCommandHandler
         configId,
         configVersion,
         diamondOwnerAccount,
-        externalPauses,
-        externalControlLists,
-        externalKycLists,
-        compliance,
-        identityRegistry,
+        externalPausesIds,
+        externalControlListsIds,
+        externalKycListsIds,
+        complianceId,
+        identityRegistryId,
       } = command;
 
       //TODO: Boy scout: remove request validations and adjust test
@@ -305,17 +305,19 @@ export class CreateBondCommandHandler
         externalControlListsEvmAddresses,
         externalKycListsEvmAddresses,
       ] = await Promise.all([
-        this.contractService.getEvmAddressesFromHederaIds(externalPauses),
-        this.contractService.getEvmAddressesFromHederaIds(externalControlLists),
-        this.contractService.getEvmAddressesFromHederaIds(externalKycLists),
+        this.contractService.getEvmAddressesFromHederaIds(externalPausesIds),
+        this.contractService.getEvmAddressesFromHederaIds(
+          externalControlListsIds,
+        ),
+        this.contractService.getEvmAddressesFromHederaIds(externalKycListsIds),
       ]);
 
-      const complianceEvmAddress = compliance
-        ? await this.contractService.getContractEvmAddress(compliance)
+      const complianceEvmAddress = complianceId
+        ? await this.contractService.getContractEvmAddress(complianceId)
         : new EvmAddress(EVM_ZERO_ADDRESS);
 
-      const identityRegistryAddress = identityRegistry
-        ? await this.contractService.getContractEvmAddress(identityRegistry)
+      const identityRegistryAddress = identityRegistryId
+        ? await this.contractService.getContractEvmAddress(identityRegistryId)
         : new EvmAddress(EVM_ZERO_ADDRESS);
 
       const handler = this.transactionService.getHandler();
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/create/error/CreateBondCommandError.ts b/packages/ats/sdk/src/app/usecase/command/bond/create/error/CreateBondCommandError.ts
index f7b158d42..fb26aabef 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/create/error/CreateBondCommandError.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/create/error/CreateBondCommandError.ts
@@ -204,11 +204,20 @@
 */
 
 import { CommandError } from '@command/error/CommandError';
-import BaseError from '@core/error/BaseError';
+import BaseError, { ErrorCode } from '@core/error/BaseError';
 
 export class CreateBondCommandError extends CommandError {
   constructor(error: Error) {
+    const errorCode = CreateBondCommandError.mapErrorToCode(error);
     const msg = `An error occurred while creating the bond: ${error.message}`;
-    super(msg, error instanceof BaseError ? error.errorCode : undefined);
+    super(msg, errorCode);
+  }
+
+  private static mapErrorToCode(error: Error): ErrorCode | undefined {
+    if (error instanceof BaseError) {
+      return error.errorCode;
+    }
+
+    return undefined;
   }
 }
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommand.ts b/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommand.ts
new file mode 100644
index 000000000..477f74f00
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommand.ts
@@ -0,0 +1,259 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { Command } from '@core/command/Command';
+import { CommandResponse } from '@core/command/CommandResponse';
+import ContractId from '@domain/context/contract/ContractId';
+import { SecurityProps } from '@domain/context/security/Security';
+
+export class CreateTrexSuiteBondCommandResponse implements CommandResponse {
+  public readonly securityId: ContractId;
+  public readonly transactionId: string;
+
+  constructor(securityId: ContractId, transactionId: string) {
+    this.securityId = securityId;
+    this.transactionId = transactionId;
+  }
+}
+
+export class CreateTrexSuiteBondCommand extends Command<CreateTrexSuiteBondCommandResponse> {
+  constructor(
+    public readonly salt: string,
+    public readonly owner: string,
+    public readonly irs: string,
+    public readonly onchainId: string,
+    public readonly irAgents: string[],
+    public readonly tokenAgents: string[],
+    public readonly compliancesModules: string[],
+    public readonly complianceSettings: string[],
+    public readonly claimTopics: number[],
+    public readonly issuers: string[],
+    public readonly issuerClaims: number[][],
+
+    public readonly security: SecurityProps,
+    public readonly currency: string,
+    public readonly nominalValue: string,
+    public readonly startingDate: string,
+    public readonly maturityDate: string,
+    public readonly couponFrequency: string,
+    public readonly couponRate: string,
+    public readonly firstCouponDate: string,
+
+    public readonly factory: ContractId,
+    public readonly resolver: ContractId,
+    public readonly configId: string,
+    public readonly configVersion: number,
+    public readonly diamondOwnerAccount: string,
+
+    public readonly externalPauses?: string[],
+    public readonly externalControlLists?: string[],
+    public readonly externalKycLists?: string[],
+
+    public readonly compliance?: string,
+    public readonly identityRegistry?: string,
+  ) {
+    super();
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommandHandler.ts
new file mode 100644
index 000000000..23cd29398
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommandHandler.ts
@@ -0,0 +1,423 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { InvalidRequest } from '@command/error/InvalidRequest';
+import { ICommandHandler } from '@core/command/CommandHandler';
+import { CommandHandler } from '@core/decorator/CommandHandlerDecorator';
+import { lazyInject } from '@core/decorator/LazyInjectDecorator';
+import ContractId from '@domain/context/contract/ContractId';
+import { Security } from '@domain/context/security/Security';
+import AccountService from '@service/account/AccountService';
+import TransactionService from '@service/transaction/TransactionService';
+import { MirrorNodeAdapter } from '@port/out/mirror/MirrorNodeAdapter';
+import EvmAddress from '@domain/context/contract/EvmAddress';
+import { BondDetails } from '@domain/context/bond/BondDetails';
+import { CouponDetails } from '@domain/context/bond/CouponDetails';
+import BigDecimal from '@domain/context/shared/BigDecimal';
+import ContractService from '@service/contract/ContractService';
+
+import { Response } from '@domain/context/transaction/Response';
+import { MissingRegulationType } from '@domain/context/factory/error/MissingRegulationType';
+import { MissingRegulationSubType } from '@domain/context/factory/error/MissingRegulationSubType';
+import { EVM_ZERO_ADDRESS } from '@core/Constants';
+import {
+  CreateTrexSuiteBondCommand,
+  CreateTrexSuiteBondCommandResponse,
+} from './CreateTrexSuiteBondCommand';
+import { CreateTrexSuiteBondCommandError } from './error/CreateTrexSuiteBondError';
+import {
+  TrexClaimDetails,
+  TrexTokenDetailsAts,
+} from '@domain/context/factory/TRexFactory';
+import ValidationService from '@service/validation/ValidationService';
+
+@CommandHandler(CreateTrexSuiteBondCommand)
+export class CreateTrexSuiteBondCommandHandler
+  implements ICommandHandler<CreateTrexSuiteBondCommand>
+{
+  constructor(
+    @lazyInject(AccountService)
+    private readonly accountService: AccountService,
+    @lazyInject(TransactionService)
+    private readonly transactionService: TransactionService,
+    @lazyInject(MirrorNodeAdapter)
+    private readonly mirrorNodeAdapter: MirrorNodeAdapter,
+    @lazyInject(ContractService)
+    private readonly contractService: ContractService,
+    @lazyInject(ValidationService)
+    private readonly validationService: ValidationService,
+  ) {}
+
+  async execute(
+    command: CreateTrexSuiteBondCommand,
+  ): Promise<CreateTrexSuiteBondCommandResponse> {
+    let res: Response;
+    try {
+      const {
+        salt,
+        owner,
+        irs,
+        onchainId,
+        irAgents,
+        tokenAgents,
+        compliancesModules,
+        complianceSettings,
+        claimTopics,
+        issuers,
+        issuerClaims,
+
+        security,
+        currency,
+        nominalValue,
+        startingDate,
+        maturityDate,
+        couponFrequency,
+        couponRate,
+        firstCouponDate,
+
+        factory,
+        resolver,
+        configId,
+        configVersion,
+        diamondOwnerAccount,
+
+        externalPauses,
+        externalControlLists,
+        externalKycLists,
+
+        compliance,
+        identityRegistry,
+      } = command;
+
+      if (!security.regulationType) {
+        throw new MissingRegulationType();
+      }
+      if (!security.regulationsubType) {
+        throw new MissingRegulationSubType();
+      }
+
+      if (!salt || salt.length === 0) {
+        throw new InvalidRequest('Salt not found in request');
+      }
+
+      this.validationService.checkTrexTokenSaltExists(factory.toString(), salt);
+
+      const trexTokenDetails = new TrexTokenDetailsAts({
+        owner,
+        irs,
+        onchainId,
+        irAgents,
+        tokenAgents,
+        compliancesModules,
+        complianceSettings,
+      });
+      const claimDetails = new TrexClaimDetails({
+        claimTopics,
+        issuers,
+        issuerClaims,
+      });
+
+      const factoryEvmAddress: EvmAddress =
+        await this.contractService.getContractEvmAddress(factory.toString());
+
+      const [
+        externalPausesEvmAddresses,
+        externalControlListsEvmAddresses,
+        externalKycListsEvmAddresses,
+      ] = await Promise.all([
+        this.contractService.getEvmAddressesFromHederaIds(externalPauses),
+        this.contractService.getEvmAddressesFromHederaIds(externalControlLists),
+        this.contractService.getEvmAddressesFromHederaIds(externalKycLists),
+      ]);
+      const diamondOwnerAccountEvmAddress: EvmAddress =
+        await this.accountService.getAccountEvmAddress(diamondOwnerAccount!);
+      const resolverEvmAddress: EvmAddress =
+        await this.contractService.getContractEvmAddress(resolver.toString());
+
+      const complianceEvmAddress = compliance
+        ? await this.contractService.getContractEvmAddress(compliance)
+        : new EvmAddress(EVM_ZERO_ADDRESS);
+
+      const identityRegistryAddress = identityRegistry
+        ? await this.contractService.getContractEvmAddress(identityRegistry)
+        : new EvmAddress(EVM_ZERO_ADDRESS);
+
+      const handler = this.transactionService.getHandler();
+
+      const bondInfo = new BondDetails(
+        currency,
+        BigDecimal.fromString(nominalValue),
+        parseInt(startingDate),
+        parseInt(maturityDate),
+      );
+
+      const couponInfo = new CouponDetails(
+        parseInt(couponFrequency),
+        BigDecimal.fromString(couponRate),
+        parseInt(firstCouponDate),
+      );
+
+      res = await handler.createTrexSuiteBond(
+        salt,
+        trexTokenDetails.owner,
+        trexTokenDetails.irs,
+        trexTokenDetails.onchainId,
+        trexTokenDetails.irAgents,
+        trexTokenDetails.tokenAgents,
+        trexTokenDetails.compliancesModules,
+        trexTokenDetails.complianceSettings,
+        claimDetails.claimTopics,
+        claimDetails.issuers,
+        claimDetails.issuerClaims,
+
+        new Security(security),
+        bondInfo,
+        couponInfo,
+        factoryEvmAddress,
+        resolverEvmAddress,
+        configId,
+        configVersion,
+        complianceEvmAddress,
+        identityRegistryAddress,
+        diamondOwnerAccountEvmAddress,
+        externalPausesEvmAddresses,
+        externalControlListsEvmAddresses,
+        externalKycListsEvmAddresses,
+        factory.toString(),
+      );
+
+      const contractAddress =
+        await this.transactionService.getTransactionResult({
+          res,
+          result: res.response?._token,
+          className: CreateTrexSuiteBondCommandHandler.name,
+          position: 0,
+          numberOfResultsItems: 1,
+        });
+
+      const contractId =
+        await this.mirrorNodeAdapter.getHederaIdfromContractAddress(
+          contractAddress,
+        );
+
+      return Promise.resolve(
+        new CreateTrexSuiteBondCommandResponse(
+          new ContractId(contractId),
+          res.id!,
+        ),
+      );
+    } catch (error) {
+      if (res?.response == 1) {
+        return Promise.resolve(
+          new CreateTrexSuiteBondCommandResponse(
+            new ContractId('0.0.0'),
+            res.id!,
+          ),
+        );
+      }
+      throw new CreateTrexSuiteBondCommandError(error as Error);
+    }
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommandHandler.unit.test.ts
new file mode 100644
index 000000000..f4319bf45
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/CreateTrexSuiteBondCommandHandler.unit.test.ts
@@ -0,0 +1,421 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import TransactionService from '@service/transaction/TransactionService';
+import { CreateTrexSuiteBondCommandHandler } from './CreateTrexSuiteBondCommandHandler';
+import { MirrorNodeAdapter } from '@port/out/mirror/MirrorNodeAdapter';
+import { createMock } from '@golevelup/ts-jest';
+import AccountService from '@service/account/AccountService';
+import { CreateTrexSuiteBondCommandFixture } from '@test/fixtures/bond/BondFixture';
+import {
+  CreateTrexSuiteBondCommand,
+  CreateTrexSuiteBondCommandResponse,
+} from './CreateTrexSuiteBondCommand';
+import BigDecimal from '@domain/context/shared/BigDecimal';
+import {
+  ErrorMsgFixture,
+  EvmAddressPropsFixture,
+  HederaIdPropsFixture,
+  HederaIdZeroAddressFixture,
+  TransactionIdFixture,
+} from '@test/fixtures/shared/DataFixture';
+import ContractService from '@service/contract/ContractService';
+import EvmAddress from '@domain/context/contract/EvmAddress';
+import { ErrorCode } from '@core/error/BaseError';
+import { CreateTrexSuiteBondCommandError } from './error/CreateTrexSuiteBondError';
+import ValidationService from '@service/validation/ValidationService';
+
+describe('CreateTrexSuiteBondCommandHandler', () => {
+  let handler: CreateTrexSuiteBondCommandHandler;
+  let command: CreateTrexSuiteBondCommand;
+
+  const transactionServiceMock = createMock<TransactionService>();
+  const mirrorNodeAdapterMock = createMock<MirrorNodeAdapter>();
+  const accountServiceMock = createMock<AccountService>();
+  const contractServiceMock = createMock<ContractService>();
+  const validationServiceMock = createMock<ValidationService>();
+
+  const evmAddress = new EvmAddress(EvmAddressPropsFixture.create().value);
+  const externalPauseEvmAddress = new EvmAddress(
+    EvmAddressPropsFixture.create().value,
+  );
+  const externalControlEvmAddress = new EvmAddress(
+    EvmAddressPropsFixture.create().value,
+  );
+  const externalKycEvmAddress = new EvmAddress(
+    EvmAddressPropsFixture.create().value,
+  );
+  const transactionId = TransactionIdFixture.create().id;
+  const hederaId = HederaIdPropsFixture.create();
+  const hederaIdZeroAddress = HederaIdZeroAddressFixture.create().address;
+  const errorMsg = ErrorMsgFixture.create().msg;
+
+  beforeEach(() => {
+    handler = new CreateTrexSuiteBondCommandHandler(
+      accountServiceMock,
+      transactionServiceMock,
+      mirrorNodeAdapterMock,
+      contractServiceMock,
+      validationServiceMock,
+    );
+    command = CreateTrexSuiteBondCommandFixture.create();
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('execute', () => {
+    describe('error cases', () => {
+      it('throws CreateTrexSuiteBondCommandError when command fails with uncaught error', async () => {
+        const fakeError = new Error(errorMsg);
+
+        accountServiceMock.getAccountEvmAddress.mockRejectedValue(fakeError);
+
+        const resultPromise = handler.execute(command);
+
+        await expect(resultPromise).rejects.toBeInstanceOf(
+          CreateTrexSuiteBondCommandError,
+        );
+
+        await expect(resultPromise).rejects.toMatchObject({
+          message: expect.stringContaining(
+            `An error occurred while creating the trex suite bond: ${errorMsg}`,
+          ),
+          errorCode: ErrorCode.UncaughtCommandError,
+        });
+      });
+    });
+
+    describe('success cases', () => {
+      it('should successfully create a bond with bondAddress in response', async () => {
+        contractServiceMock.getContractEvmAddress
+          .mockResolvedValueOnce(evmAddress)
+          .mockResolvedValueOnce(evmAddress)
+          .mockResolvedValueOnce(evmAddress)
+          .mockResolvedValueOnce(evmAddress);
+        contractServiceMock.getEvmAddressesFromHederaIds
+          .mockResolvedValueOnce([externalPauseEvmAddress])
+          .mockResolvedValueOnce([externalControlEvmAddress])
+          .mockResolvedValueOnce([externalKycEvmAddress]);
+        accountServiceMock.getAccountEvmAddress.mockResolvedValue(evmAddress);
+
+        transactionServiceMock
+          .getHandler()
+          .createTrexSuiteBond.mockResolvedValue({
+            id: transactionId,
+            response: { _token: evmAddress.value },
+          });
+
+        validationServiceMock.checkTrexTokenSaltExists.mockResolvedValue();
+        mirrorNodeAdapterMock.getHederaIdfromContractAddress.mockResolvedValue(
+          transactionId,
+        );
+
+        transactionServiceMock.getTransactionResult.mockResolvedValue(
+          evmAddress.value,
+        );
+
+        const result = await handler.execute(command);
+
+        expect(result).toBeInstanceOf(CreateTrexSuiteBondCommandResponse);
+        expect(result.securityId.value).toBe(transactionId);
+        expect(result.transactionId).toBe(transactionId);
+        expect(contractServiceMock.getContractEvmAddress).toHaveBeenCalledTimes(
+          4,
+        );
+        expect(
+          contractServiceMock.getEvmAddressesFromHederaIds,
+        ).toHaveBeenCalledTimes(3);
+        expect(accountServiceMock.getAccountEvmAddress).toHaveBeenCalledTimes(
+          1,
+        );
+        expect(
+          transactionServiceMock.getHandler().createTrexSuiteBond,
+        ).toHaveBeenCalledTimes(1);
+        expect(
+          transactionServiceMock.getTransactionResult,
+        ).toHaveBeenCalledTimes(1);
+        expect(
+          mirrorNodeAdapterMock.getHederaIdfromContractAddress,
+        ).toHaveBeenCalledTimes(1);
+        expect(
+          transactionServiceMock.getHandler().createTrexSuiteBond,
+        ).toHaveBeenCalledWith(
+          command.salt,
+          command.owner,
+          command.irs,
+          command.onchainId,
+          command.irAgents,
+          command.tokenAgents,
+          command.compliancesModules,
+          command.complianceSettings,
+          command.claimTopics,
+          command.issuers,
+          command.issuerClaims,
+          expect.objectContaining(command.security),
+          expect.objectContaining({
+            currency: command.currency,
+            nominalValue: BigDecimal.fromString(command.nominalValue),
+            startingDate: parseInt(command.startingDate),
+            maturityDate: parseInt(command.maturityDate),
+          }),
+          {
+            couponFrequency: parseInt(command.couponFrequency),
+            couponRate: BigDecimal.fromString(command.couponRate),
+            firstCouponDate: parseInt(command.firstCouponDate),
+          },
+          evmAddress,
+          evmAddress,
+          command.configId,
+          command.configVersion,
+          evmAddress,
+          evmAddress,
+          evmAddress,
+          [externalPauseEvmAddress],
+          [externalControlEvmAddress],
+          [externalKycEvmAddress],
+          command.factory?.toString(),
+        );
+        expect(
+          transactionServiceMock.getTransactionResult,
+        ).toHaveBeenCalledWith(
+          expect.objectContaining({
+            res: {
+              id: transactionId,
+              response: { _token: evmAddress.value },
+            },
+            result: evmAddress.value,
+            className: CreateTrexSuiteBondCommandHandler.name,
+            position: 0,
+            numberOfResultsItems: 1,
+          }),
+        );
+      });
+
+      it('should handle error and return fallback response if response code is 1', async () => {
+        contractServiceMock.getContractEvmAddress.mockResolvedValue(evmAddress);
+
+        mirrorNodeAdapterMock.getContractInfo.mockResolvedValue({
+          id: hederaId.value,
+          evmAddress: evmAddress.value,
+        });
+
+        transactionServiceMock
+          .getHandler()
+          .createTrexSuiteBond.mockResolvedValue({
+            id: transactionId,
+            response: 1,
+          });
+
+        const result = await handler.execute(command);
+
+        expect(result).toBeInstanceOf(CreateTrexSuiteBondCommandResponse);
+        expect(result.securityId.toString()).toBe(hederaIdZeroAddress);
+        expect(result.transactionId.toString()).toBe(transactionId);
+      });
+    });
+  });
+});
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/error/CreateTrexSuiteBondError.ts b/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/error/CreateTrexSuiteBondError.ts
new file mode 100644
index 000000000..5b8715971
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/command/bond/createTrexSuite/error/CreateTrexSuiteBondError.ts
@@ -0,0 +1,214 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { CommandError } from '@command/error/CommandError';
+import BaseError from '@core/error/BaseError';
+
+export class CreateTrexSuiteBondCommandError extends CommandError {
+  constructor(error: Error) {
+    const msg = `An error occurred while creating the trex suite bond: ${error.message}`;
+    super(msg, error instanceof BaseError ? error.errorCode : undefined);
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommandHandler.ts
index 83e98d9d2..9fe81a8b5 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommandHandler.ts
@@ -209,7 +209,6 @@ export class RedeemAtMaturityByPartitionCommandHandler
     try {
       const { securityId, partitionId, amount, sourceId } = command;
       const handler = this.transactionService.getHandler();
-      const account = this.accountService.getCurrentAccount();
       const security = await this.securityService.get(securityId);
 
       const securityEvmAddress: EvmAddress =
@@ -224,7 +223,6 @@ export class RedeemAtMaturityByPartitionCommandHandler
         sourceId,
         amount,
         partitionId,
-        account.id.toString(),
       );
 
       await this.validationService.checkDecimals(security, amount);
diff --git a/packages/ats/sdk/src/app/usecase/command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommandHandler.unit.test.ts
index 3304d201f..1b7f2403a 100644
--- a/packages/ats/sdk/src/app/usecase/command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommandHandler.unit.test.ts
@@ -223,8 +223,6 @@ import {
 import EvmAddress from '@domain/context/contract/EvmAddress';
 import { SecurityPropsFixture } from '@test/fixtures/shared/SecurityFixture';
 import { Security } from '@domain/context/security/Security';
-import { AccountPropsFixture } from '@test/fixtures/account/AccountFixture';
-import Account from '@domain/context/account/Account';
 import { RedeemAtMaturityByPartitionCommandFixture } from '@test/fixtures/bond/BondFixture';
 import { RedeemAtMaturityByPartitionCommandError } from './error/RedeemAtMaturityByPartitionCommandError';
 import { ErrorCode } from '@core/error/BaseError';
@@ -244,7 +242,6 @@ describe('RedeemAtMaturityByPartitionCommandHandler', () => {
   const transactionId = TransactionIdFixture.create().id;
   const errorMsg = ErrorMsgFixture.create().msg;
   const security = new Security(SecurityPropsFixture.create());
-  const account = new Account(AccountPropsFixture.create());
 
   beforeEach(() => {
     handler = new RedeemAtMaturityByPartitionCommandHandler(
@@ -286,7 +283,6 @@ describe('RedeemAtMaturityByPartitionCommandHandler', () => {
       it('should successfully redeem at maturity by partition', async () => {
         contractServiceMock.getContractEvmAddress.mockResolvedValue(evmAddress);
         accountServiceMock.getAccountEvmAddress.mockResolvedValue(evmAddress);
-        accountServiceMock.getCurrentAccount.mockReturnValue(account);
         securityServiceMock.get.mockResolvedValue(security);
 
         transactionServiceMock
@@ -327,7 +323,6 @@ describe('RedeemAtMaturityByPartitionCommandHandler', () => {
           command.sourceId,
           command.amount,
           command.partitionId,
-          account.id.toString(),
         );
 
         expect(
diff --git a/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommand.ts b/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommand.ts
index a80b237e1..131d25e5d 100644
--- a/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommand.ts
@@ -237,11 +237,11 @@ export class CreateEquityCommand extends Command<CreateEquityCommandResponse> {
     public readonly configId?: string,
     public readonly configVersion?: number,
     public readonly diamondOwnerAccount?: string,
-    public readonly externalPauses?: string[],
-    public readonly externalControlLists?: string[],
-    public readonly externalKycLists?: string[],
-    public readonly compliance?: string,
-    public readonly identityRegistry?: string,
+    public readonly externalPausesIds?: string[],
+    public readonly externalControlListsIds?: string[],
+    public readonly externalKycListsIds?: string[],
+    public readonly complianceId?: string,
+    public readonly identityRegistryId?: string,
   ) {
     super();
   }
diff --git a/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommandHandler.ts
index c0954ba42..aeecadcca 100644
--- a/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommandHandler.ts
@@ -214,7 +214,6 @@ import { lazyInject } from '@core/decorator/LazyInjectDecorator';
 import ContractId from '@domain/context/contract/ContractId';
 import { Security } from '@domain/context/security/Security';
 import TransactionService from '@service/transaction/TransactionService';
-import NetworkService from '@service/network/NetworkService';
 import { MirrorNodeAdapter } from '@port/out/mirror/MirrorNodeAdapter';
 import EvmAddress from '@domain/context/contract/EvmAddress';
 import { EquityDetails } from '@domain/context/equity/EquityDetails';
@@ -234,8 +233,6 @@ export class CreateEquityCommandHandler
   constructor(
     @lazyInject(TransactionService)
     private readonly transactionService: TransactionService,
-    @lazyInject(NetworkService)
-    private readonly networkService: NetworkService,
     @lazyInject(MirrorNodeAdapter)
     private readonly mirrorNodeAdapter: MirrorNodeAdapter,
     @lazyInject(ContractService)
@@ -266,11 +263,11 @@ export class CreateEquityCommandHandler
         dividendRight,
         currency,
         nominalValue,
-        externalPauses,
-        externalControlLists,
-        externalKycLists,
-        compliance,
-        identityRegistry,
+        externalPausesIds,
+        externalControlListsIds,
+        externalKycListsIds,
+        complianceId,
+        identityRegistryId,
       } = command;
 
       if (!factory) {
@@ -309,17 +306,19 @@ export class CreateEquityCommandHandler
         externalControlListsEvmAddresses,
         externalKycListsEvmAddresses,
       ] = await Promise.all([
-        this.contractService.getEvmAddressesFromHederaIds(externalPauses),
-        this.contractService.getEvmAddressesFromHederaIds(externalControlLists),
-        this.contractService.getEvmAddressesFromHederaIds(externalKycLists),
+        this.contractService.getEvmAddressesFromHederaIds(externalPausesIds),
+        this.contractService.getEvmAddressesFromHederaIds(
+          externalControlListsIds,
+        ),
+        this.contractService.getEvmAddressesFromHederaIds(externalKycListsIds),
       ]);
 
-      const complianceEvmAddress = compliance
-        ? await this.contractService.getContractEvmAddress(compliance)
+      const complianceEvmAddress = complianceId
+        ? await this.contractService.getContractEvmAddress(complianceId)
         : new EvmAddress(EVM_ZERO_ADDRESS);
 
-      const identityRegistryEvmAddress = identityRegistry
-        ? await this.contractService.getContractEvmAddress(identityRegistry)
+      const identityRegistryEvmAddress = identityRegistryId
+        ? await this.contractService.getContractEvmAddress(identityRegistryId)
         : new EvmAddress(EVM_ZERO_ADDRESS);
 
       const handler = this.transactionService.getHandler();
diff --git a/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommandHandler.unit.test.ts
index 27a09e412..51b7573a3 100644
--- a/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/equity/create/CreateEquityCommandHandler.unit.test.ts
@@ -221,7 +221,6 @@ import {
 } from '@test/fixtures/shared/DataFixture';
 import AccountService from '@service/account/AccountService';
 import BigDecimal from '@domain/context/shared/BigDecimal';
-import NetworkService from '@service/network/NetworkService';
 import { MirrorNodeAdapter } from '@port/out/mirror/MirrorNodeAdapter';
 import { CreateEquityCommandFixture } from '@test/fixtures/equity/EquityFixture';
 import { ErrorCode } from '@core/error/BaseError';
@@ -232,7 +231,6 @@ describe('CreateEquityCommandHandler', () => {
   let command: CreateEquityCommand;
 
   const transactionServiceMock = createMock<TransactionService>();
-  const networkServiceMock = createMock<NetworkService>();
   const mirrorNodeAdapterMock = createMock<MirrorNodeAdapter>();
   const accountServiceMock = createMock<AccountService>();
   const contractServiceMock = createMock<ContractService>();
@@ -255,7 +253,6 @@ describe('CreateEquityCommandHandler', () => {
   beforeEach(() => {
     handler = new CreateEquityCommandHandler(
       transactionServiceMock,
-      networkServiceMock,
       mirrorNodeAdapterMock,
       contractServiceMock,
       accountServiceMock,
diff --git a/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommand.ts b/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommand.ts
new file mode 100644
index 000000000..de120171a
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommand.ts
@@ -0,0 +1,262 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { Command } from '@core/command/Command';
+import { CommandResponse } from '@core/command/CommandResponse';
+import ContractId from '@domain/context/contract/ContractId';
+import { SecurityProps } from '@domain/context/security/Security';
+import { DividendType } from '@domain/context/equity/DividendType';
+
+export class CreateTrexSuiteEquityCommandResponse implements CommandResponse {
+  public readonly securityId: ContractId;
+  public readonly transactionId: string;
+
+  constructor(securityId: ContractId, transactionId: string) {
+    this.securityId = securityId;
+    this.transactionId = transactionId;
+  }
+}
+
+export class CreateTrexSuiteEquityCommand extends Command<CreateTrexSuiteEquityCommandResponse> {
+  constructor(
+    public readonly salt: string,
+    public readonly owner: string,
+    public readonly irs: string,
+    public readonly onchainId: string,
+    public readonly irAgents: string[],
+    public readonly tokenAgents: string[],
+    public readonly compliancesModules: string[],
+    public readonly complianceSettings: string[],
+    public readonly claimTopics: number[],
+    public readonly issuers: string[],
+    public readonly issuerClaims: number[][],
+
+    public readonly security: SecurityProps,
+    public readonly votingRight: boolean,
+    public readonly informationRight: boolean,
+    public readonly liquidationRight: boolean,
+    public readonly subscriptionRight: boolean,
+    public readonly conversionRight: boolean,
+    public readonly redemptionRight: boolean,
+    public readonly putRight: boolean,
+    public readonly dividendRight: DividendType,
+    public readonly currency: string,
+    public readonly nominalValue: string,
+    public readonly factory: ContractId,
+    public readonly resolver: ContractId,
+    public readonly configId: string,
+    public readonly configVersion: number,
+    public readonly diamondOwnerAccount: string,
+
+    public readonly externalPauses?: string[],
+    public readonly externalControlLists?: string[],
+    public readonly externalKycLists?: string[],
+
+    public readonly compliance?: string,
+    public readonly identityRegistry?: string,
+  ) {
+    super();
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommandHandler.ts
new file mode 100644
index 000000000..afe064735
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommandHandler.ts
@@ -0,0 +1,419 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { ICommandHandler } from '@core/command/CommandHandler';
+import { CommandHandler } from '@core/decorator/CommandHandlerDecorator';
+import { lazyInject } from '@core/decorator/LazyInjectDecorator';
+import ContractId from '@domain/context/contract/ContractId';
+import { Security } from '@domain/context/security/Security';
+import AccountService from '@service/account/AccountService';
+import TransactionService from '@service/transaction/TransactionService';
+import { MirrorNodeAdapter } from '@port/out/mirror/MirrorNodeAdapter';
+import EvmAddress from '@domain/context/contract/EvmAddress';
+import BigDecimal from '@domain/context/shared/BigDecimal';
+import ContractService from '@service/contract/ContractService';
+
+import { Response } from '@domain/context/transaction/Response';
+import { MissingRegulationType } from '@domain/context/factory/error/MissingRegulationType';
+import { MissingRegulationSubType } from '@domain/context/factory/error/MissingRegulationSubType';
+import { EVM_ZERO_ADDRESS } from '@core/Constants';
+import {
+  CreateTrexSuiteEquityCommand,
+  CreateTrexSuiteEquityCommandResponse,
+} from './CreateTrexSuiteEquityCommand';
+import { EquityDetails } from '@domain/context/equity/EquityDetails';
+import { CreateTrexSuiteEquityCommandError } from './error/CreateTrexSuiteEquityError';
+import { InvalidRequest } from '@command/error/InvalidRequest';
+import {
+  TrexTokenDetailsAts,
+  TrexClaimDetails,
+} from '@domain/context/factory/TRexFactory';
+import ValidationService from '@service/validation/ValidationService';
+
+@CommandHandler(CreateTrexSuiteEquityCommand)
+export class CreateTrexSuiteEquityCommandHandler
+  implements ICommandHandler<CreateTrexSuiteEquityCommand>
+{
+  constructor(
+    @lazyInject(AccountService)
+    private readonly accountService: AccountService,
+    @lazyInject(TransactionService)
+    private readonly transactionService: TransactionService,
+    @lazyInject(MirrorNodeAdapter)
+    private readonly mirrorNodeAdapter: MirrorNodeAdapter,
+    @lazyInject(ContractService)
+    private readonly contractService: ContractService,
+    @lazyInject(ValidationService)
+    private readonly validationService: ValidationService,
+  ) {}
+
+  async execute(
+    command: CreateTrexSuiteEquityCommand,
+  ): Promise<CreateTrexSuiteEquityCommandResponse> {
+    let res: Response;
+    try {
+      const {
+        salt,
+        owner,
+        irs,
+        onchainId,
+        irAgents,
+        tokenAgents,
+        compliancesModules,
+        complianceSettings,
+        claimTopics,
+        issuers,
+        issuerClaims,
+
+        security,
+        factory,
+        resolver,
+        configId,
+        configVersion,
+        diamondOwnerAccount,
+        votingRight,
+        informationRight,
+        liquidationRight,
+        subscriptionRight,
+        conversionRight,
+        redemptionRight,
+        putRight,
+        dividendRight,
+        currency,
+        nominalValue,
+        externalPauses,
+        externalControlLists,
+        externalKycLists,
+        compliance,
+        identityRegistry,
+      } = command;
+
+      if (!security.regulationType) {
+        throw new MissingRegulationType();
+      }
+      if (!security.regulationsubType) {
+        throw new MissingRegulationSubType();
+      }
+
+      if (!salt || salt.length === 0) {
+        throw new InvalidRequest('Salt not found in request');
+      }
+      this.validationService.checkTrexTokenSaltExists(factory.toString(), salt);
+
+      const trexTokenDetails = new TrexTokenDetailsAts({
+        owner,
+        irs,
+        onchainId,
+        irAgents,
+        tokenAgents,
+        compliancesModules,
+        complianceSettings,
+      });
+      const claimDetails = new TrexClaimDetails({
+        claimTopics,
+        issuers,
+        issuerClaims,
+      });
+      const diamondOwnerAccountEvmAddress: EvmAddress =
+        await this.accountService.getAccountEvmAddress(diamondOwnerAccount!);
+
+      const factoryEvmAddress: EvmAddress =
+        await this.contractService.getContractEvmAddress(factory.toString());
+
+      const resolverEvmAddress: EvmAddress =
+        await this.contractService.getContractEvmAddress(resolver.toString());
+
+      const [
+        externalPausesEvmAddresses,
+        externalControlListsEvmAddresses,
+        externalKycListsEvmAddresses,
+      ] = await Promise.all([
+        this.contractService.getEvmAddressesFromHederaIds(externalPauses),
+        this.contractService.getEvmAddressesFromHederaIds(externalControlLists),
+        this.contractService.getEvmAddressesFromHederaIds(externalKycLists),
+      ]);
+
+      const complianceEvmAddress = compliance
+        ? await this.contractService.getContractEvmAddress(compliance)
+        : new EvmAddress(EVM_ZERO_ADDRESS);
+
+      const identityRegistryEvmAddress = identityRegistry
+        ? await this.contractService.getContractEvmAddress(identityRegistry)
+        : new EvmAddress(EVM_ZERO_ADDRESS);
+
+      const handler = this.transactionService.getHandler();
+
+      const equityInfo = new EquityDetails(
+        votingRight,
+        informationRight,
+        liquidationRight,
+        subscriptionRight,
+        conversionRight,
+        redemptionRight,
+        putRight,
+        dividendRight,
+        currency,
+        BigDecimal.fromString(nominalValue),
+      );
+
+      res = await handler.createTrexSuiteEquity(
+        salt,
+        trexTokenDetails.owner,
+        trexTokenDetails.irs,
+        trexTokenDetails.onchainId,
+        trexTokenDetails.irAgents,
+        trexTokenDetails.tokenAgents,
+        trexTokenDetails.compliancesModules,
+        trexTokenDetails.complianceSettings,
+        claimDetails.claimTopics,
+        claimDetails.issuers,
+        claimDetails.issuerClaims,
+
+        new Security(security),
+        equityInfo,
+        factoryEvmAddress,
+        resolverEvmAddress,
+        configId,
+        configVersion,
+        complianceEvmAddress,
+        identityRegistryEvmAddress,
+        diamondOwnerAccountEvmAddress,
+        externalPausesEvmAddresses,
+        externalControlListsEvmAddresses,
+        externalKycListsEvmAddresses,
+        factory.toString(),
+      );
+
+      const contractAddress =
+        await this.transactionService.getTransactionResult({
+          res,
+          result: res.response?._token,
+          className: CreateTrexSuiteEquityCommandHandler.name,
+          position: 0,
+          numberOfResultsItems: 1,
+        });
+      const contractId =
+        await this.mirrorNodeAdapter.getHederaIdfromContractAddress(
+          contractAddress,
+        );
+
+      return Promise.resolve(
+        new CreateTrexSuiteEquityCommandResponse(
+          new ContractId(contractId),
+          res.id!,
+        ),
+      );
+    } catch (error) {
+      if (res?.response == 1)
+        return Promise.resolve(
+          new CreateTrexSuiteEquityCommandResponse(
+            new ContractId('0.0.0'),
+            res.id!,
+          ),
+        );
+      else throw new CreateTrexSuiteEquityCommandError(error as Error);
+    }
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommandHandler.unit.test.ts
new file mode 100644
index 000000000..0f3da981d
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/CreateTrexSuiteEquityCommandHandler.unit.test.ts
@@ -0,0 +1,420 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { createMock } from '@golevelup/ts-jest';
+import { CreateTrexSuiteEquityCommandHandler } from './CreateTrexSuiteEquityCommandHandler';
+import {
+  CreateTrexSuiteEquityCommand,
+  CreateTrexSuiteEquityCommandResponse,
+} from './CreateTrexSuiteEquityCommand';
+import TransactionService from '@service/transaction/TransactionService';
+import ContractService from '@service/contract/ContractService';
+import EvmAddress from '@domain/context/contract/EvmAddress';
+import {
+  ErrorMsgFixture,
+  EvmAddressPropsFixture,
+  HederaIdPropsFixture,
+  HederaIdZeroAddressFixture,
+  TransactionIdFixture,
+} from '@test/fixtures/shared/DataFixture';
+import AccountService from '@service/account/AccountService';
+import BigDecimal from '@domain/context/shared/BigDecimal';
+import { MirrorNodeAdapter } from '@port/out/mirror/MirrorNodeAdapter';
+import { CreateTrexSuiteEquityCommandFixture } from '@test/fixtures/equity/EquityFixture';
+import { ErrorCode } from '@core/error/BaseError';
+import { CreateTrexSuiteEquityCommandError } from './error/CreateTrexSuiteEquityError';
+import ValidationService from '@service/validation/ValidationService';
+
+describe('CreateTrexSuiteEquityCommandHandler', () => {
+  let handler: CreateTrexSuiteEquityCommandHandler;
+  let command: CreateTrexSuiteEquityCommand;
+
+  const transactionServiceMock = createMock<TransactionService>();
+  const mirrorNodeAdapterMock = createMock<MirrorNodeAdapter>();
+  const accountServiceMock = createMock<AccountService>();
+  const contractServiceMock = createMock<ContractService>();
+  const validationServiceMock = createMock<ValidationService>();
+
+  const evmAddress = new EvmAddress(EvmAddressPropsFixture.create().value);
+  const externalPauseEvmAddress = new EvmAddress(
+    EvmAddressPropsFixture.create().value,
+  );
+  const externalControlEvmAddress = new EvmAddress(
+    EvmAddressPropsFixture.create().value,
+  );
+  const externalKycEvmAddress = new EvmAddress(
+    EvmAddressPropsFixture.create().value,
+  );
+  const transactionId = TransactionIdFixture.create().id;
+  const hederaId = HederaIdPropsFixture.create().value;
+  const hederaIdZeroAddress = HederaIdZeroAddressFixture.create().address;
+  const errorMsg = ErrorMsgFixture.create().msg;
+
+  beforeEach(() => {
+    handler = new CreateTrexSuiteEquityCommandHandler(
+      accountServiceMock,
+      transactionServiceMock,
+      mirrorNodeAdapterMock,
+      contractServiceMock,
+      validationServiceMock,
+    );
+    command = CreateTrexSuiteEquityCommandFixture.create();
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+  describe('execute', () => {
+    describe('error cases', () => {
+      it('throws CreateTrexSuiteEquityCommandError when command fails with uncaught error', async () => {
+        const fakeError = new Error(errorMsg);
+
+        contractServiceMock.getContractEvmAddress.mockRejectedValue(fakeError);
+
+        const resultPromise = handler.execute(command);
+
+        await expect(resultPromise).rejects.toBeInstanceOf(
+          CreateTrexSuiteEquityCommandError,
+        );
+
+        await expect(resultPromise).rejects.toMatchObject({
+          message: expect.stringContaining(
+            `An error occurred while creating the trex suite equity: ${errorMsg}`,
+          ),
+          errorCode: ErrorCode.UncaughtCommandError,
+        });
+      });
+    });
+
+    describe('success cases', () => {
+      it('should successfully create an equity with equityAddress in response', async () => {
+        contractServiceMock.getContractEvmAddress
+          .mockResolvedValueOnce(evmAddress)
+          .mockResolvedValueOnce(evmAddress)
+          .mockResolvedValueOnce(evmAddress)
+          .mockResolvedValueOnce(evmAddress);
+        contractServiceMock.getEvmAddressesFromHederaIds
+          .mockResolvedValueOnce([externalPauseEvmAddress])
+          .mockResolvedValueOnce([externalControlEvmAddress])
+          .mockResolvedValueOnce([externalKycEvmAddress]);
+        accountServiceMock.getAccountEvmAddress.mockResolvedValue(evmAddress);
+
+        transactionServiceMock
+          .getHandler()
+          .createTrexSuiteEquity.mockResolvedValue({
+            id: transactionId,
+            response: { _token: evmAddress.value },
+          });
+
+        validationServiceMock.checkTrexTokenSaltExists.mockResolvedValue();
+
+        mirrorNodeAdapterMock.getHederaIdfromContractAddress.mockResolvedValue(
+          hederaId,
+        );
+
+        transactionServiceMock.getTransactionResult.mockResolvedValue(
+          evmAddress.value,
+        );
+
+        const result = await handler.execute(command);
+
+        expect(result).toBeInstanceOf(CreateTrexSuiteEquityCommandResponse);
+        expect(result.securityId.value).toBe(hederaId);
+        expect(result.transactionId).toBe(transactionId);
+        expect(contractServiceMock.getContractEvmAddress).toHaveBeenCalledTimes(
+          4,
+        );
+        expect(
+          contractServiceMock.getEvmAddressesFromHederaIds,
+        ).toHaveBeenCalledTimes(3);
+        expect(accountServiceMock.getAccountEvmAddress).toHaveBeenCalledTimes(
+          1,
+        );
+        expect(
+          transactionServiceMock.getHandler().createTrexSuiteEquity,
+        ).toHaveBeenCalledTimes(1);
+        expect(
+          transactionServiceMock.getTransactionResult,
+        ).toHaveBeenCalledTimes(1);
+        expect(
+          mirrorNodeAdapterMock.getHederaIdfromContractAddress,
+        ).toHaveBeenCalledTimes(1);
+        expect(
+          transactionServiceMock.getHandler().createTrexSuiteEquity,
+        ).toHaveBeenCalledWith(
+          command.salt,
+          command.owner,
+          command.irs,
+          command.onchainId,
+          command.irAgents,
+          command.tokenAgents,
+          command.compliancesModules,
+          command.complianceSettings,
+          command.claimTopics,
+          command.issuers,
+          command.issuerClaims,
+          expect.objectContaining(command.security),
+          expect.objectContaining({
+            votingRight: command.votingRight,
+            informationRight: command.informationRight,
+            liquidationRight: command.liquidationRight,
+            subscriptionRight: command.subscriptionRight,
+            conversionRight: command.conversionRight,
+            redemptionRight: command.redemptionRight,
+            putRight: command.putRight,
+            dividendRight: command.dividendRight,
+            currency: command.currency,
+            nominalValue: BigDecimal.fromString(command.nominalValue),
+          }),
+          evmAddress,
+          evmAddress,
+          command.configId,
+          command.configVersion,
+          evmAddress,
+          evmAddress,
+          evmAddress,
+          [externalPauseEvmAddress],
+          [externalControlEvmAddress],
+          [externalKycEvmAddress],
+          command.factory?.toString(),
+        );
+        expect(
+          transactionServiceMock.getTransactionResult,
+        ).toHaveBeenCalledWith(
+          expect.objectContaining({
+            res: {
+              id: transactionId,
+              response: { _token: evmAddress.value },
+            },
+            result: evmAddress.value,
+            className: CreateTrexSuiteEquityCommandHandler.name,
+            position: 0,
+            numberOfResultsItems: 1,
+          }),
+        );
+      });
+
+      it('should handle error and return fallback response if response code is 1', async () => {
+        mirrorNodeAdapterMock.getContractInfo.mockResolvedValue({
+          id: hederaId,
+          evmAddress: evmAddress.value,
+        });
+
+        transactionServiceMock
+          .getHandler()
+          .createTrexSuiteEquity.mockResolvedValue({
+            id: transactionId,
+            response: 1,
+          });
+
+        const result = await handler.execute(command);
+
+        expect(result).toBeInstanceOf(CreateTrexSuiteEquityCommandResponse);
+        expect(result.securityId.toString()).toBe(hederaIdZeroAddress);
+        expect(result.transactionId.toString()).toBe(transactionId);
+      });
+    });
+  });
+});
diff --git a/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/error/CreateTrexSuiteEquityError.ts b/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/error/CreateTrexSuiteEquityError.ts
new file mode 100644
index 000000000..1c389a7d7
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/command/equity/createTrexSuite/error/CreateTrexSuiteEquityError.ts
@@ -0,0 +1,214 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { CommandError } from '@command/error/CommandError';
+import BaseError from '@core/error/BaseError';
+
+export class CreateTrexSuiteEquityCommandError extends CommandError {
+  constructor(error: Error) {
+    const msg = `An error occurred while creating the trex suite equity: ${error.message}`;
+    super(msg, error instanceof BaseError ? error.errorCode : undefined);
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/burn/BurnCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/burn/BurnCommandHandler.ts
index f5393f101..e659f56d3 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/burn/BurnCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/burn/BurnCommandHandler.ts
@@ -248,7 +248,6 @@ export class BurnCommandHandler implements ICommandHandler<BurnCommand> {
         sourceId,
         amount,
         _PARTITION_ID_1,
-        account.id.toString(),
       );
       const sourceEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddress(sourceId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/burn/BurnCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/burn/BurnCommandHandler.unit.test.ts
index 8a4b2e5d7..2640c37ae 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/burn/BurnCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/burn/BurnCommandHandler.unit.test.ts
@@ -305,7 +305,6 @@ describe('BurnCommandHandler', () => {
         command.sourceId,
         command.amount,
         _PARTITION_ID_1,
-        account.id.toString(),
       );
       expect(accountServiceMock.getAccountEvmAddress).toHaveBeenCalledWith(
         command.sourceId,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldByPartition/ClearingCreateHoldByPartitionCommand.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldByPartition/ClearingCreateHoldByPartitionCommand.ts
index a9e03b8c1..8c24014cc 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldByPartition/ClearingCreateHoldByPartitionCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldByPartition/ClearingCreateHoldByPartitionCommand.ts
@@ -219,7 +219,7 @@ export class ClearingCreateHoldByPartitionCommand extends Command<ClearingCreate
   constructor(
     public readonly securityId: string,
     public readonly partitionId: string,
-    public readonly escrow: string,
+    public readonly escrowId: string,
     public readonly amount: string,
     public readonly targetId: string,
     public readonly clearingExpirationDate: string,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldByPartition/ClearingCreateHoldByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldByPartition/ClearingCreateHoldByPartitionCommandHandler.ts
index 2a6019e56..de43649b3 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldByPartition/ClearingCreateHoldByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldByPartition/ClearingCreateHoldByPartitionCommandHandler.ts
@@ -243,7 +243,7 @@ export class ClearingCreateHoldByPartitionCommandHandler
       const {
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         targetId,
         clearingExpirationDate,
@@ -256,7 +256,7 @@ export class ClearingCreateHoldByPartitionCommandHandler
       const securityEvmAddress: EvmAddress =
         await this.contractService.getContractEvmAddress(securityId);
       const escrowEvmAddress: EvmAddress =
-        await this.accountService.getAccountEvmAddress(escrow);
+        await this.accountService.getAccountEvmAddress(escrowId);
 
       const targetEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddressOrNull(targetId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldFromByPartition/ClearingCreateHoldFromByPartitionCommand.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldFromByPartition/ClearingCreateHoldFromByPartitionCommand.ts
index 2fda2c3f3..ff1f2018a 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldFromByPartition/ClearingCreateHoldFromByPartitionCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldFromByPartition/ClearingCreateHoldFromByPartitionCommand.ts
@@ -219,7 +219,7 @@ export class ClearingCreateHoldFromByPartitionCommand extends Command<ClearingCr
   constructor(
     public readonly securityId: string,
     public readonly partitionId: string,
-    public readonly escrow: string,
+    public readonly escrowId: string,
     public readonly amount: string,
     public readonly sourceId: string,
     public readonly targetId: string,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldFromByPartition/ClearingCreateHoldFromByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldFromByPartition/ClearingCreateHoldFromByPartitionCommandHandler.ts
index 6a7c65741..4031c624d 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldFromByPartition/ClearingCreateHoldFromByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/clearingCreateHoldFromByPartition/ClearingCreateHoldFromByPartitionCommandHandler.ts
@@ -243,7 +243,7 @@ export class ClearingCreateHoldFromByPartitionCommandHandler
       const {
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
@@ -256,7 +256,7 @@ export class ClearingCreateHoldFromByPartitionCommandHandler
       const securityEvmAddress: EvmAddress =
         await this.contractService.getContractEvmAddress(securityId);
       const escrowEvmAddress: EvmAddress =
-        await this.accountService.getAccountEvmAddress(escrow);
+        await this.accountService.getAccountEvmAddress(escrowId);
 
       const sourceEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddress(sourceId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommand.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommand.ts
index 8acbff64c..99f57fb0c 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommand.ts
@@ -219,7 +219,7 @@ export class OperatorClearingCreateHoldByPartitionCommand extends Command<Operat
   constructor(
     public readonly securityId: string,
     public readonly partitionId: string,
-    public readonly escrow: string,
+    public readonly escrowId: string,
     public readonly amount: string,
     public readonly sourceId: string,
     public readonly targetId: string,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommandHandler.ts
index ec3ce7457..70fd313df 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommandHandler.ts
@@ -243,7 +243,7 @@ export class OperatorClearingCreateHoldByPartitionCommandHandler
       const {
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
@@ -269,7 +269,7 @@ export class OperatorClearingCreateHoldByPartitionCommandHandler
       await this.validationService.checkDecimals(security, amount);
 
       const escrowEvmAddress: EvmAddress =
-        await this.accountService.getAccountEvmAddress(escrow);
+        await this.accountService.getAccountEvmAddress(escrowId);
 
       const sourceEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddress(sourceId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommandHandler.unit.test.ts
index f21cb8a93..178d4c58b 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/operatorClearingCreateHoldByPartition/OperatorClearingCreateHoldByPartitionCommandHandler.unit.test.ts
@@ -327,7 +327,7 @@ describe('ClearingTransferFromByPartitionCommandHandler', () => {
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           1,
-          command.escrow,
+          command.escrowId,
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           2,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommand.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommand.ts
index a34f9b4bf..8d1371840 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommand.ts
@@ -219,7 +219,7 @@ export class ProtectedClearingCreateHoldByPartitionCommand extends Command<Prote
   constructor(
     public readonly securityId: string,
     public readonly partitionId: string,
-    public readonly escrow: string,
+    public readonly escrowId: string,
     public readonly amount: string,
     public readonly sourceId: string,
     public readonly targetId: string,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommandHandler.ts
index 1d96a5f25..450ee8269 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommandHandler.ts
@@ -243,7 +243,7 @@ export class ProtectedClearingCreateHoldByPartitionCommandHandler
       const {
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
@@ -263,7 +263,7 @@ export class ProtectedClearingCreateHoldByPartitionCommandHandler
         await this.accountService.getAccountEvmAddress(sourceId);
 
       const escrowEvmAddress: EvmAddress =
-        await this.accountService.getAccountEvmAddress(escrow);
+        await this.accountService.getAccountEvmAddress(escrowId);
 
       const targetEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddressOrNull(targetId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommandHandler.unit.test.ts
index a5eff0146..a56f2b973 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/clearing/protectedClearingCreateHoldByPartition/ProtectedClearingCreateHoldByPartitionCommandHandler.unit.test.ts
@@ -328,7 +328,7 @@ describe('ProtectedClearingCreateHoldByPartitionCommandHandler', () => {
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           2,
-          command.escrow,
+          command.escrowId,
         );
         expect(
           accountServiceMock.getAccountEvmAddressOrNull,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommand.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommand.ts
index c65b075d9..152344927 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommand.ts
@@ -219,7 +219,7 @@ export class ControllerCreateHoldByPartitionCommand extends Command<ControllerCr
   constructor(
     public readonly securityId: string,
     public readonly partitionId: string,
-    public readonly escrow: string,
+    public readonly escrowId: string,
     public readonly amount: string,
     public readonly sourceId: string,
     public readonly targetId: string,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommandHandler.ts
index a62a5f187..3ac36343b 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommandHandler.ts
@@ -244,7 +244,7 @@ export class ControllerCreateHoldByPartitionCommandHandler
       const {
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
@@ -257,7 +257,7 @@ export class ControllerCreateHoldByPartitionCommandHandler
       const securityEvmAddress: EvmAddress =
         await this.contractService.getContractEvmAddress(securityId);
       const escrowEvmAddress: EvmAddress =
-        await this.accountService.getAccountEvmAddress(escrow);
+        await this.accountService.getAccountEvmAddress(escrowId);
 
       const sourceEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddress(sourceId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommandHandler.unit.test.ts
index 7a8bfcc1b..877277385 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/controllerCreateHoldByPartition/ControllerCreateHoldByPartitionCommandHandler.unit.test.ts
@@ -326,7 +326,7 @@ describe('ControllerCreateHoldByPartitionCommandHandler', () => {
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           1,
-          command.escrow,
+          command.escrowId,
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           2,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommand.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommand.ts
index 00f6e5008..83a03692e 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommand.ts
@@ -217,7 +217,7 @@ export class CreateHoldByPartitionCommand extends Command<CreateHoldByPartitionC
   constructor(
     public readonly securityId: string,
     public readonly partitionId: string,
-    public readonly escrow: string,
+    public readonly escrowId: string,
     public readonly amount: string,
     public readonly targetId: string,
     public readonly expirationDate: string,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommandHandler.ts
index ca047dd8e..3ab6b725f 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommandHandler.ts
@@ -243,7 +243,7 @@ export class CreateHoldByPartitionCommandHandler
       const {
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         targetId,
         expirationDate,
@@ -257,7 +257,7 @@ export class CreateHoldByPartitionCommandHandler
       const securityEvmAddress: EvmAddress =
         await this.contractService.getContractEvmAddress(securityId);
       const escrowEvmAddress: EvmAddress =
-        await this.accountService.getAccountEvmAddress(escrow);
+        await this.accountService.getAccountEvmAddress(escrowId);
 
       const targetEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddressOrNull(targetId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommandHandler.unit.test.ts
index d07f7d57e..fec6b87bc 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldByPartition/CreateHoldByPartitionCommandHandler.unit.test.ts
@@ -323,7 +323,7 @@ describe('CreateHoldByPartitionCommandHandler', () => {
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           1,
-          command.escrow,
+          command.escrowId,
         );
         expect(
           accountServiceMock.getAccountEvmAddressOrNull,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommand.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommand.ts
index 879ce03d4..a995ecdf7 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommand.ts
@@ -219,7 +219,7 @@ export class CreateHoldFromByPartitionCommand extends Command<CreateHoldFromByPa
   constructor(
     public readonly securityId: string,
     public readonly partitionId: string,
-    public readonly escrow: string,
+    public readonly escrowId: string,
     public readonly amount: string,
     public readonly sourceId: string,
     public readonly targetId: string,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommandHandler.ts
index 6c65442ac..4060c219b 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommandHandler.ts
@@ -243,7 +243,7 @@ export class CreateHoldFromByPartitionCommandHandler
       const {
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
@@ -255,7 +255,7 @@ export class CreateHoldFromByPartitionCommandHandler
       const securityEvmAddress: EvmAddress =
         await this.contractService.getContractEvmAddress(securityId);
       const escrowEvmAddress: EvmAddress =
-        await this.accountService.getAccountEvmAddress(escrow);
+        await this.accountService.getAccountEvmAddress(escrowId);
 
       const sourceEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddress(sourceId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommandHandler.unit.test.ts
index dd077301a..a5237cc20 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/createHoldFromByPartition/CreateHoldFromByPartitionCommandHandler.unit.test.ts
@@ -319,7 +319,7 @@ describe('CreateHoldFromByPartitionCommandHandler', () => {
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           1,
-          command.escrow,
+          command.escrowId,
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           2,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommand.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommand.ts
index e54320985..feba278e6 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommand.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommand.ts
@@ -219,7 +219,7 @@ export class ProtectedCreateHoldByPartitionCommand extends Command<ProtectedCrea
   constructor(
     public readonly securityId: string,
     public readonly partitionId: string,
-    public readonly escrow: string,
+    public readonly escrowId: string,
     public readonly amount: string,
     public readonly sourceId: string,
     public readonly targetId: string,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommandHandler.ts
index 330127bc7..0d8c004f0 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommandHandler.ts
@@ -243,7 +243,7 @@ export class ProtectedCreateHoldByPartitionCommandHandler
       const {
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
@@ -263,7 +263,7 @@ export class ProtectedCreateHoldByPartitionCommandHandler
         await this.accountService.getAccountEvmAddress(sourceId);
 
       const escrowEvmAddress: EvmAddress =
-        await this.accountService.getAccountEvmAddress(escrow);
+        await this.accountService.getAccountEvmAddress(escrowId);
 
       const targetEvmAddress: EvmAddress =
         await this.accountService.getAccountEvmAddressOrNull(targetId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommandHandler.unit.test.ts
index b1c881987..31e2a63f3 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/hold/protectedCreateHoldByPartition/ProtectedCreateHoldByPartitionCommandHandler.unit.test.ts
@@ -326,7 +326,7 @@ describe('ProtectedCreateHoldByPartitionCommandHandler', () => {
         );
         expect(accountServiceMock.getAccountEvmAddress).toHaveBeenNthCalledWith(
           2,
-          command.escrow,
+          command.escrowId,
         );
         expect(
           accountServiceMock.getAccountEvmAddressOrNull,
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ControllerRedeemCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ControllerRedeemCommandHandler.ts
index dce27f219..9073d96e5 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ControllerRedeemCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ControllerRedeemCommandHandler.ts
@@ -243,7 +243,6 @@ export class ControllerRedeemCommandHandler
     try {
       const { securityId, amount, sourceId } = command;
       const handler = this.transactionService.getHandler();
-      const account = this.accountService.getCurrentAccount();
       const security = await this.securityService.get(securityId);
 
       const securityEvmAddress: EvmAddress =
@@ -258,7 +257,6 @@ export class ControllerRedeemCommandHandler
         sourceId,
         amount,
         _PARTITION_ID_1,
-        account.id.toString(),
       );
 
       await this.validationService.checkDecimals(security, amount);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ControllerRedeemCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ControllerRedeemCommandHandler.unit.test.ts
index 50f6937e9..d35f1883a 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ControllerRedeemCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ControllerRedeemCommandHandler.unit.test.ts
@@ -217,8 +217,6 @@ import { ErrorCode } from '@core/error/BaseError';
 import SecurityService from '@service/security/SecurityService';
 import { SecurityPropsFixture } from '@test/fixtures/shared/SecurityFixture';
 import { Security } from '@domain/context/security/Security';
-import Account from '@domain/context/account/Account';
-import { AccountPropsFixture } from '@test/fixtures/shared/DataFixture';
 import EvmAddress from '@domain/context/contract/EvmAddress';
 import BigDecimal from '@domain/context/shared/BigDecimal';
 import { ControllerRedeemCommandHandler } from './ControllerRedeemCommandHandler';
@@ -244,7 +242,6 @@ describe('ControllerRedeemCommandHandler', () => {
   const transactionId = TransactionIdFixture.create().id;
   const errorMsg = ErrorMsgFixture.create().msg;
   const security = new Security(SecurityPropsFixture.create());
-  const account = new Account(AccountPropsFixture.create());
 
   beforeEach(() => {
     handler = new ControllerRedeemCommandHandler(
@@ -290,7 +287,6 @@ describe('ControllerRedeemCommandHandler', () => {
       it('should successfully force redeem tokens', async () => {
         contractServiceMock.getContractEvmAddress.mockResolvedValue(evmAddress);
         accountServiceMock.getAccountEvmAddress.mockResolvedValue(evmAddress);
-        accountServiceMock.getCurrentAccount.mockReturnValue(account);
         securityServiceMock.get.mockResolvedValue(security);
 
         transactionServiceMock.getHandler().controllerRedeem.mockResolvedValue({
@@ -327,7 +323,6 @@ describe('ControllerRedeemCommandHandler', () => {
           command.sourceId,
           command.amount,
           _PARTITION_ID_1,
-          account.id.toString(),
         );
 
         expect(
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ProtectedRedeemFromByPartitionCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ProtectedRedeemFromByPartitionCommandHandler.ts
index fe211957a..a863d2547 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ProtectedRedeemFromByPartitionCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ProtectedRedeemFromByPartitionCommandHandler.ts
@@ -251,7 +251,6 @@ export class ProtectedRedeemFromByPartitionCommandHandler
       } = command;
 
       const handler = this.transactionService.getHandler();
-      const account = this.accountService.getCurrentAccount();
       const security = await this.securityService.get(securityId);
 
       const securityEvmAddress: EvmAddress =
@@ -266,7 +265,6 @@ export class ProtectedRedeemFromByPartitionCommandHandler
         sourceId,
         amount,
         partitionId,
-        account.id.toString(),
       );
 
       await this.validationService.checkDecimals(security, amount);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ProtectedRedeemFromByPartitionCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ProtectedRedeemFromByPartitionCommandHandler.unit.test.ts
index f87541017..e3f94667c 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ProtectedRedeemFromByPartitionCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/ProtectedRedeemFromByPartitionCommandHandler.unit.test.ts
@@ -217,8 +217,6 @@ import { ErrorCode } from '@core/error/BaseError';
 import SecurityService from '@service/security/SecurityService';
 import { SecurityPropsFixture } from '@test/fixtures/shared/SecurityFixture';
 import { Security } from '@domain/context/security/Security';
-import Account from '@domain/context/account/Account';
-import { AccountPropsFixture } from '@test/fixtures/shared/DataFixture';
 import EvmAddress from '@domain/context/contract/EvmAddress';
 import BigDecimal from '@domain/context/shared/BigDecimal';
 import { RedeemCommandFixture } from '@test/fixtures/redeem/RedeemFixture';
@@ -243,7 +241,6 @@ describe('ProtectedRedeemFromByPartitionCommandHandler', () => {
   const transactionId = TransactionIdFixture.create().id;
   const errorMsg = ErrorMsgFixture.create().msg;
   const security = new Security(SecurityPropsFixture.create());
-  const account = new Account(AccountPropsFixture.create());
 
   beforeEach(() => {
     handler = new ProtectedRedeemFromByPartitionCommandHandler(
@@ -285,7 +282,6 @@ describe('ProtectedRedeemFromByPartitionCommandHandler', () => {
       it('should successfully protected redeem tokens', async () => {
         contractServiceMock.getContractEvmAddress.mockResolvedValue(evmAddress);
         accountServiceMock.getAccountEvmAddress.mockResolvedValue(evmAddress);
-        accountServiceMock.getCurrentAccount.mockReturnValue(account);
         securityServiceMock.get.mockResolvedValue(security);
 
         transactionServiceMock
@@ -326,7 +322,6 @@ describe('ProtectedRedeemFromByPartitionCommandHandler', () => {
           command.sourceId,
           command.amount,
           command.partitionId,
-          account.id.toString(),
         );
 
         expect(
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/RedeemCommandHandler.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/RedeemCommandHandler.ts
index efbef6735..76af66bb6 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/RedeemCommandHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/RedeemCommandHandler.ts
@@ -246,7 +246,6 @@ export class RedeemCommandHandler implements ICommandHandler<RedeemCommand> {
         account.id.toString(),
         amount,
         _PARTITION_ID_1,
-        account.id.toString(),
       );
 
       const security = await this.securityService.get(securityId);
diff --git a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/RedeemCommandHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/RedeemCommandHandler.unit.test.ts
index 374691e4a..ce588c403 100644
--- a/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/RedeemCommandHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/command/security/operations/redeem/RedeemCommandHandler.unit.test.ts
@@ -320,7 +320,6 @@ describe('RedeemCommandHandler', () => {
           account.id.toString(),
           command.amount,
           _PARTITION_ID_1,
-          account.id.toString(),
         );
 
         expect(transactionServiceMock.getHandler().redeem).toHaveBeenCalledWith(
diff --git a/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQuery.ts b/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQuery.ts
new file mode 100644
index 000000000..79b4a0dbb
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQuery.ts
@@ -0,0 +1,220 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { Query } from '@core/query/Query';
+import { QueryResponse } from '@core/query/QueryResponse';
+
+export class GetTokenBySaltQueryResponse implements QueryResponse {
+  constructor(public readonly token: string) {}
+}
+
+export class GetTokenBySaltQuery extends Query<GetTokenBySaltQueryResponse> {
+  constructor(
+    public readonly factory: string,
+    public readonly salt: string,
+  ) {
+    super();
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQueryHandler.ts b/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQueryHandler.ts
new file mode 100644
index 000000000..e85738d9b
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQueryHandler.ts
@@ -0,0 +1,248 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import EvmAddress from '@domain/context/contract/EvmAddress';
+import { lazyInject } from '@core/decorator/LazyInjectDecorator';
+import { QueryHandler } from '@core/decorator/QueryHandlerDecorator';
+import { IQueryHandler } from '@core/query/QueryHandler';
+import { RPCQueryAdapter } from '@port/out/rpc/RPCQueryAdapter';
+import {
+  GetTokenBySaltQuery,
+  GetTokenBySaltQueryResponse,
+} from './GetTokenBySaltQuery';
+import AccountService from '@service/account/AccountService';
+import { GetTokenBySaltQueryError } from './error/GetTokenBySaltQueryError';
+
+@QueryHandler(GetTokenBySaltQuery)
+export class GetTokenBySaltQueryHandler
+  implements IQueryHandler<GetTokenBySaltQuery>
+{
+  constructor(
+    @lazyInject(RPCQueryAdapter)
+    private readonly queryAdapter: RPCQueryAdapter,
+    @lazyInject(AccountService)
+    private readonly accountService: AccountService,
+  ) {}
+
+  async execute(
+    query: GetTokenBySaltQuery,
+  ): Promise<GetTokenBySaltQueryResponse> {
+    try {
+      const { salt, factory } = query;
+
+      const factoryEvmAddress: EvmAddress =
+        await this.accountService.getAccountEvmAddress(factory);
+
+      const token: string = await this.queryAdapter.getTrexTokenBySalt(
+        factoryEvmAddress,
+        salt,
+      );
+
+      return Promise.resolve(new GetTokenBySaltQueryResponse(token));
+    } catch (error) {
+      throw new GetTokenBySaltQueryError(error as Error);
+    }
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQueryHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQueryHandler.unit.test.ts
new file mode 100644
index 000000000..613e3ac94
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/GetTokenBySaltQueryHandler.unit.test.ts
@@ -0,0 +1,284 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { createMock } from '@golevelup/ts-jest';
+import {
+  ErrorMsgFixture,
+  EvmAddressPropsFixture,
+} from '@test/fixtures/shared/DataFixture';
+import { ErrorCode } from '@core/error/BaseError';
+import { RPCQueryAdapter } from '@port/out/rpc/RPCQueryAdapter';
+import EvmAddress from '@domain/context/contract/EvmAddress';
+import AccountService from '@service/account/AccountService';
+import {
+  GetTokenBySaltQuery,
+  GetTokenBySaltQueryResponse,
+} from './GetTokenBySaltQuery';
+import { GetTokenBySaltQueryHandler } from './GetTokenBySaltQueryHandler';
+import { GetTokenBySaltQueryError } from './error/GetTokenBySaltQueryError';
+import { GetTokenQueryFixture } from '@test/fixtures/trexFactroy/TrexFactoryFixture';
+
+describe('GetTokenBySaltQueryHandler', () => {
+  let handler: GetTokenBySaltQueryHandler;
+  let query: GetTokenBySaltQuery;
+
+  const queryAdapterServiceMock = createMock<RPCQueryAdapter>();
+  const accountServiceMock = createMock<AccountService>();
+
+  const evmAddress = new EvmAddress(EvmAddressPropsFixture.create().value);
+  const errorMsg = ErrorMsgFixture.create().msg;
+  const Token = EvmAddressPropsFixture.create().value;
+
+  beforeEach(() => {
+    handler = new GetTokenBySaltQueryHandler(
+      queryAdapterServiceMock,
+      accountServiceMock,
+    );
+    query = GetTokenQueryFixture.create();
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('execute', () => {
+    it('throws GetTokenQueryError when query fails with uncaught error', async () => {
+      const fakeError = new Error(errorMsg);
+
+      accountServiceMock.getAccountEvmAddress.mockRejectedValue(fakeError);
+
+      const resultPromise = handler.execute(query);
+
+      await expect(resultPromise).rejects.toBeInstanceOf(
+        GetTokenBySaltQueryError,
+      );
+
+      await expect(resultPromise).rejects.toMatchObject({
+        message: expect.stringContaining(
+          `An error occurred while querying token salt: ${errorMsg}`,
+        ),
+        errorCode: ErrorCode.UncaughtQueryError,
+      });
+    });
+
+    it('should successfully get factory token by salt', async () => {
+      accountServiceMock.getAccountEvmAddress.mockResolvedValueOnce(evmAddress);
+      queryAdapterServiceMock.getTrexTokenBySalt.mockResolvedValue(Token);
+
+      const result = await handler.execute(query);
+
+      expect(result).toBeInstanceOf(GetTokenBySaltQueryResponse);
+      expect(result.token).toBe(Token);
+      expect(accountServiceMock.getAccountEvmAddress).toHaveBeenCalledTimes(1);
+      expect(accountServiceMock.getAccountEvmAddress).toHaveBeenCalledWith(
+        query.factory?.toString(),
+      );
+      expect(queryAdapterServiceMock.getTrexTokenBySalt).toHaveBeenCalledWith(
+        evmAddress,
+        query.salt,
+      );
+    });
+  });
+});
diff --git a/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/error/GetTokenBySaltQueryError.ts b/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/error/GetTokenBySaltQueryError.ts
new file mode 100644
index 000000000..bfc8df367
--- /dev/null
+++ b/packages/ats/sdk/src/app/usecase/query/factory/trex/getTokenBySalt/error/GetTokenBySaltQueryError.ts
@@ -0,0 +1,214 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { QueryError } from '@query/error/QueryError';
+import BaseError from '@core/error/BaseError';
+
+export class GetTokenBySaltQueryError extends QueryError {
+  constructor(error: Error) {
+    const msg = `An error occurred while querying token salt: ${error.message}`;
+    super(msg, error instanceof BaseError ? error.errorCode : undefined);
+  }
+}
diff --git a/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQuery.ts b/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQuery.ts
index d9a917325..2afaffeb6 100644
--- a/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQuery.ts
+++ b/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQuery.ts
@@ -207,7 +207,7 @@ import { Query } from '@core/query/Query';
 import { QueryResponse } from '@core/query/QueryResponse';
 
 export class CanRedeemByPartitionQueryResponse implements QueryResponse {
-  constructor(public readonly payload: string) {}
+  constructor(public readonly payload: [string, string]) {}
 }
 
 export class CanRedeemByPartitionQuery extends Query<CanRedeemByPartitionQueryResponse> {
diff --git a/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQueryHandler.ts b/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQueryHandler.ts
index 699f7f9be..f382cab8e 100644
--- a/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQueryHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQueryHandler.ts
@@ -249,17 +249,18 @@ export class CanRedeemByPartitionQueryHandler
 
       const amountBd = BigDecimal.fromString(amount, security.decimals);
 
-      const [, res] = await this.queryAdapter.canRedeemByPartition(
-        securityEvmAddress,
-        sourceEvmAddress,
-        amountBd,
-        partitionId,
-        EMPTY_BYTES,
-        EMPTY_BYTES,
-        account.evmAddress!,
-      );
-
-      return new CanRedeemByPartitionQueryResponse(res);
+      const [, statusCode, reason] =
+        await this.queryAdapter.canRedeemByPartition(
+          securityEvmAddress,
+          sourceEvmAddress,
+          amountBd,
+          partitionId,
+          EMPTY_BYTES,
+          EMPTY_BYTES,
+          account.evmAddress!,
+        );
+
+      return new CanRedeemByPartitionQueryResponse([statusCode, reason]);
     } catch (error) {
       throw new CanRedeemByPartitionQueryError(error as Error);
     }
diff --git a/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQueryHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQueryHandler.unit.test.ts
index aad2b28f4..f73a7db32 100644
--- a/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQueryHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/query/security/canRedeemByPartition/CanRedeemByPartitionQueryHandler.unit.test.ts
@@ -298,7 +298,7 @@ describe('CanRedeemByPartitionQueryHandler', () => {
       const result = await handler.execute(query);
 
       expect(result).toBeInstanceOf(CanRedeemByPartitionQueryResponse);
-      expect(result.payload).toBe('test');
+      expect(result.payload).toStrictEqual(['test', 'test']);
       expect(securityServiceMock.get).toHaveBeenCalledTimes(1);
       expect(accountServiceMock.getCurrentAccount).toHaveBeenCalledTimes(1);
       expect(contractServiceMock.getContractEvmAddress).toHaveBeenCalledTimes(
diff --git a/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQuery.ts b/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQuery.ts
index 3ff92878f..9f6d78ce6 100644
--- a/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQuery.ts
+++ b/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQuery.ts
@@ -207,7 +207,7 @@ import { Query } from '@core/query/Query';
 import { QueryResponse } from '@core/query/QueryResponse';
 
 export class CanTransferByPartitionQueryResponse implements QueryResponse {
-  constructor(public readonly payload: string) {}
+  constructor(public readonly payload: [string, string]) {}
 }
 
 export class CanTransferByPartitionQuery extends Query<CanTransferByPartitionQueryResponse> {
diff --git a/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQueryHandler.ts b/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQueryHandler.ts
index 8411a9660..098b71c7c 100644
--- a/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQueryHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQueryHandler.ts
@@ -252,18 +252,19 @@ export class CanTransferByPartitionQueryHandler
 
       const amountBd = BigDecimal.fromString(amount, security.decimals);
 
-      const [, res] = await this.queryAdapter.canTransferByPartition(
-        securityEvmAddress,
-        sourceEvmAddress,
-        targetEvmAddress,
-        amountBd,
-        partitionId,
-        EMPTY_BYTES,
-        EMPTY_BYTES,
-        account.evmAddress!,
-      );
-
-      return new CanTransferByPartitionQueryResponse(res);
+      const [, statusCode, reason] =
+        await this.queryAdapter.canTransferByPartition(
+          securityEvmAddress,
+          sourceEvmAddress,
+          targetEvmAddress,
+          amountBd,
+          partitionId,
+          EMPTY_BYTES,
+          EMPTY_BYTES,
+          account.evmAddress!,
+        );
+
+      return new CanTransferByPartitionQueryResponse([statusCode, reason]);
     } catch (error) {
       throw new CanTransferByPartitionQueryError(error as Error);
     }
diff --git a/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQueryHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQueryHandler.unit.test.ts
index 47eb65f43..81cedd562 100644
--- a/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQueryHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/query/security/canTransferByPartition/CanTransferByPartitionQueryHandler.unit.test.ts
@@ -300,7 +300,7 @@ describe('CanTransferByPartitionQueryHandler', () => {
       const result = await handler.execute(query);
 
       expect(result).toBeInstanceOf(CanTransferByPartitionQueryResponse);
-      expect(result.payload).toBe('test');
+      expect(result.payload).toStrictEqual(['test', 'test']);
       expect(securityServiceMock.get).toHaveBeenCalledTimes(1);
       expect(contractServiceMock.getContractEvmAddress).toHaveBeenCalledTimes(
         1,
diff --git a/packages/ats/sdk/src/app/usecase/query/security/clearing/getClearingCreateHoldForByPartition/GetClearingCreateHoldForByPartitionQueryHandler.ts b/packages/ats/sdk/src/app/usecase/query/security/clearing/getClearingCreateHoldForByPartition/GetClearingCreateHoldForByPartitionQueryHandler.ts
index 3194424d7..623353377 100644
--- a/packages/ats/sdk/src/app/usecase/query/security/clearing/getClearingCreateHoldForByPartition/GetClearingCreateHoldForByPartitionQueryHandler.ts
+++ b/packages/ats/sdk/src/app/usecase/query/security/clearing/getClearingCreateHoldForByPartition/GetClearingCreateHoldForByPartitionQueryHandler.ts
@@ -258,8 +258,8 @@ export class GetClearingCreateHoldForByPartitionQueryHandler
         security.decimals,
       );
 
-      clearing.holdEscrow = (
-        await this.accountService.getAccountInfo(clearing.holdEscrow)
+      clearing.holdEscrowId = (
+        await this.accountService.getAccountInfo(clearing.holdEscrowId)
       ).id.toString();
 
       clearing.holdTo = (
diff --git a/packages/ats/sdk/src/app/usecase/query/security/clearing/getClearingCreateHoldForByPartition/GetClearingCreateHoldForByPartitionQueryHandler.unit.test.ts b/packages/ats/sdk/src/app/usecase/query/security/clearing/getClearingCreateHoldForByPartition/GetClearingCreateHoldForByPartitionQueryHandler.unit.test.ts
index 9ab85b478..23f454f03 100644
--- a/packages/ats/sdk/src/app/usecase/query/security/clearing/getClearingCreateHoldForByPartition/GetClearingCreateHoldForByPartitionQueryHandler.unit.test.ts
+++ b/packages/ats/sdk/src/app/usecase/query/security/clearing/getClearingCreateHoldForByPartition/GetClearingCreateHoldForByPartitionQueryHandler.unit.test.ts
@@ -253,7 +253,7 @@ describe('GetClearingCreateHoldForByPartitionQueryHandler', () => {
     clearingHoldProps.expirationTimestamp,
     clearingHoldProps.data,
     clearingHoldProps.operatorData,
-    clearingHoldProps.holdEscrow,
+    clearingHoldProps.holdEscrowId,
     clearingHoldProps.holdExpirationTimestamp,
     clearingHoldProps.holdTo,
     clearingHoldProps.holdData,
@@ -331,7 +331,7 @@ describe('GetClearingCreateHoldForByPartitionQueryHandler', () => {
 
       expect(accountServiceMock.getAccountInfo).toHaveBeenNthCalledWith(
         1,
-        clearingHoldProps.holdEscrow,
+        clearingHoldProps.holdEscrowId,
       );
       expect(accountServiceMock.getAccountInfo).toHaveBeenNthCalledWith(
         2,
diff --git a/packages/ats/sdk/src/core/Constants.ts b/packages/ats/sdk/src/core/Constants.ts
index 7ff1349f2..a9137a099 100644
--- a/packages/ats/sdk/src/core/Constants.ts
+++ b/packages/ats/sdk/src/core/Constants.ts
@@ -347,6 +347,7 @@ export const GAS = {
   ADD_AGENT: 7000000,
   REMOVE_AGENT: 7000000,
   REDEEM_AT_MATURITY_BY_PARTITION_GAS: 700000,
+  TREX_CREATE_SUITE: 20000000,
 } as const;
 
 export const _PARTITION_ID_1 =
@@ -363,5 +364,28 @@ export const SET_SCHEDULED_BALANCE_ADJUSTMENT_EVENT =
 export const BYTES_32_LENGTH = 32 * 2;
 export const ADDRESS_LENGTH = 40;
 
+// * Time periods (in seconds and milliseconds)
+export const TIME_PERIODS_S = {
+  SECOND: 1,
+  MINUTE: 60,
+  HOUR: 60 * 60,
+  DAY: 24 * 60 * 60,
+  WEEK: 7 * 24 * 60 * 60,
+  MONTH: 30 * 24 * 60 * 60,
+  QUARTER: 90 * 24 * 60 * 60,
+  YEAR: 365 * 24 * 60 * 60,
+};
+
+export const TIME_PERIODS_MS = {
+  SECOND: TIME_PERIODS_S.SECOND * 1000,
+  MINUTE: TIME_PERIODS_S.MINUTE * 1000,
+  HOUR: TIME_PERIODS_S.HOUR * 1000,
+  DAY: TIME_PERIODS_S.DAY * 1000,
+  WEEK: TIME_PERIODS_S.WEEK * 1000,
+  MONTH: TIME_PERIODS_S.MONTH * 1000,
+  QUARTER: TIME_PERIODS_S.QUARTER * 1000,
+  YEAR: TIME_PERIODS_S.YEAR * 1000,
+};
+
 // * Events from creation
 export const TOPICS_IN_FACTORY_RESULT = 6;
diff --git a/packages/ats/sdk/src/core/error/BaseError.ts b/packages/ats/sdk/src/core/error/BaseError.ts
index a6ea9ad5b..1559e847e 100644
--- a/packages/ats/sdk/src/core/error/BaseError.ts
+++ b/packages/ats/sdk/src/core/error/BaseError.ts
@@ -273,6 +273,12 @@ export enum ErrorCode {
   NotIssuable = '20035',
   InvalidSupply = '20036',
   AddressRecovered = '20037',
+  ZeroAddressNotAllowed = '20038',
+  AccountBlocked = '20039',
+  ComplianceNotAllowed = '20040',
+  InvalidKycStatus = '20041',
+  WalletRecovered = '20042',
+  AddressNotVerified = '20043',
 
   // Error codes for System Errors (Prefix: 3XXXX)
   ContractNotFound = '30002',
diff --git a/packages/ats/sdk/src/core/injectable/Handlers.ts b/packages/ats/sdk/src/core/injectable/Handlers.ts
index 9b1edf68d..d49137738 100644
--- a/packages/ats/sdk/src/core/injectable/Handlers.ts
+++ b/packages/ats/sdk/src/core/injectable/Handlers.ts
@@ -297,6 +297,10 @@ import {
 } from './balance/InjectableBalance';
 import { QUERY_HANDLERS_ACCOUNT } from './account/InjectableAccount';
 import { QUERY_HANDLERS_OPERATOR } from './operator/InjectableOperator';
+import {
+  COMMAND_HANDLERS_TREX_FACTORY,
+  QUERY_HANDLERS_TREX_FACTORY,
+} from './trexFactory/InjectableTrexFactory';
 
 export const COMMAND_HANDLERS = [
   ...COMMAND_HANDLERS_AGENT,
@@ -324,6 +328,7 @@ export const COMMAND_HANDLERS = [
   ...COMMAND_HANDLERS_SUPPLY,
   ...COMMAND_HANDLERS_TRANSFER,
   ...COMMAND_HANDLERS_BALANCE,
+  ...COMMAND_HANDLERS_TREX_FACTORY,
 ];
 
 export const QUERY_HANDLERS = [
@@ -351,6 +356,7 @@ export const QUERY_HANDLERS = [
   ...QUERY_HANDLERS_ACCOUNT,
   ...QUERY_HANDLERS_OPERATOR,
   ...QUERY_HANDLERS_SNAPSHOT,
+  ...QUERY_HANDLERS_TREX_FACTORY,
 ];
 
 export const TRANSACTION_HANDLER = [
diff --git a/packages/ats/sdk/src/core/injectable/trexFactory/InjectableTrexFactory.ts b/packages/ats/sdk/src/core/injectable/trexFactory/InjectableTrexFactory.ts
new file mode 100644
index 000000000..a10c4269d
--- /dev/null
+++ b/packages/ats/sdk/src/core/injectable/trexFactory/InjectableTrexFactory.ts
@@ -0,0 +1,227 @@
+/*
+																 Apache License
+													 Version 2.0, January 2004
+												http://www.apache.org/licenses/
+
+	 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+	 1. Definitions.
+
+			"License" shall mean the terms and conditions for use, reproduction,
+			and distribution as defined by Sections 1 through 9 of this document.
+
+			"Licensor" shall mean the copyright owner or entity authorized by
+			the copyright owner that is granting the License.
+
+			"Legal Entity" shall mean the union of the acting entity and all
+			other entities that control, are controlled by, or are under common
+			control with that entity. For the purposes of this definition,
+			"control" means (i) the power, direct or indirect, to cause the
+			direction or management of such entity, whether by contract or
+			otherwise, or (ii) ownership of fifty percent (50%) or more of the
+			outstanding shares, or (iii) beneficial ownership of such entity.
+
+			"You" (or "Your") shall mean an individual or Legal Entity
+			exercising permissions granted by this License.
+
+			"Source" form shall mean the preferred form for making modifications,
+			including but not limited to software source code, documentation
+			source, and configuration files.
+
+			"Object" form shall mean any form resulting from mechanical
+			transformation or translation of a Source form, including but
+			not limited to compiled object code, generated documentation,
+			and conversions to other media types.
+
+			"Work" shall mean the work of authorship, whether in Source or
+			Object form, made available under the License, as indicated by a
+			copyright notice that is included in or attached to the work
+			(an example is provided in the Appendix below).
+
+			"Derivative Works" shall mean any work, whether in Source or Object
+			form, that is based on (or derived from) the Work and for which the
+			editorial revisions, annotations, elaborations, or other modifications
+			represent, as a whole, an original work of authorship. For the purposes
+			of this License, Derivative Works shall not include works that remain
+			separable from, or merely link (or bind by name) to the interfaces of,
+			the Work and Derivative Works thereof.
+
+			"Contribution" shall mean any work of authorship, including
+			the original version of the Work and any modifications or additions
+			to that Work or Derivative Works thereof, that is intentionally
+			submitted to Licensor for inclusion in the Work by the copyright owner
+			or by an individual or Legal Entity authorized to submit on behalf of
+			the copyright owner. For the purposes of this definition, "submitted"
+			means any form of electronic, verbal, or written communication sent
+			to the Licensor or its representatives, including but not limited to
+			communication on electronic mailing lists, source code control systems,
+			and issue tracking systems that are managed by, or on behalf of, the
+			Licensor for the purpose of discussing and improving the Work, but
+			excluding communication that is conspicuously marked or otherwise
+			designated in writing by the copyright owner as "Not a Contribution."
+
+			"Contributor" shall mean Licensor and any individual or Legal Entity
+			on behalf of whom a Contribution has been received by Licensor and
+			subsequently incorporated within the Work.
+
+	 2. Grant of Copyright License. Subject to the terms and conditions of
+			this License, each Contributor hereby grants to You a perpetual,
+			worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+			copyright license to reproduce, prepare Derivative Works of,
+			publicly display, publicly perform, sublicense, and distribute the
+			Work and such Derivative Works in Source or Object form.
+
+	 3. Grant of Patent License. Subject to the terms and conditions of
+			this License, each Contributor hereby grants to You a perpetual,
+			worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+			(except as stated in this section) patent license to make, have made,
+			use, offer to sell, sell, import, and otherwise transfer the Work,
+			where such license applies only to those patent claims licensable
+			by such Contributor that are necessarily infringed by their
+			Contribution(s) alone or by combination of their Contribution(s)
+			with the Work to which such Contribution(s) was submitted. If You
+			institute patent litigation against any entity (including a
+			cross-claim or counterclaim in a lawsuit) alleging that the Work
+			or a Contribution incorporated within the Work constitutes direct
+			or contributory patent infringement, then any patent licenses
+			granted to You under this License for that Work shall terminate
+			as of the date such litigation is filed.
+
+	 4. Redistribution. You may reproduce and distribute copies of the
+			Work or Derivative Works thereof in any medium, with or without
+			modifications, and in Source or Object form, provided that You
+			meet the following conditions:
+
+			(a) You must give any other recipients of the Work or
+					Derivative Works a copy of this License; and
+
+			(b) You must cause any modified files to carry prominent notices
+					stating that You changed the files; and
+
+			(c) You must retain, in the Source form of any Derivative Works
+					that You distribute, all copyright, patent, trademark, and
+					attribution notices from the Source form of the Work,
+					excluding those notices that do not pertain to any part of
+					the Derivative Works; and
+
+			(d) If the Work includes a "NOTICE" text file as part of its
+					distribution, then any Derivative Works that You distribute must
+					include a readable copy of the attribution notices contained
+					within such NOTICE file, excluding those notices that do not
+					pertain to any part of the Derivative Works, in at least one
+					of the following places: within a NOTICE text file distributed
+					as part of the Derivative Works; within the Source form or
+					documentation, if provided along with the Derivative Works; or,
+					within a display generated by the Derivative Works, if and
+					wherever such third-party notices normally appear. The contents
+					of the NOTICE file are for informational purposes only and
+					do not modify the License. You may add Your own attribution
+					notices within Derivative Works that You distribute, alongside
+					or as an addendum to the NOTICE text from the Work, provided
+					that such additional attribution notices cannot be construed
+					as modifying the License.
+
+			You may add Your own copyright statement to Your modifications and
+			may provide additional or different license terms and conditions
+			for use, reproduction, or distribution of Your modifications, or
+			for any such Derivative Works as a whole, provided Your use,
+			reproduction, and distribution of the Work otherwise complies with
+			the conditions stated in this License.
+
+	 5. Submission of Contributions. Unless You explicitly state otherwise,
+			any Contribution intentionally submitted for inclusion in the Work
+			by You to the Licensor shall be under the terms and conditions of
+			this License, without any additional terms or conditions.
+			Notwithstanding the above, nothing herein shall supersede or modify
+			the terms of any separate license agreement you may have executed
+			with Licensor regarding such Contributions.
+
+	 6. Trademarks. This License does not grant permission to use the trade
+			names, trademarks, service marks, or product names of the Licensor,
+			except as required for reasonable and customary use in describing the
+			origin of the Work and reproducing the content of the NOTICE file.
+
+	 7. Disclaimer of Warranty. Unless required by applicable law or
+			agreed to in writing, Licensor provides the Work (and each
+			Contributor provides its Contributions) on an "AS IS" BASIS,
+			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+			implied, including, without limitation, any warranties or conditions
+			of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+			PARTICULAR PURPOSE. You are solely responsible for determining the
+			appropriateness of using or redistributing the Work and assume any
+			risks associated with Your exercise of permissions under this License.
+
+	 8. Limitation of Liability. In no event and under no legal theory,
+			whether in tort (including negligence), contract, or otherwise,
+			unless required by applicable law (such as deliberate and grossly
+			negligent acts) or agreed to in writing, shall any Contributor be
+			liable to You for damages, including any direct, indirect, special,
+			incidental, or consequential damages of any character arising as a
+			result of this License or out of the use or inability to use the
+			Work (including but not limited to damages for loss of goodwill,
+			work stoppage, computer failure or malfunction, or any and all
+			other commercial damages or losses), even if such Contributor
+			has been advised of the possibility of such damages.
+
+	 9. Accepting Warranty or Additional Liability. While redistributing
+			the Work or Derivative Works thereof, You may choose to offer,
+			and charge a fee for, acceptance of support, warranty, indemnity,
+			or other liability obligations and/or rights consistent with this
+			License. However, in accepting such obligations, You may act only
+			on Your own behalf and on Your sole responsibility, not on behalf
+			of any other Contributor, and only if You agree to indemnify,
+			defend, and hold each Contributor harmless for any liability
+			incurred by, or claims asserted against, such Contributor by reason
+			of your accepting any such warranty or additional liability.
+
+	 END OF TERMS AND CONDITIONS
+
+	 APPENDIX: How to apply the Apache License to your work.
+
+			To apply the Apache License to your work, attach the following
+			boilerplate notice, with the fields enclosed by brackets "[]"
+			replaced with your own identifying information. (Don't include
+			the brackets!)  The text should be enclosed in the appropriate
+			comment syntax for the file format. We also recommend that a
+			file or class name and description of purpose be included on the
+			same "printed page" as the copyright notice for easier
+			identification within third-party archives.
+
+	 Copyright [yyyy] [name of copyright owner]
+
+	 Licensed under the Apache License, Version 2.0 (the "License");
+	 you may not use this file except in compliance with the License.
+	 You may obtain a copy of the License at
+
+			 http://www.apache.org/licenses/LICENSE-2.0
+
+	 Unless required by applicable law or agreed to in writing, software
+	 distributed under the License is distributed on an "AS IS" BASIS,
+	 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	 See the License for the specific language governing permissions and
+	 limitations under the License.
+
+*/
+
+import { GetTokenBySaltQueryHandler } from '@query/factory/trex/getTokenBySalt/GetTokenBySaltQueryHandler';
+import { TOKENS } from '../Tokens';
+import { CreateTrexSuiteBondCommandHandler } from '@command/bond/createTrexSuite/CreateTrexSuiteBondCommandHandler';
+import { CreateTrexSuiteEquityCommandHandler } from '@command/equity/createTrexSuite/CreateTrexSuiteEquityCommandHandler';
+
+export const COMMAND_HANDLERS_TREX_FACTORY = [
+  {
+    token: TOKENS.COMMAND_HANDLER,
+    useClass: CreateTrexSuiteBondCommandHandler,
+  },
+  {
+    token: TOKENS.COMMAND_HANDLER,
+    useClass: CreateTrexSuiteEquityCommandHandler,
+  },
+];
+
+export const QUERY_HANDLERS_TREX_FACTORY = [
+  {
+    token: TOKENS.QUERY_HANDLER,
+    useClass: GetTokenBySaltQueryHandler,
+  },
+];
diff --git a/packages/ats/sdk/src/domain/context/bond/Coupon.ts b/packages/ats/sdk/src/domain/context/bond/Coupon.ts
index 740413a7d..14c795033 100644
--- a/packages/ats/sdk/src/domain/context/bond/Coupon.ts
+++ b/packages/ats/sdk/src/domain/context/bond/Coupon.ts
@@ -211,6 +211,7 @@ export class Coupon extends ValidatedDomain<Coupon> {
   recordTimeStamp: number;
   executionTimeStamp: number;
   rate: BigDecimal;
+  period: number;
 
   snapshotId?: number;
 
@@ -218,6 +219,7 @@ export class Coupon extends ValidatedDomain<Coupon> {
     recordTimeStamp: number,
     executionTimeStamp: number,
     rate: BigDecimal,
+    period: number,
     snapshotId?: number,
   ) {
     super({
@@ -229,6 +231,7 @@ export class Coupon extends ValidatedDomain<Coupon> {
     this.recordTimeStamp = recordTimeStamp;
     this.executionTimeStamp = executionTimeStamp;
     this.rate = rate;
+    this.period = period;
     this.snapshotId = snapshotId ? snapshotId : undefined;
 
     ValidatedDomain.handleValidation(Coupon.name, this);
diff --git a/packages/ats/sdk/src/domain/context/factory/TRexFactory.ts b/packages/ats/sdk/src/domain/context/factory/TRexFactory.ts
new file mode 100644
index 000000000..f41a3b879
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/factory/TRexFactory.ts
@@ -0,0 +1,363 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { InvalidRequest } from '@command/error/InvalidRequest';
+import BaseError from '@core/error/BaseError';
+import ValidatedDomain from '@core/validation/ValidatedArgs';
+
+interface TrexTokenDetailsAtsProps {
+  owner: string;
+  irs: string;
+  onchainId: string;
+  irAgents: string[];
+  tokenAgents: string[];
+  compliancesModules: string[];
+  complianceSettings: string[];
+}
+
+interface TrexClaimDetailsProps {
+  claimTopics?: number[];
+  issuers: string[];
+  issuerClaims: number[][];
+}
+
+export class TrexTokenDetailsAts
+  extends ValidatedDomain<TrexTokenDetailsAts>
+  implements TrexTokenDetailsAtsProps
+{
+  public owner: string;
+  public irs: string;
+  public onchainId: string;
+  public irAgents: string[];
+  public tokenAgents: string[];
+  public compliancesModules: string[];
+  public complianceSettings: string[];
+
+  constructor(params: TrexTokenDetailsAtsProps) {
+    super({
+      irAgents: (val) => {
+        return TrexTokenDetailsAts.checkMaxAgents(val, params.tokenAgents);
+      },
+      tokenAgents: (val) => {
+        return TrexTokenDetailsAts.checkMaxAgents(params.irAgents, val);
+      },
+      compliancesModules: (val) => {
+        return TrexTokenDetailsAts.checkComplianceModules(
+          val,
+          params.complianceSettings,
+        );
+      },
+      complianceSettings: (val) => {
+        return TrexTokenDetailsAts.checkComplianceModules(
+          params.compliancesModules,
+          val,
+        );
+      },
+    });
+
+    const {
+      owner,
+      irs,
+      onchainId,
+      irAgents = [],
+      tokenAgents = [],
+      compliancesModules = [],
+      complianceSettings = [],
+    } = params;
+
+    this.owner = owner;
+    this.irs = irs;
+    this.onchainId = onchainId;
+    this.irAgents = irAgents;
+    this.tokenAgents = tokenAgents;
+    this.compliancesModules = compliancesModules;
+    this.complianceSettings = complianceSettings;
+
+    ValidatedDomain.handleValidation(TrexTokenDetailsAts.name, this);
+  }
+
+  public static checkMaxAgents(
+    irAgents: string[],
+    tokenAgents: string[],
+  ): BaseError[] {
+    const errorList: BaseError[] = [];
+
+    if (irAgents.length > 5 || tokenAgents.length > 5) {
+      errorList.push(new InvalidRequest('max 5 agents at deployment'));
+    }
+
+    return errorList;
+  }
+
+  public static checkComplianceModules(
+    compliancesModules: string[],
+    complianceSettings: string[],
+  ): BaseError[] {
+    const errorList: BaseError[] = [];
+
+    if (compliancesModules.length > 30) {
+      errorList.push(new InvalidRequest('max 30 module actions at deployment'));
+    }
+
+    if (compliancesModules.length < complianceSettings.length) {
+      errorList.push(new InvalidRequest('invalid compliance pattern'));
+    }
+
+    return errorList;
+  }
+}
+
+export class TrexClaimDetails
+  extends ValidatedDomain<TrexClaimDetails>
+  implements TrexClaimDetailsProps
+{
+  claimTopics: number[];
+  issuers: string[];
+  issuerClaims: number[][];
+
+  constructor(params: TrexClaimDetailsProps) {
+    super({
+      claimTopics: (val) => {
+        return TrexClaimDetails.checkClaimTopics(val);
+      },
+      issuers: (val) => {
+        return TrexClaimDetails.checkIssuers(val, params.issuerClaims);
+      },
+    });
+
+    const { claimTopics = [], issuers = [], issuerClaims = [] } = params;
+
+    this.claimTopics = claimTopics;
+    this.issuers = issuers;
+    this.issuerClaims = issuerClaims;
+
+    ValidatedDomain.handleValidation(TrexClaimDetails.name, this);
+  }
+
+  public static checkClaimTopics(value: number[]): BaseError[] {
+    const errorList: BaseError[] = [];
+
+    if (value.length > 5) {
+      errorList.push(new InvalidRequest('max 5 claim topics at deployment'));
+    }
+    return errorList;
+  }
+
+  public static checkIssuers(
+    issuers: string[],
+    issuerClaims: number[][],
+  ): BaseError[] {
+    const errorList: BaseError[] = [];
+
+    if (issuers.length > 5) {
+      errorList.push(new InvalidRequest('max 5 claim issuers at deployment'));
+    }
+
+    if (issuers.length !== issuerClaims.length) {
+      errorList.push(new InvalidRequest('claim pattern not valid'));
+    }
+    return errorList;
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/factory/error/InvalidTrexTokenSalt.ts b/packages/ats/sdk/src/domain/context/factory/error/InvalidTrexTokenSalt.ts
new file mode 100644
index 000000000..c2491c219
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/factory/error/InvalidTrexTokenSalt.ts
@@ -0,0 +1,212 @@
+/*
+																 Apache License
+													 Version 2.0, January 2004
+												http://www.apache.org/licenses/
+
+	 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+	 1. Definitions.
+
+			"License" shall mean the terms and conditions for use, reproduction,
+			and distribution as defined by Sections 1 through 9 of this document.
+
+			"Licensor" shall mean the copyright owner or entity authorized by
+			the copyright owner that is granting the License.
+
+			"Legal Entity" shall mean the union of the acting entity and all
+			other entities that control, are controlled by, or are under common
+			control with that entity. For the purposes of this definition,
+			"control" means (i) the power, direct or indirect, to cause the
+			direction or management of such entity, whether by contract or
+			otherwise, or (ii) ownership of fifty percent (50%) or more of the
+			outstanding shares, or (iii) beneficial ownership of such entity.
+
+			"You" (or "Your") shall mean an individual or Legal Entity
+			exercising permissions granted by this License.
+
+			"Source" form shall mean the preferred form for making modifications,
+			including but not limited to software source code, documentation
+			source, and configuration files.
+
+			"Object" form shall mean any form resulting from mechanical
+			transformation or translation of a Source form, including but
+			not limited to compiled object code, generated documentation,
+			and conversions to other media types.
+
+			"Work" shall mean the work of authorship, whether in Source or
+			Object form, made available under the License, as indicated by a
+			copyright notice that is included in or attached to the work
+			(an example is provided in the Appendix below).
+
+			"Derivative Works" shall mean any work, whether in Source or Object
+			form, that is based on (or derived from) the Work and for which the
+			editorial revisions, annotations, elaborations, or other modifications
+			represent, as a whole, an original work of authorship. For the purposes
+			of this License, Derivative Works shall not include works that remain
+			separable from, or merely link (or bind by name) to the interfaces of,
+			the Work and Derivative Works thereof.
+
+			"Contribution" shall mean any work of authorship, including
+			the original version of the Work and any modifications or additions
+			to that Work or Derivative Works thereof, that is intentionally
+			submitted to Licensor for inclusion in the Work by the copyright owner
+			or by an individual or Legal Entity authorized to submit on behalf of
+			the copyright owner. For the purposes of this definition, "submitted"
+			means any form of electronic, verbal, or written communication sent
+			to the Licensor or its representatives, including but not limited to
+			communication on electronic mailing lists, source code control systems,
+			and issue tracking systems that are managed by, or on behalf of, the
+			Licensor for the purpose of discussing and improving the Work, but
+			excluding communication that is conspicuously marked or otherwise
+			designated in writing by the copyright owner as "Not a Contribution."
+
+			"Contributor" shall mean Licensor and any individual or Legal Entity
+			on behalf of whom a Contribution has been received by Licensor and
+			subsequently incorporated within the Work.
+
+	 2. Grant of Copyright License. Subject to the terms and conditions of
+			this License, each Contributor hereby grants to You a perpetual,
+			worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+			copyright license to reproduce, prepare Derivative Works of,
+			publicly display, publicly perform, sublicense, and distribute the
+			Work and such Derivative Works in Source or Object form.
+
+	 3. Grant of Patent License. Subject to the terms and conditions of
+			this License, each Contributor hereby grants to You a perpetual,
+			worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+			(except as stated in this section) patent license to make, have made,
+			use, offer to sell, sell, import, and otherwise transfer the Work,
+			where such license applies only to those patent claims licensable
+			by such Contributor that are necessarily infringed by their
+			Contribution(s) alone or by combination of their Contribution(s)
+			with the Work to which such Contribution(s) was submitted. If You
+			institute patent litigation against any entity (including a
+			cross-claim or counterclaim in a lawsuit) alleging that the Work
+			or a Contribution incorporated within the Work constitutes direct
+			or contributory patent infringement, then any patent licenses
+			granted to You under this License for that Work shall terminate
+			as of the date such litigation is filed.
+
+	 4. Redistribution. You may reproduce and distribute copies of the
+			Work or Derivative Works thereof in any medium, with or without
+			modifications, and in Source or Object form, provided that You
+			meet the following conditions:
+
+			(a) You must give any other recipients of the Work or
+					Derivative Works a copy of this License; and
+
+			(b) You must cause any modified files to carry prominent notices
+					stating that You changed the files; and
+
+			(c) You must retain, in the Source form of any Derivative Works
+					that You distribute, all copyright, patent, trademark, and
+					attribution notices from the Source form of the Work,
+					excluding those notices that do not pertain to any part of
+					the Derivative Works; and
+
+			(d) If the Work includes a "NOTICE" text file as part of its
+					distribution, then any Derivative Works that You distribute must
+					include a readable copy of the attribution notices contained
+					within such NOTICE file, excluding those notices that do not
+					pertain to any part of the Derivative Works, in at least one
+					of the following places: within a NOTICE text file distributed
+					as part of the Derivative Works; within the Source form or
+					documentation, if provided along with the Derivative Works; or,
+					within a display generated by the Derivative Works, if and
+					wherever such third-party notices normally appear. The contents
+					of the NOTICE file are for informational purposes only and
+					do not modify the License. You may add Your own attribution
+					notices within Derivative Works that You distribute, alongside
+					or as an addendum to the NOTICE text from the Work, provided
+					that such additional attribution notices cannot be construed
+					as modifying the License.
+
+			You may add Your own copyright statement to Your modifications and
+			may provide additional or different license terms and conditions
+			for use, reproduction, or distribution of Your modifications, or
+			for any such Derivative Works as a whole, provided Your use,
+			reproduction, and distribution of the Work otherwise complies with
+			the conditions stated in this License.
+
+	 5. Submission of Contributions. Unless You explicitly state otherwise,
+			any Contribution intentionally submitted for inclusion in the Work
+			by You to the Licensor shall be under the terms and conditions of
+			this License, without any additional terms or conditions.
+			Notwithstanding the above, nothing herein shall supersede or modify
+			the terms of any separate license agreement you may have executed
+			with Licensor regarding such Contributions.
+
+	 6. Trademarks. This License does not grant permission to use the trade
+			names, trademarks, service marks, or product names of the Licensor,
+			except as required for reasonable and customary use in describing the
+			origin of the Work and reproducing the content of the NOTICE file.
+
+	 7. Disclaimer of Warranty. Unless required by applicable law or
+			agreed to in writing, Licensor provides the Work (and each
+			Contributor provides its Contributions) on an "AS IS" BASIS,
+			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+			implied, including, without limitation, any warranties or conditions
+			of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+			PARTICULAR PURPOSE. You are solely responsible for determining the
+			appropriateness of using or redistributing the Work and assume any
+			risks associated with Your exercise of permissions under this License.
+
+	 8. Limitation of Liability. In no event and under no legal theory,
+			whether in tort (including negligence), contract, or otherwise,
+			unless required by applicable law (such as deliberate and grossly
+			negligent acts) or agreed to in writing, shall any Contributor be
+			liable to You for damages, including any direct, indirect, special,
+			incidental, or consequential damages of any character arising as a
+			result of this License or out of the use or inability to use the
+			Work (including but not limited to damages for loss of goodwill,
+			work stoppage, computer failure or malfunction, or any and all
+			other commercial damages or losses), even if such Contributor
+			has been advised of the possibility of such damages.
+
+	 9. Accepting Warranty or Additional Liability. While redistributing
+			the Work or Derivative Works thereof, You may choose to offer,
+			and charge a fee for, acceptance of support, warranty, indemnity,
+			or other liability obligations and/or rights consistent with this
+			License. However, in accepting such obligations, You may act only
+			on Your own behalf and on Your sole responsibility, not on behalf
+			of any other Contributor, and only if You agree to indemnify,
+			defend, and hold each Contributor harmless for any liability
+			incurred by, or claims asserted against, such Contributor by reason
+			of your accepting any such warranty or additional liability.
+
+	 END OF TERMS AND CONDITIONS
+
+	 APPENDIX: How to apply the Apache License to your work.
+
+			To apply the Apache License to your work, attach the following
+			boilerplate notice, with the fields enclosed by brackets "[]"
+			replaced with your own identifying information. (Don't include
+			the brackets!)  The text should be enclosed in the appropriate
+			comment syntax for the file format. We also recommend that a
+			file or class name and description of purpose be included on the
+			same "printed page" as the copyright notice for easier
+			identification within third-party archives.
+
+	 Copyright [yyyy] [name of copyright owner]
+
+	 Licensed under the Apache License, Version 2.0 (the "License");
+	 you may not use this file except in compliance with the License.
+	 You may obtain a copy of the License at
+
+			 http://www.apache.org/licenses/LICENSE-2.0
+
+	 Unless required by applicable law or agreed to in writing, software
+	 distributed under the License is distributed on an "AS IS" BASIS,
+	 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	 See the License for the specific language governing permissions and
+	 limitations under the License.
+
+*/
+
+import BaseError, { ErrorCode } from '@core/error/BaseError';
+
+export class InvalidTrexTokenSalt extends BaseError {
+  constructor(value: string) {
+    super(ErrorCode.InvalidValue, `TREX Token Salt ${value} is not valid`);
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/security/Clearing.ts b/packages/ats/sdk/src/domain/context/security/Clearing.ts
index f33ad05f8..b3e9d6722 100644
--- a/packages/ats/sdk/src/domain/context/security/Clearing.ts
+++ b/packages/ats/sdk/src/domain/context/security/Clearing.ts
@@ -274,7 +274,7 @@ export class ClearingHoldCreation {
   expirationTimestamp: number;
   data: string;
   operatorData: string;
-  holdEscrow: string;
+  holdEscrowId: string;
   holdExpirationTimestamp: number;
   holdTo: string;
   holdData: string;
@@ -283,7 +283,7 @@ export class ClearingHoldCreation {
     expirationTimestamp: number,
     data: string,
     operatorData: string,
-    holdEscrow: string,
+    holdEscrowId: string,
     holdExpirationTimestamp: number,
     holdTo: string,
     holdData: string,
@@ -292,7 +292,7 @@ export class ClearingHoldCreation {
     this.expirationTimestamp = expirationTimestamp;
     this.data = data;
     this.operatorData = operatorData;
-    this.holdEscrow = holdEscrow;
+    this.holdEscrowId = holdEscrowId;
     this.holdExpirationTimestamp = holdExpirationTimestamp;
     this.holdTo = holdTo;
     this.holdData = holdData;
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/AccountBlocked.ts b/packages/ats/sdk/src/domain/context/security/error/operations/AccountBlocked.ts
new file mode 100644
index 000000000..e417bdf20
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/AccountBlocked.ts
@@ -0,0 +1,212 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import BaseError, { ErrorCode } from '@core/error/BaseError';
+
+export class AccountBlocked extends BaseError {
+  constructor() {
+    super(ErrorCode.AccountBlocked, 'Account is blocked');
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/AddressNotVerified.ts b/packages/ats/sdk/src/domain/context/security/error/operations/AddressNotVerified.ts
new file mode 100644
index 000000000..036ccc87a
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/AddressNotVerified.ts
@@ -0,0 +1,212 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import BaseError, { ErrorCode } from '@core/error/BaseError';
+
+export class AddressNotVerified extends BaseError {
+  constructor() {
+    super(ErrorCode.AddressNotVerified, 'Address not verified');
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/ComplianceNotAllowed.ts b/packages/ats/sdk/src/domain/context/security/error/operations/ComplianceNotAllowed.ts
new file mode 100644
index 000000000..b9eb99441
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/ComplianceNotAllowed.ts
@@ -0,0 +1,212 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import BaseError, { ErrorCode } from '@core/error/BaseError';
+
+export class ComplianceNotAllowed extends BaseError {
+  constructor() {
+    super(ErrorCode.ComplianceNotAllowed, 'Compliance rules not allowed');
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/InsufficientAllowance.ts b/packages/ats/sdk/src/domain/context/security/error/operations/InsufficientAllowance.ts
index 90f65f543..9cd1373ea 100644
--- a/packages/ats/sdk/src/domain/context/security/error/operations/InsufficientAllowance.ts
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/InsufficientAllowance.ts
@@ -206,10 +206,7 @@
 import BaseError, { ErrorCode } from '@core/error/BaseError';
 
 export class InsufficientAllowance extends BaseError {
-  constructor(fromId: string, spenderId: string) {
-    super(
-      ErrorCode.InsufficientAllowance,
-      `Insufficient allowance from ${fromId} to ${spenderId}`,
-    );
+  constructor() {
+    super(ErrorCode.InsufficientAllowance, `Insufficient allowance`);
   }
 }
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/InvalidKycStatus.ts b/packages/ats/sdk/src/domain/context/security/error/operations/InvalidKycStatus.ts
new file mode 100644
index 000000000..8ed36224b
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/InvalidKycStatus.ts
@@ -0,0 +1,212 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import BaseError, { ErrorCode } from '@core/error/BaseError';
+
+export class InvalidKycStatus extends BaseError {
+  constructor() {
+    super(ErrorCode.InvalidKycStatus, 'Invalid KYC status');
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/WalletRecovered.ts b/packages/ats/sdk/src/domain/context/security/error/operations/WalletRecovered.ts
new file mode 100644
index 000000000..34acadb39
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/WalletRecovered.ts
@@ -0,0 +1,212 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import BaseError, { ErrorCode } from '@core/error/BaseError';
+
+export class WalletRecovered extends BaseError {
+  constructor() {
+    super(ErrorCode.WalletRecovered, 'Wallet has been recovered');
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/ZeroAddressNotAllowed.ts b/packages/ats/sdk/src/domain/context/security/error/operations/ZeroAddressNotAllowed.ts
new file mode 100644
index 000000000..de8590934
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/ZeroAddressNotAllowed.ts
@@ -0,0 +1,212 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import BaseError, { ErrorCode } from '@core/error/BaseError';
+
+export class ZeroAddressNotAllowed extends BaseError {
+  constructor() {
+    super(ErrorCode.ZeroAddressNotAllowed, 'Zero address is not allowed');
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/codes.ts b/packages/ats/sdk/src/domain/context/security/error/operations/codes.ts
new file mode 100644
index 000000000..f1a5b185c
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/codes.ts
@@ -0,0 +1,309 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+/**
+ * EIP-1066 Status Codes
+ * Source: https://eips.ethereum.org/EIPS/eip-1066
+ */
+export const EIP1066_CODES = {
+  // 0x0* Generic
+  FAILURE: '0x00',
+  SUCCESS: '0x01',
+  AWAITING_OTHERS: '0x02',
+  ACCEPTED: '0x03',
+  LOWER_LIMIT_OR_INSUFFICIENT: '0x04',
+  RECEIVER_ACTION_REQUESTED: '0x05',
+  UPPER_LIMIT: '0x06',
+  DUPLICATE_UNNECESSARY_OR_INAPPLICABLE: '0x08',
+  INFORMATIONAL_OR_METADATA: '0x0f',
+
+  // 0x1* Permission & Control
+  DISALLOWED_OR_STOP: '0x10',
+  ALLOWED_OR_GO: '0x11',
+  AWAITING_OTHERS_PERMISSION: '0x12',
+  PERMISSION_REQUESTED: '0x13',
+  TOO_OPEN_OR_INSECURE: '0x14',
+  NEEDS_YOUR_PERMISSION_OR_CONTINUATION: '0x15',
+  REVOKED_OR_BANNED: '0x16',
+  NOT_APPLICABLE_TO_CURRENT_STATE: '0x18',
+  PERMISSION_DETAILS_OR_CONTROL_CONDITIONS: '0x1f',
+
+  // 0x2* Find, Inequalities & Range
+  NOT_FOUND_UNEQUAL_OR_OUT_OF_RANGE: '0x20',
+  FOUND_EQUAL_OR_IN_RANGE: '0x21',
+  AWAITING_MATCH: '0x22',
+  MATCH_REQUEST_SENT: '0x23',
+  BELOW_RANGE_OR_UNDERFLOW: '0x24',
+  REQUEST_FOR_MATCH: '0x25',
+  ABOVE_RANGE_OR_OVERFLOW: '0x26',
+  DUPLICATE_CONFLICT_OR_COLLISION: '0x28',
+  MATCHING_META_OR_INFO: '0x2f',
+
+  // 0x3* Negotiation & Governance
+  SENDER_DISAGREES_OR_NAY: '0x30',
+  SENDER_AGREES_OR_YEA: '0x31',
+  AWAITING_RATIFICATION: '0x32',
+  OFFER_SENT_OR_VOTED: '0x33',
+  QUORUM_NOT_REACHED: '0x34',
+  RECEIVER_RATIFICATION_REQUESTED: '0x35',
+  OFFER_OR_VOTE_LIMIT_REACHED: '0x36',
+  ALREADY_VOTED: '0x38',
+  NEGOTIATION_RULES_OR_PARTICIPATION_INFO: '0x3f',
+
+  // 0x4* Availability & Time
+  UNAVAILABLE: '0x40',
+  AVAILABLE: '0x41',
+  PAUSED: '0x42',
+  QUEUED: '0x43',
+  NOT_AVAILABLE_YET: '0x44',
+  AWAITING_YOUR_AVAILABILITY: '0x45',
+  EXPIRED: '0x46',
+  ALREADY_DONE: '0x48',
+  AVAILABILITY_RULES_OR_INFO: '0x4f',
+
+  // 0x5* Tokens, Funds & Finance
+  TRANSFER_FAILED: '0x50',
+  TRANSFER_SUCCESSFUL: '0x51',
+  AWAITING_PAYMENT_FROM_OTHERS: '0x52',
+  HOLD_OR_ESCROW: '0x53',
+  INSUFFICIENT_FUNDS: '0x54',
+  FUNDS_REQUESTED: '0x55',
+  TRANSFER_VOLUME_EXCEEDED: '0x56',
+  FUNDS_NOT_REQUIRED: '0x58',
+  TOKEN_OR_FINANCIAL_INFORMATION: '0x5f',
+
+  // 0xA* Application-Specific Codes
+  APP_SPECIFIC_FAILURE: '0xa0',
+  APP_SPECIFIC_SUCCESS: '0xa1',
+  APP_SPECIFIC_AWAITING_OTHERS: '0xa2',
+  APP_SPECIFIC_ACCEPTANCE: '0xa3',
+  APP_SPECIFIC_BELOW_CONDITION: '0xa4',
+  APP_SPECIFIC_RECEIVER_ACTION_REQUESTED: '0xa5',
+  APP_SPECIFIC_EXPIRY_OR_LIMIT: '0xa6',
+  APP_SPECIFIC_INAPPLICABLE_CONDITION: '0xa8',
+  APP_SPECIFIC_META_OR_INFO: '0xaf',
+
+  // 0xE* Encryption, Identity & Proofs
+  DECRYPT_FAILURE: '0xe0',
+  DECRYPT_SUCCESS: '0xe1',
+  AWAITING_OTHER_SIGNATURES_OR_KEYS: '0xe2',
+  SIGNED: '0xe3',
+  UNSIGNED_OR_UNTRUSTED: '0xe4',
+  SIGNATURE_REQUIRED: '0xe5',
+  KNOWN_TO_BE_COMPROMISED: '0xe6',
+  ALREADY_SIGNED_OR_NOT_ENCRYPTED: '0xe8',
+  CRYPTOGRAPHY_ID_OR_PROOF_METADATA: '0xef',
+
+  // 0xF* Off-Chain
+  OFF_CHAIN_FAILURE: '0xf0',
+  OFF_CHAIN_SUCCESS: '0xf1',
+  AWAITING_OFF_CHAIN_PROCESS: '0xf2',
+  OFF_CHAIN_PROCESS_STARTED: '0xf3',
+  OFF_CHAIN_SERVICE_UNREACHABLE: '0xf4',
+  OFF_CHAIN_ACTION_REQUIRED: '0xf5',
+  OFF_CHAIN_EXPIRY_OR_LIMIT_REACHED: '0xf6',
+  DUPLICATE_OFF_CHAIN_REQUEST: '0xf8',
+  OFF_CHAIN_INFO_OR_META: '0xff',
+} as const;
diff --git a/packages/ats/sdk/src/domain/context/security/error/operations/contractsErrorsMapper/ContractsErrorMapper.ts b/packages/ats/sdk/src/domain/context/security/error/operations/contractsErrorsMapper/ContractsErrorMapper.ts
index 016b7c420..675577f66 100644
--- a/packages/ats/sdk/src/domain/context/security/error/operations/contractsErrorsMapper/ContractsErrorMapper.ts
+++ b/packages/ats/sdk/src/domain/context/security/error/operations/contractsErrorsMapper/ContractsErrorMapper.ts
@@ -204,57 +204,121 @@
 */
 
 import BaseError, { ErrorCode } from '@core/error/BaseError';
-import { AccountNotKycd } from '../AccountNotKycd';
 import { ClearingActivated } from '../ClearingActivated';
 import { InsufficientAllowance } from '../InsufficientAllowance';
 import { InvalidPartition } from '../InvalidPartition';
-import { AccountIsNotOperator } from '../AccountIsNotOperator';
 import { InsufficientBalance } from '../InsufficientBalance';
-import { InvalidFromAccount } from '../InvalidFromAccount';
-import { InvalidDestinationAccount } from '../InvalidDestinationAccount';
-import { AccountNotInControlList } from '../AccountNotInControlList';
 import { SecurityPaused } from '../SecurityPaused';
-import { KycStatus } from '@domain/context/kyc/Kyc';
-import { AddressRecovered } from '../AddressRecovered';
+import { EIP1066_CODES } from '../codes';
+import { ethers } from 'ethers';
+import { ZeroAddressNotAllowed } from '../ZeroAddressNotAllowed';
+import { AccountBlocked } from '../AccountBlocked';
+import { ComplianceNotAllowed } from '../ComplianceNotAllowed';
+import { InvalidKycStatus } from '../InvalidKycStatus';
+import { WalletRecovered } from '../WalletRecovered';
+import { AddressNotVerified } from '../AddressNotVerified';
 
 export class ContractsErrorMapper {
-  static mapError(
-    errorCode: string,
-    operatorId: string,
-    sourceId?: string,
-    targetId?: string,
-  ): BaseError {
-    const errorMappings: {
-      [key: string]: (
-        sourceId?: string,
-        targetId?: string,
-        operatorId?: string,
-      ) => BaseError;
-    } = {
-      '0x40': () => new SecurityPaused(),
-      '0x41': (_1, _2, operatorId) => new AccountNotInControlList(operatorId!),
-      '0x42': (sourceId, _2, _3) => new AccountNotInControlList(sourceId!),
-      '0x43': (_1, targetId, _3) => new AccountNotInControlList(targetId!),
-      '0x44': () => new InvalidFromAccount(),
-      '0x45': () => new InvalidDestinationAccount(),
-      '0x46': () => new InsufficientBalance(),
-      '0x47': (sourceId, _2, operatorId) =>
-        new AccountIsNotOperator(sourceId!, operatorId!),
-      '0x48': () => new InvalidPartition(),
-      '0x49': (sourceId, _2, operatorId) =>
-        new InsufficientAllowance(sourceId!, operatorId!),
-      '0x50': (sourceId) => new AccountNotKycd(sourceId!, KycStatus.GRANTED),
-      '0x51': (_1, targetId) =>
-        new AccountNotKycd(targetId!, KycStatus.GRANTED),
-      '0x52': () => new ClearingActivated(),
-      '0x53': (_1, _2, operatorId) => new AddressRecovered(operatorId!),
-      '0x54': (sourceId, _2, _3) => new AddressRecovered(sourceId!),
-      '0x55': (_1, targetId, _3) => new AddressRecovered(targetId!),
-    };
+  static mapError(errorCode: string, reason: string): BaseError {
+    const normalizedErrorCode = errorCode.toLowerCase();
+    const normalizedReason = reason.toLowerCase().slice(0, 10);
+
+    const combinedKey = `${normalizedErrorCode}:${normalizedReason}`;
+    const errorFactory =
+      this.ERROR_MAPPINGS.get(combinedKey) ||
+      this.ERROR_MAPPINGS.get(normalizedErrorCode);
 
     return (
-      errorMappings[errorCode]?.(sourceId, targetId, operatorId) ||
-      new BaseError(ErrorCode.Unexpected, 'An unexpected error occurred.')
+      errorFactory?.() ||
+      new BaseError(
+        ErrorCode.Unexpected,
+        `Unexpected error code: ${errorCode} with reason: ${reason}`,
+      )
     );
   }
+
+  private static createSelector(signature: string): string {
+    return ethers.utils
+      .keccak256(ethers.utils.toUtf8Bytes(signature))
+      .slice(0, 10);
+  }
+
+  private static readonly SELECTORS = {
+    zeroAddressNotAllowed: this.createSelector('ZeroAddressNotAllowed()'),
+    accountIsBlocked: this.createSelector('AccountIsBlocked(address)'),
+    tokenIsPaused: this.createSelector('TokenIsPaused()'),
+    clearingIsActivated: this.createSelector('ClearingIsActivated()'),
+    complianceNotAllowed: this.createSelector('ComplianceNotAllowed()'),
+    invalidKycStatus: this.createSelector('InvalidKycStatus()'),
+    addressNotVerified: this.createSelector('AddressNotVerified()'),
+    walletRecovered: this.createSelector('WalletRecovered()'),
+    insufficientAllowance: this.createSelector(
+      'InsufficientAllowance(address,address)',
+    ),
+    invalidPartition: this.createSelector('InvalidPartition(address,bytes32)'),
+    insufficientBalance: this.createSelector(
+      'InsufficientBalance(address,uint256,uint256,bytes32)',
+    ),
+  };
+
+  private static readonly ERROR_MAPPINGS: Map<string, () => BaseError> =
+    new Map([
+      [
+        `${EIP1066_CODES.PAUSED}:${ContractsErrorMapper.SELECTORS.tokenIsPaused}`,
+        (): BaseError => new SecurityPaused(),
+      ],
+      [`${EIP1066_CODES.PAUSED}`, (): BaseError => new SecurityPaused()],
+      [
+        `${EIP1066_CODES.NOT_FOUND_UNEQUAL_OR_OUT_OF_RANGE}:${ContractsErrorMapper.SELECTORS.zeroAddressNotAllowed}`,
+        (): BaseError => new ZeroAddressNotAllowed(),
+      ],
+      [
+        `${EIP1066_CODES.NOT_FOUND_UNEQUAL_OR_OUT_OF_RANGE}:${ContractsErrorMapper.SELECTORS.accountIsBlocked}`,
+        (): BaseError => new AccountBlocked(),
+      ],
+      [
+        `${EIP1066_CODES.UNAVAILABLE}:${ContractsErrorMapper.SELECTORS.clearingIsActivated}`,
+        (): BaseError => new ClearingActivated(),
+      ],
+      [
+        `${EIP1066_CODES.DISALLOWED_OR_STOP}:${ContractsErrorMapper.SELECTORS.accountIsBlocked}`,
+        (): BaseError => new AccountBlocked(),
+      ],
+      [
+        `${EIP1066_CODES.DISALLOWED_OR_STOP}:${ContractsErrorMapper.SELECTORS.complianceNotAllowed}`,
+        (): BaseError => new ComplianceNotAllowed(),
+      ],
+      [
+        `${EIP1066_CODES.DISALLOWED_OR_STOP}:${ContractsErrorMapper.SELECTORS.invalidKycStatus}`,
+        (): BaseError => new InvalidKycStatus(),
+      ],
+      [
+        `${EIP1066_CODES.DISALLOWED_OR_STOP}:${ContractsErrorMapper.SELECTORS.addressNotVerified}`,
+        (): BaseError => new AddressNotVerified(),
+      ],
+      [
+        `${EIP1066_CODES.REVOKED_OR_BANNED}:${ContractsErrorMapper.SELECTORS.walletRecovered}`,
+        (): BaseError => new WalletRecovered(),
+      ],
+      [
+        `${EIP1066_CODES.INSUFFICIENT_FUNDS}:${ContractsErrorMapper.SELECTORS.insufficientAllowance}`,
+        (): BaseError => new InsufficientAllowance(),
+      ],
+      [
+        `${EIP1066_CODES.INSUFFICIENT_FUNDS}:${ContractsErrorMapper.SELECTORS.invalidPartition}`,
+        (): BaseError => new InvalidPartition(),
+      ],
+      [
+        `${EIP1066_CODES.INSUFFICIENT_FUNDS}:${ContractsErrorMapper.SELECTORS.insufficientBalance}`,
+        (): BaseError => new InsufficientBalance(),
+      ],
+      [
+        `${EIP1066_CODES.SUCCESS}`,
+        (): BaseError =>
+          new BaseError(
+            ErrorCode.Unexpected,
+            'Unexpected success code in error context',
+          ),
+      ],
+    ]);
 }
diff --git a/packages/ats/sdk/src/port/in/bond/Bond.ts b/packages/ats/sdk/src/port/in/bond/Bond.ts
index 20fd61fb8..9f69643c4 100644
--- a/packages/ats/sdk/src/port/in/bond/Bond.ts
+++ b/packages/ats/sdk/src/port/in/bond/Bond.ts
@@ -248,6 +248,8 @@ import {
 } from '../request';
 import { GetCouponHoldersQuery } from '@query/bond/coupons/getCouponHolders/GetCouponHoldersQuery';
 import { GetTotalCouponHoldersQuery } from '@query/bond/coupons/getTotalCouponHolders/GetTotalCouponHoldersQuery';
+import CreateTrexSuiteBondRequest from '../request/bond/CreateTrexSuiteBondRequest';
+import { CreateTrexSuiteBondCommand } from '@command/bond/createTrexSuite/CreateTrexSuiteBondCommand';
 
 interface IBondInPort {
   create(
@@ -271,6 +273,9 @@ interface IBondInPort {
   ): Promise<{ payload: boolean; transactionId: string }>;
   getCouponHolders(request: GetCouponHoldersRequest): Promise<string[]>;
   getTotalCouponHolders(request: GetTotalCouponHoldersRequest): Promise<number>;
+  createTrexSuite(
+    request: CreateTrexSuiteBondRequest,
+  ): Promise<{ security: SecurityViewModel; transactionId: string }>;
 }
 
 class BondInPort implements IBondInPort {
@@ -289,9 +294,9 @@ class BondInPort implements IBondInPort {
     ValidatedRequest.handleValidation('CreateBondRequest', req);
     const {
       diamondOwnerAccount,
-      externalPauses,
-      externalControlLists,
-      externalKycLists,
+      externalPausesIds,
+      externalControlListsIds,
+      externalKycListsIds,
     } = req;
 
     const securityFactory = this.networkService.configuration.factoryAddress;
@@ -334,9 +339,9 @@ class BondInPort implements IBondInPort {
         req.configId,
         req.configVersion,
         diamondOwnerAccount,
-        externalPauses,
-        externalControlLists,
-        externalKycLists,
+        externalPausesIds,
+        externalControlListsIds,
+        externalKycListsIds,
         req.complianceId,
         req.identityRegistryId,
       ),
@@ -387,7 +392,8 @@ class BondInPort implements IBondInPort {
   async setCoupon(
     request: SetCouponRequest,
   ): Promise<{ payload: number; transactionId: string }> {
-    const { rate, recordTimestamp, executionTimestamp, securityId } = request;
+    const { rate, recordTimestamp, executionTimestamp, securityId, period } =
+      request;
     ValidatedRequest.handleValidation('SetCouponRequest', request);
 
     return await this.commandBus.execute(
@@ -396,6 +402,7 @@ class BondInPort implements IBondInPort {
         recordTimestamp,
         executionTimestamp,
         rate,
+        period,
       ),
     );
   }
@@ -452,6 +459,7 @@ class BondInPort implements IBondInPort {
       recordDate: new Date(res.coupon.recordTimeStamp * ONE_THOUSAND),
       executionDate: new Date(res.coupon.executionTimeStamp * ONE_THOUSAND),
       rate: res.coupon.rate.toString(),
+      period: res.coupon.period,
     };
 
     return coupon;
@@ -545,6 +553,98 @@ class BondInPort implements IBondInPort {
       )
     ).payload;
   }
+
+  @LogError
+  async createTrexSuite(
+    req: CreateTrexSuiteBondRequest,
+  ): Promise<{ security: SecurityViewModel; transactionId: string }> {
+    ValidatedRequest.handleValidation('CreateTrexSuiteBondRequest', req);
+
+    const {
+      diamondOwnerAccount,
+      externalPauses,
+      externalControlLists,
+      externalKycLists,
+    } = req;
+
+    const securityFactory = this.networkService.configuration.factoryAddress;
+    const resolver = this.networkService.configuration.resolverAddress;
+
+    const newSecurity: SecurityProps = {
+      name: req.name,
+      symbol: req.symbol,
+      isin: req.isin,
+      decimals: req.decimals,
+      isWhiteList: req.isWhiteList,
+      isControllable: req.isControllable,
+      arePartitionsProtected: req.arePartitionsProtected,
+      clearingActive: req.clearingActive,
+      internalKycActivated: req.internalKycActivated,
+      isMultiPartition: req.isMultiPartition,
+      maxSupply: BigDecimal.fromString(req.numberOfUnits),
+      regulationType: CastRegulationType.fromNumber(req.regulationType),
+      regulationsubType: CastRegulationSubType.fromNumber(
+        req.regulationSubType,
+      ),
+      isCountryControlListWhiteList: req.isCountryControlListWhiteList,
+      countries: req.countries,
+      info: req.info,
+      erc20VotesActivated: req.erc20VotesActivated,
+    };
+
+    const createResponse = await this.commandBus.execute(
+      new CreateTrexSuiteBondCommand(
+        req.salt,
+        req.owner,
+        req.irs,
+        req.onchainId,
+        req.irAgents,
+        req.tokenAgents,
+        req.compliancesModules,
+        req.complianceSettings,
+        req.claimTopics,
+        req.issuers,
+        req.issuerClaims,
+        newSecurity,
+        req.currency,
+        req.nominalValue,
+        req.startingDate,
+        req.maturityDate,
+        req.couponFrequency,
+        req.couponRate,
+        req.firstCouponDate,
+        new ContractId(securityFactory),
+        new ContractId(resolver),
+        req.configId,
+        req.configVersion,
+        diamondOwnerAccount,
+        externalPauses,
+        externalControlLists,
+        externalKycLists,
+        req.complianceId,
+        req.identityRegistryId,
+      ),
+    );
+    const securityCreated =
+      createResponse.securityId.toString() !== ContractId.NULL.toString();
+
+    const res = securityCreated
+      ? (
+          await this.queryBus.execute(
+            new GetSecurityQuery(createResponse.securityId.toString()),
+          )
+        ).security
+      : {};
+
+    return {
+      security: securityCreated
+        ? {
+            ...res,
+          }
+        : {},
+      transactionId: createResponse.transactionId,
+    };
+  }
 }
 
 const BondToken = new BondInPort();
diff --git a/packages/ats/sdk/src/port/in/bond/Bond.unit.test.ts b/packages/ats/sdk/src/port/in/bond/Bond.unit.test.ts
index b2cd4f99e..eeb56b2a7 100644
--- a/packages/ats/sdk/src/port/in/bond/Bond.unit.test.ts
+++ b/packages/ats/sdk/src/port/in/bond/Bond.unit.test.ts
@@ -217,6 +217,7 @@ import {
   RedeemAtMaturityByPartitionRequest,
   GetCouponHoldersRequest,
   GetTotalCouponHoldersRequest,
+  CreateTrexSuiteBondRequest,
 } from '../request';
 import {
   HederaIdPropsFixture,
@@ -243,6 +244,7 @@ import {
   GetTotalCouponHoldersRequestFixture,
   SetCouponRequestFixture,
   UpdateMaturityDateRequestFixture,
+  CreateTrexSuiteBondRequestFixture,
 } from '@test/fixtures/bond/BondFixture';
 import { SecurityPropsFixture } from '@test/fixtures/shared/SecurityFixture';
 import { Security } from '@domain/context/security/Security';
@@ -266,6 +268,7 @@ import { UpdateMaturityDateCommand } from '@command/bond/updateMaturityDate/Upda
 import { RedeemAtMaturityByPartitionCommand } from '@command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommand';
 import { GetCouponHoldersQuery } from '@query/bond/coupons/getCouponHolders/GetCouponHoldersQuery';
 import { GetTotalCouponHoldersQuery } from '@query/bond/coupons/getTotalCouponHolders/GetTotalCouponHoldersQuery';
+import { CreateTrexSuiteBondCommand } from '@command/bond/createTrexSuite/CreateTrexSuiteBondCommand';
 
 describe('Bond', () => {
   let commandBusMock: jest.Mocked<CommandBus>;
@@ -283,6 +286,7 @@ describe('Bond', () => {
   let redeemAtMaturityByPartitionRequest: RedeemAtMaturityByPartitionRequest;
   let getCouponHoldersRequest: GetCouponHoldersRequest;
   let getTotalCouponHoldersRequest: GetTotalCouponHoldersRequest;
+  let createTrexSuiteBondRequest: CreateTrexSuiteBondRequest;
 
   let handleValidationSpy: jest.SpyInstance;
 
@@ -374,9 +378,9 @@ describe('Bond', () => {
           createBondRequest.configId,
           createBondRequest.configVersion,
           createBondRequest.diamondOwnerAccount,
-          createBondRequest.externalPauses,
-          createBondRequest.externalControlLists,
-          createBondRequest.externalKycLists,
+          createBondRequest.externalPausesIds,
+          createBondRequest.externalControlListsIds,
+          createBondRequest.externalKycListsIds,
           createBondRequest.complianceId,
           createBondRequest.identityRegistryId,
         ),
@@ -440,9 +444,9 @@ describe('Bond', () => {
           createBondRequest.configId,
           createBondRequest.configVersion,
           createBondRequest.diamondOwnerAccount,
-          createBondRequest.externalPauses,
-          createBondRequest.externalControlLists,
-          createBondRequest.externalKycLists,
+          createBondRequest.externalPausesIds,
+          createBondRequest.externalControlListsIds,
+          createBondRequest.externalKycListsIds,
           createBondRequest.complianceId,
           createBondRequest.identityRegistryId,
         ),
@@ -641,10 +645,10 @@ describe('Bond', () => {
       );
     });
 
-    it('should throw error if externalPauses is invalid', async () => {
+    it('should throw error if externalPausesIds is invalid', async () => {
       createBondRequest = new CreateBondRequest(
         CreateBondRequestFixture.create({
-          externalPauses: ['invalid'],
+          externalPausesIds: ['invalid'],
         }),
       );
 
@@ -653,10 +657,10 @@ describe('Bond', () => {
       );
     });
 
-    it('should throw error if externalControlLists is invalid', async () => {
+    it('should throw error if externalControlListsIds is invalid', async () => {
       createBondRequest = new CreateBondRequest(
         CreateBondRequestFixture.create({
-          externalControlLists: ['invalid'],
+          externalControlListsIds: ['invalid'],
         }),
       );
 
@@ -665,10 +669,10 @@ describe('Bond', () => {
       );
     });
 
-    it('should throw error if externalKycLists is invalid', async () => {
+    it('should throw error if externalKycListsIds is invalid', async () => {
       createBondRequest = new CreateBondRequest(
         CreateBondRequestFixture.create({
-          externalKycLists: ['invalid'],
+          externalKycListsIds: ['invalid'],
         }),
       );
 
@@ -771,6 +775,7 @@ describe('Bond', () => {
           setCouponRequest.recordTimestamp,
           setCouponRequest.executionTimestamp,
           setCouponRequest.rate,
+          setCouponRequest.period,
         ),
       );
 
@@ -796,6 +801,7 @@ describe('Bond', () => {
           setCouponRequest.recordTimestamp,
           setCouponRequest.executionTimestamp,
           setCouponRequest.rate,
+          setCouponRequest.period,
         ),
       );
     });
@@ -1551,4 +1557,402 @@ describe('Bond', () => {
       ).rejects.toThrow(ValidationError);
     });
   });
+
+  describe('createTrexSuite', () => {
+    createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+      CreateTrexSuiteBondRequestFixture.create(),
+    );
+    it('should create successfully', async () => {
+      const expectedResponse = {
+        securityId: new ContractId(HederaIdPropsFixture.create().value),
+        transactionId: transactionId,
+      };
+
+      commandBusMock.execute.mockResolvedValue(expectedResponse);
+      queryBusMock.execute.mockResolvedValue({
+        security: security,
+      });
+
+      const result = await BondToken.createTrexSuite(
+        createTrexSuiteBondRequest,
+      );
+
+      expect(handleValidationSpy).toHaveBeenCalledWith(
+        'CreateTrexSuiteBondRequest',
+        createTrexSuiteBondRequest,
+      );
+
+      expect(commandBusMock.execute).toHaveBeenCalledTimes(1);
+      expect(queryBusMock.execute).toHaveBeenCalledTimes(1);
+
+      expect(commandBusMock.execute).toHaveBeenCalledWith(
+        new CreateTrexSuiteBondCommand(
+          createTrexSuiteBondRequest.salt,
+          createTrexSuiteBondRequest.owner,
+          createTrexSuiteBondRequest.irs,
+          createTrexSuiteBondRequest.onchainId,
+          createTrexSuiteBondRequest.irAgents,
+          createTrexSuiteBondRequest.tokenAgents,
+          createTrexSuiteBondRequest.compliancesModules,
+          createTrexSuiteBondRequest.complianceSettings,
+          createTrexSuiteBondRequest.claimTopics,
+          createTrexSuiteBondRequest.issuers,
+          createTrexSuiteBondRequest.issuerClaims,
+          expect.objectContaining({
+            name: createTrexSuiteBondRequest.name,
+            symbol: createTrexSuiteBondRequest.symbol,
+            isin: createTrexSuiteBondRequest.isin,
+            decimals: createTrexSuiteBondRequest.decimals,
+            isWhiteList: createTrexSuiteBondRequest.isWhiteList,
+            isControllable: createTrexSuiteBondRequest.isControllable,
+            arePartitionsProtected:
+              createTrexSuiteBondRequest.arePartitionsProtected,
+            clearingActive: createTrexSuiteBondRequest.clearingActive,
+            internalKycActivated:
+              createTrexSuiteBondRequest.internalKycActivated,
+            isMultiPartition: createTrexSuiteBondRequest.isMultiPartition,
+            maxSupply: BigDecimal.fromString(
+              createTrexSuiteBondRequest.numberOfUnits,
+            ),
+            regulationType: CastRegulationType.fromNumber(
+              createTrexSuiteBondRequest.regulationType,
+            ),
+            regulationsubType: CastRegulationSubType.fromNumber(
+              createTrexSuiteBondRequest.regulationSubType,
+            ),
+            isCountryControlListWhiteList:
+              createTrexSuiteBondRequest.isCountryControlListWhiteList,
+            countries: createTrexSuiteBondRequest.countries,
+            info: createTrexSuiteBondRequest.info,
+          }),
+          createTrexSuiteBondRequest.currency,
+          createTrexSuiteBondRequest.nominalValue,
+          createTrexSuiteBondRequest.startingDate,
+          createTrexSuiteBondRequest.maturityDate,
+          createTrexSuiteBondRequest.couponFrequency,
+          createTrexSuiteBondRequest.couponRate,
+          createTrexSuiteBondRequest.firstCouponDate,
+          new ContractId(factoryAddress),
+          new ContractId(resolverAddress),
+          createTrexSuiteBondRequest.configId,
+          createTrexSuiteBondRequest.configVersion,
+          createTrexSuiteBondRequest.diamondOwnerAccount,
+          createTrexSuiteBondRequest.externalPauses,
+          createTrexSuiteBondRequest.externalControlLists,
+          createTrexSuiteBondRequest.externalKycLists,
+          createTrexSuiteBondRequest.complianceId,
+          createTrexSuiteBondRequest.identityRegistryId,
+        ),
+      );
+
+      expect(result).toEqual(
+        expect.objectContaining({
+          security: security,
+          transactionId: expectedResponse.transactionId,
+        }),
+      );
+    });
+
+    it('should throw an error if command execution fails', async () => {
+      const error = new Error('Command execution failed');
+      commandBusMock.execute.mockRejectedValue(error);
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow('Command execution failed');
+
+      expect(handleValidationSpy).toHaveBeenCalledWith(
+        'CreateTrexSuiteBondRequest',
+        createTrexSuiteBondRequest,
+      );
+
+      expect(commandBusMock.execute).toHaveBeenCalledWith(
+        new CreateTrexSuiteBondCommand(
+          createTrexSuiteBondRequest.salt,
+          createTrexSuiteBondRequest.owner,
+          createTrexSuiteBondRequest.irs,
+          createTrexSuiteBondRequest.onchainId,
+          createTrexSuiteBondRequest.irAgents,
+          createTrexSuiteBondRequest.tokenAgents,
+          createTrexSuiteBondRequest.compliancesModules,
+          createTrexSuiteBondRequest.complianceSettings,
+          createTrexSuiteBondRequest.claimTopics,
+          createTrexSuiteBondRequest.issuers,
+          createTrexSuiteBondRequest.issuerClaims,
+          expect.objectContaining({
+            name: createTrexSuiteBondRequest.name,
+            symbol: createTrexSuiteBondRequest.symbol,
+            isin: createTrexSuiteBondRequest.isin,
+            decimals: createTrexSuiteBondRequest.decimals,
+            isWhiteList: createTrexSuiteBondRequest.isWhiteList,
+            isControllable: createTrexSuiteBondRequest.isControllable,
+            arePartitionsProtected:
+              createTrexSuiteBondRequest.arePartitionsProtected,
+            clearingActive: createTrexSuiteBondRequest.clearingActive,
+            internalKycActivated:
+              createTrexSuiteBondRequest.internalKycActivated,
+            isMultiPartition: createTrexSuiteBondRequest.isMultiPartition,
+            maxSupply: BigDecimal.fromString(
+              createTrexSuiteBondRequest.numberOfUnits,
+            ),
+            regulationType: CastRegulationType.fromNumber(
+              createTrexSuiteBondRequest.regulationType,
+            ),
+            regulationsubType: CastRegulationSubType.fromNumber(
+              createTrexSuiteBondRequest.regulationSubType,
+            ),
+            isCountryControlListWhiteList:
+              createTrexSuiteBondRequest.isCountryControlListWhiteList,
+            countries: createTrexSuiteBondRequest.countries,
+            info: createTrexSuiteBondRequest.info,
+          }),
+          createTrexSuiteBondRequest.currency,
+          createTrexSuiteBondRequest.nominalValue,
+          createTrexSuiteBondRequest.startingDate,
+          createTrexSuiteBondRequest.maturityDate,
+          createTrexSuiteBondRequest.couponFrequency,
+          createTrexSuiteBondRequest.couponRate,
+          createTrexSuiteBondRequest.firstCouponDate,
+          new ContractId(factoryAddress),
+          new ContractId(resolverAddress),
+          createTrexSuiteBondRequest.configId,
+          createTrexSuiteBondRequest.configVersion,
+          createTrexSuiteBondRequest.diamondOwnerAccount,
+          createTrexSuiteBondRequest.externalPauses,
+          createTrexSuiteBondRequest.externalControlLists,
+          createTrexSuiteBondRequest.externalKycLists,
+          createTrexSuiteBondRequest.complianceId,
+          createTrexSuiteBondRequest.identityRegistryId,
+        ),
+      );
+    });
+
+    it('should throw error if name is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({ name: '' }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if symbol is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          symbol: '',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if isin is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          isin: '',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if decimals is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          decimals: 2.85,
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if diamondOwnerAccount is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          diamondOwnerAccount: 'invalid',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if currency is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          currency: 'invalid',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if numberOfUnits is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          numberOfUnits: 'invalid',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if nominalValue is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          nominalValue: 'invalid',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if startingDate is invalid', async () => {
+      const time = faker.date.past().getTime();
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          startingDate: time.toString(),
+          maturityDate: (time + 10).toString(),
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if maturityDate is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          maturityDate: faker.date.past().getTime().toString(),
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if couponFrequency is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          couponFrequency: 'invalid',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if couponRate is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          couponRate: 'invalid',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if firstCouponDate is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          firstCouponDate: faker.date.past().getTime().toString(),
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if regulationType is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          regulationType: 5,
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if regulationSubType is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          regulationSubType: 5,
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if configId is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          configId: 'invalid',
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if externalPauses is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          externalPauses: ['invalid'],
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if externalControlLists is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          externalControlLists: ['invalid'],
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if externalKycLists is invalid', async () => {
+      createTrexSuiteBondRequest = new CreateTrexSuiteBondRequest(
+        CreateTrexSuiteBondRequestFixture.create({
+          externalKycLists: ['invalid'],
+        }),
+      );
+
+      await expect(
+        BondToken.createTrexSuite(createTrexSuiteBondRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+  });
 });
diff --git a/packages/ats/sdk/src/port/in/equity/Equity.ts b/packages/ats/sdk/src/port/in/equity/Equity.ts
index 2b6c2584b..512b4bb29 100644
--- a/packages/ats/sdk/src/port/in/equity/Equity.ts
+++ b/packages/ats/sdk/src/port/in/equity/Equity.ts
@@ -262,6 +262,8 @@ import GetDividendHoldersRequest from '../request/equity/GetDividendHoldersReque
 import GetTotalDividendHoldersRequest from '../request/equity/GetTotalDividendHoldersRequest';
 import GetVotingHoldersRequest from '../request/equity/GetVotingHoldersRequest';
 import GetTotalVotingHoldersRequest from '../request/equity/GetTotalVotingHoldersRequest';
+import CreateTrexSuiteEquityRequest from '../request/equity/CreateTrexSuiteEquityRequest';
+import { CreateTrexSuiteEquityCommand } from '@command/equity/createTrexSuite/CreateTrexSuiteEquityCommand';
 interface IEquityInPort {
   create(request: CreateEquityRequest): Promise<{
     security: SecurityViewModel;
@@ -310,6 +312,11 @@ interface IEquityInPort {
   ): Promise<number>;
   getVotingHolders(request: GetVotingHoldersRequest): Promise<string[]>;
   getTotalVotingHolders(request: GetTotalVotingHoldersRequest): Promise<number>;
+
+  createTrexSuite(request: CreateTrexSuiteEquityRequest): Promise<{
+    security: SecurityViewModel;
+    transactionId: string;
+  }>;
 }
 
 class EquityInPort implements IEquityInPort {
@@ -320,6 +327,101 @@ class EquityInPort implements IEquityInPort {
       NetworkService,
     ),
   ) {}
+  @LogError
+  async createTrexSuite(req: CreateTrexSuiteEquityRequest): Promise<{
+    security: SecurityViewModel;
+    transactionId: string;
+  }> {
+    ValidatedRequest.handleValidation('CreateTrexSuiteEquityRequest', req);
+    const {
+      diamondOwnerAccount,
+      externalPauses,
+      externalControlLists,
+      externalKycLists,
+    } = req;
+
+    const securityFactory = this.networkService.configuration.factoryAddress;
+    const resolver = this.networkService.configuration.resolverAddress;
+
+    const newSecurity: SecurityProps = {
+      name: req.name,
+      symbol: req.symbol,
+      isin: req.isin,
+      decimals: req.decimals,
+      isWhiteList: req.isWhiteList,
+      isControllable: req.isControllable,
+      arePartitionsProtected: req.arePartitionsProtected,
+      clearingActive: req.clearingActive,
+      internalKycActivated: req.internalKycActivated,
+      isMultiPartition: req.isMultiPartition,
+      maxSupply: BigDecimal.fromString(req.numberOfShares),
+      regulationType: CastRegulationType.fromNumber(req.regulationType),
+      regulationsubType: CastRegulationSubType.fromNumber(
+        req.regulationSubType,
+      ),
+      isCountryControlListWhiteList: req.isCountryControlListWhiteList,
+      countries: req.countries,
+      info: req.info,
+      erc20VotesActivated: req.erc20VotesActivated,
+    };
+
+    const createResponse = await this.commandBus.execute(
+      new CreateTrexSuiteEquityCommand(
+        req.salt,
+        req.owner,
+        req.irs,
+        req.onchainId,
+        req.irAgents,
+        req.tokenAgents,
+        req.compliancesModules,
+        req.complianceSettings,
+        req.claimTopics,
+        req.issuers,
+        req.issuerClaims,
+        newSecurity,
+        req.votingRight,
+        req.informationRight,
+        req.liquidationRight,
+        req.subscriptionRight,
+        req.conversionRight,
+        req.redemptionRight,
+        req.putRight,
+        CastDividendType.fromNumber(req.dividendRight),
+        req.currency,
+        req.nominalValue,
+        new ContractId(securityFactory),
+        new ContractId(resolver),
+        req.configId,
+        req.configVersion,
+        diamondOwnerAccount,
+        externalPauses,
+        externalControlLists,
+        externalKycLists,
+        req.complianceId,
+        req.identityRegistryId,
+      ),
+    );
+
+    const securityCreated =
+      createResponse.securityId.toString() !== ContractId.NULL.toString();
+
+    const res = securityCreated
+      ? (
+          await this.queryBus.execute(
+            new GetSecurityQuery(createResponse.securityId.toString()),
+          )
+        ).security
+      : {};
+
+    return {
+      security: securityCreated
+        ? {
+            ...res,
+          }
+        : {},
+      transactionId: createResponse.transactionId,
+    };
+  }
 
   @LogError
   async create(
@@ -328,9 +430,9 @@ class EquityInPort implements IEquityInPort {
     ValidatedRequest.handleValidation('CreateEquityRequest', req);
     const {
       diamondOwnerAccount,
-      externalPauses,
-      externalControlLists,
-      externalKycLists,
+      externalPausesIds,
+      externalControlListsIds,
+      externalKycListsIds,
     } = req;
 
     const securityFactory = this.networkService.configuration.factoryAddress;
@@ -376,9 +478,9 @@ class EquityInPort implements IEquityInPort {
         req.configId,
         req.configVersion,
         diamondOwnerAccount,
-        externalPauses,
-        externalControlLists,
-        externalKycLists,
+        externalPausesIds,
+        externalControlListsIds,
+        externalKycListsIds,
         req.complianceId,
         req.identityRegistryId,
       ),
diff --git a/packages/ats/sdk/src/port/in/equity/Equity.unit.test.ts b/packages/ats/sdk/src/port/in/equity/Equity.unit.test.ts
index 797749f4e..2602f1383 100644
--- a/packages/ats/sdk/src/port/in/equity/Equity.unit.test.ts
+++ b/packages/ats/sdk/src/port/in/equity/Equity.unit.test.ts
@@ -224,6 +224,7 @@ import {
   GetTotalDividendHoldersRequest,
   GetVotingHoldersRequest,
   GetTotalVotingHoldersRequest,
+  CreateTrexSuiteEquityRequest,
 } from '../request';
 import {
   HederaIdPropsFixture,
@@ -247,6 +248,7 @@ import { BigNumber } from 'ethers';
 import EquityToken from './Equity';
 import {
   CreateEquityRequestFixture,
+  CreateTrexSuiteEquityRequestFixture,
   DividendFixture,
   EquityDetailsFixture,
   GetAllDividendsRequestFixture,
@@ -287,6 +289,7 @@ import { GetDividendHoldersQuery } from '@query/equity/dividends/getDividendHold
 import { GetTotalDividendHoldersQuery } from '@query/equity/dividends/getTotalDividendHolders/GetTotalDividendHoldersQuery';
 import { GetVotingHoldersQuery } from '@query/equity/votingRights/getVotingHolders/GetVotingHoldersQuery';
 import { GetTotalVotingHoldersQuery } from '@query/equity/votingRights/getTotalVotingHolders/GetTotalVotingHoldersQuery';
+import { CreateTrexSuiteEquityCommand } from '@command/equity/createTrexSuite/CreateTrexSuiteEquityCommand';
 
 describe('Equity', () => {
   let commandBusMock: jest.Mocked<CommandBus>;
@@ -311,6 +314,7 @@ describe('Equity', () => {
   let getTotalDividendHoldersRequest: GetTotalDividendHoldersRequest;
   let getVotingHoldersRequest: GetVotingHoldersRequest;
   let getTotalVotingHoldersRequest: GetTotalVotingHoldersRequest;
+  let createTrexSuiteEquityRequest: CreateTrexSuiteEquityRequest;
 
   let handleValidationSpy: jest.SpyInstance;
 
@@ -407,9 +411,9 @@ describe('Equity', () => {
           createEquityRequest.configId,
           createEquityRequest.configVersion,
           createEquityRequest.diamondOwnerAccount,
-          createEquityRequest.externalPauses,
-          createEquityRequest.externalControlLists,
-          createEquityRequest.externalKycLists,
+          createEquityRequest.externalPausesIds,
+          createEquityRequest.externalControlListsIds,
+          createEquityRequest.externalKycListsIds,
           createEquityRequest.complianceId,
           createEquityRequest.identityRegistryId,
         ),
@@ -478,9 +482,9 @@ describe('Equity', () => {
           createEquityRequest.configId,
           createEquityRequest.configVersion,
           createEquityRequest.diamondOwnerAccount,
-          createEquityRequest.externalPauses,
-          createEquityRequest.externalControlLists,
-          createEquityRequest.externalKycLists,
+          createEquityRequest.externalPausesIds,
+          createEquityRequest.externalControlListsIds,
+          createEquityRequest.externalKycListsIds,
           createEquityRequest.complianceId,
           createEquityRequest.identityRegistryId,
         ),
@@ -629,10 +633,10 @@ describe('Equity', () => {
       );
     });
 
-    it('should throw error if externalPauses is invalid', async () => {
+    it('should throw error if externalPausesIds is invalid', async () => {
       createEquityRequest = new CreateEquityRequest(
         CreateEquityRequestFixture.create({
-          externalPauses: ['invalid'],
+          externalPausesIds: ['invalid'],
         }),
       );
 
@@ -641,10 +645,10 @@ describe('Equity', () => {
       );
     });
 
-    it('should throw error if externalControlLists is invalid', async () => {
+    it('should throw error if externalControlListsIds is invalid', async () => {
       createEquityRequest = new CreateEquityRequest(
         CreateEquityRequestFixture.create({
-          externalControlLists: ['invalid'],
+          externalControlListsIds: ['invalid'],
         }),
       );
 
@@ -653,10 +657,10 @@ describe('Equity', () => {
       );
     });
 
-    it('should throw error if externalKycLists is invalid', async () => {
+    it('should throw error if externalKycListsIds is invalid', async () => {
       createEquityRequest = new CreateEquityRequest(
         CreateEquityRequestFixture.create({
-          externalKycLists: ['invalid'],
+          externalKycListsIds: ['invalid'],
         }),
       );
 
@@ -2233,4 +2237,362 @@ describe('Equity', () => {
       ).rejects.toThrow(ValidationError);
     });
   });
+
+  describe('createTrexSuite', () => {
+    createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+      CreateTrexSuiteEquityRequestFixture.create(),
+    );
+    it('should create equity successfully', async () => {
+      const expectedResponse = {
+        securityId: new ContractId(HederaIdPropsFixture.create().value),
+        transactionId: transactionId,
+      };
+
+      commandBusMock.execute.mockResolvedValue(expectedResponse);
+      queryBusMock.execute.mockResolvedValue({
+        security: security,
+      });
+
+      const result = await EquityToken.createTrexSuite(
+        createTrexSuiteEquityRequest,
+      );
+
+      expect(handleValidationSpy).toHaveBeenCalledWith(
+        'CreateTrexSuiteEquityRequest',
+        createTrexSuiteEquityRequest,
+      );
+
+      expect(commandBusMock.execute).toHaveBeenCalledTimes(1);
+      expect(queryBusMock.execute).toHaveBeenCalledTimes(1);
+
+      expect(commandBusMock.execute).toHaveBeenCalledWith(
+        new CreateTrexSuiteEquityCommand(
+          createTrexSuiteEquityRequest.salt,
+          createTrexSuiteEquityRequest.owner,
+          createTrexSuiteEquityRequest.irs,
+          createTrexSuiteEquityRequest.onchainId,
+          createTrexSuiteEquityRequest.irAgents,
+          createTrexSuiteEquityRequest.tokenAgents,
+          createTrexSuiteEquityRequest.compliancesModules,
+          createTrexSuiteEquityRequest.complianceSettings,
+          createTrexSuiteEquityRequest.claimTopics,
+          createTrexSuiteEquityRequest.issuers,
+          createTrexSuiteEquityRequest.issuerClaims,
+          expect.objectContaining({
+            name: createTrexSuiteEquityRequest.name,
+            symbol: createTrexSuiteEquityRequest.symbol,
+            isin: createTrexSuiteEquityRequest.isin,
+            decimals: createTrexSuiteEquityRequest.decimals,
+            isWhiteList: createTrexSuiteEquityRequest.isWhiteList,
+            isControllable: createTrexSuiteEquityRequest.isControllable,
+            arePartitionsProtected:
+              createTrexSuiteEquityRequest.arePartitionsProtected,
+            clearingActive: createTrexSuiteEquityRequest.clearingActive,
+            internalKycActivated:
+              createTrexSuiteEquityRequest.internalKycActivated,
+            isMultiPartition: createTrexSuiteEquityRequest.isMultiPartition,
+            maxSupply: BigDecimal.fromString(
+              createTrexSuiteEquityRequest.numberOfShares,
+            ),
+            regulationType: CastRegulationType.fromNumber(
+              createTrexSuiteEquityRequest.regulationType,
+            ),
+            regulationsubType: CastRegulationSubType.fromNumber(
+              createTrexSuiteEquityRequest.regulationSubType,
+            ),
+            isCountryControlListWhiteList:
+              createTrexSuiteEquityRequest.isCountryControlListWhiteList,
+            countries: createTrexSuiteEquityRequest.countries,
+            info: createTrexSuiteEquityRequest.info,
+          }),
+          createTrexSuiteEquityRequest.votingRight,
+          createTrexSuiteEquityRequest.informationRight,
+          createTrexSuiteEquityRequest.liquidationRight,
+          createTrexSuiteEquityRequest.subscriptionRight,
+          createTrexSuiteEquityRequest.conversionRight,
+          createTrexSuiteEquityRequest.redemptionRight,
+          createTrexSuiteEquityRequest.putRight,
+          CastDividendType.fromNumber(
+            createTrexSuiteEquityRequest.dividendRight,
+          ),
+          createTrexSuiteEquityRequest.currency,
+          createTrexSuiteEquityRequest.nominalValue,
+          new ContractId(factoryAddress),
+          new ContractId(resolverAddress),
+          createTrexSuiteEquityRequest.configId,
+          createTrexSuiteEquityRequest.configVersion,
+          createTrexSuiteEquityRequest.diamondOwnerAccount,
+          createTrexSuiteEquityRequest.externalPauses,
+          createTrexSuiteEquityRequest.externalControlLists,
+          createTrexSuiteEquityRequest.externalKycLists,
+          createTrexSuiteEquityRequest.complianceId,
+          createTrexSuiteEquityRequest.identityRegistryId,
+        ),
+      );
+
+      expect(result).toEqual(
+        expect.objectContaining({
+          security: security,
+          transactionId: expectedResponse.transactionId,
+        }),
+      );
+    });
+
+    it('should throw an error if command execution fails', async () => {
+      const error = new Error('Command execution failed');
+      commandBusMock.execute.mockRejectedValue(error);
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow('Command execution failed');
+
+      expect(handleValidationSpy).toHaveBeenCalledWith(
+        'CreateTrexSuiteEquityRequest',
+        createTrexSuiteEquityRequest,
+      );
+
+      expect(commandBusMock.execute).toHaveBeenCalledWith(
+        new CreateTrexSuiteEquityCommand(
+          createTrexSuiteEquityRequest.salt,
+          createTrexSuiteEquityRequest.owner,
+          createTrexSuiteEquityRequest.irs,
+          createTrexSuiteEquityRequest.onchainId,
+          createTrexSuiteEquityRequest.irAgents,
+          createTrexSuiteEquityRequest.tokenAgents,
+          createTrexSuiteEquityRequest.compliancesModules,
+          createTrexSuiteEquityRequest.complianceSettings,
+          createTrexSuiteEquityRequest.claimTopics,
+          createTrexSuiteEquityRequest.issuers,
+          createTrexSuiteEquityRequest.issuerClaims,
+          expect.objectContaining({
+            name: createTrexSuiteEquityRequest.name,
+            symbol: createTrexSuiteEquityRequest.symbol,
+            isin: createTrexSuiteEquityRequest.isin,
+            decimals: createTrexSuiteEquityRequest.decimals,
+            isWhiteList: createTrexSuiteEquityRequest.isWhiteList,
+            isControllable: createTrexSuiteEquityRequest.isControllable,
+            arePartitionsProtected:
+              createTrexSuiteEquityRequest.arePartitionsProtected,
+            clearingActive: createTrexSuiteEquityRequest.clearingActive,
+            internalKycActivated:
+              createTrexSuiteEquityRequest.internalKycActivated,
+            isMultiPartition: createTrexSuiteEquityRequest.isMultiPartition,
+            maxSupply: BigDecimal.fromString(
+              createTrexSuiteEquityRequest.numberOfShares,
+            ),
+            regulationType: CastRegulationType.fromNumber(
+              createTrexSuiteEquityRequest.regulationType,
+            ),
+            regulationsubType: CastRegulationSubType.fromNumber(
+              createTrexSuiteEquityRequest.regulationSubType,
+            ),
+            isCountryControlListWhiteList:
+              createTrexSuiteEquityRequest.isCountryControlListWhiteList,
+            countries: createTrexSuiteEquityRequest.countries,
+            info: createTrexSuiteEquityRequest.info,
+          }),
+          createTrexSuiteEquityRequest.votingRight,
+          createTrexSuiteEquityRequest.informationRight,
+          createTrexSuiteEquityRequest.liquidationRight,
+          createTrexSuiteEquityRequest.subscriptionRight,
+          createTrexSuiteEquityRequest.conversionRight,
+          createTrexSuiteEquityRequest.redemptionRight,
+          createTrexSuiteEquityRequest.putRight,
+          CastDividendType.fromNumber(
+            createTrexSuiteEquityRequest.dividendRight,
+          ),
+          createTrexSuiteEquityRequest.currency,
+          createTrexSuiteEquityRequest.nominalValue,
+          new ContractId(factoryAddress),
+          new ContractId(resolverAddress),
+          createTrexSuiteEquityRequest.configId,
+          createTrexSuiteEquityRequest.configVersion,
+          createTrexSuiteEquityRequest.diamondOwnerAccount,
+          createTrexSuiteEquityRequest.externalPauses,
+          createTrexSuiteEquityRequest.externalControlLists,
+          createTrexSuiteEquityRequest.externalKycLists,
+          createTrexSuiteEquityRequest.complianceId,
+          createTrexSuiteEquityRequest.identityRegistryId,
+        ),
+      );
+    });
+
+    it('should throw error if name is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({ name: '' }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if symbol is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          symbol: '',
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if isin is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          isin: '',
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if decimals is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          decimals: 2.85,
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if diamondOwnerAccount is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          diamondOwnerAccount: 'invalid',
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if dividendRight is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          dividendRight: 100,
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if currency is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          currency: 'invalid',
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if numberOfShares is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          numberOfShares: 'invalid',
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if nominalValue is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          nominalValue: 'invalid',
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if regulationType is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          regulationType: 5,
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if regulationSubType is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          regulationSubType: 5,
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if configId is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          configId: 'invalid',
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if externalPauses is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          externalPauses: ['invalid'],
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if externalControlLists is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          externalControlLists: ['invalid'],
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+
+    it('should throw error if externalKycLists is invalid', async () => {
+      createTrexSuiteEquityRequest = new CreateTrexSuiteEquityRequest(
+        CreateTrexSuiteEquityRequestFixture.create({
+          externalKycLists: ['invalid'],
+        }),
+      );
+
+      await expect(
+        EquityToken.createTrexSuite(createTrexSuiteEquityRequest),
+      ).rejects.toThrow(ValidationError);
+    });
+  });
 });
diff --git a/packages/ats/sdk/src/port/in/request/FormatValidation.ts b/packages/ats/sdk/src/port/in/request/FormatValidation.ts
index c29f23293..a83e41317 100644
--- a/packages/ats/sdk/src/port/in/request/FormatValidation.ts
+++ b/packages/ats/sdk/src/port/in/request/FormatValidation.ts
@@ -298,6 +298,23 @@ export default class FormatValidation {
     };
   };
 
+  public static checkArrayNumber = <T extends string | number | bigint>({
+    max,
+    min,
+  }: { max?: T; min?: T } = {}) => {
+    return (val: T[]): BaseError[] => {
+      const err: BaseError[] = [];
+      const check = this.checkNumber({ max, min });
+      for (const v of val) {
+        const e = check(v);
+        if (e.length > 0) {
+          err.push(...e);
+        }
+      }
+      return err;
+    };
+  };
+
   public static checkRole = () => {
     return (val: any): BaseError[] => {
       const err: BaseError[] = [];
diff --git a/packages/ats/sdk/src/port/in/request/bond/CreateBondRequest.ts b/packages/ats/sdk/src/port/in/request/bond/CreateBondRequest.ts
index 325360ecb..70a2234e4 100644
--- a/packages/ats/sdk/src/port/in/request/bond/CreateBondRequest.ts
+++ b/packages/ats/sdk/src/port/in/request/bond/CreateBondRequest.ts
@@ -231,13 +231,13 @@ export default class CreateBondRequest extends ValidatedRequest<CreateBondReques
   internalKycActivated: boolean;
 
   @OptionalField()
-  externalPauses?: string[];
+  externalPausesIds?: string[];
 
   @OptionalField()
-  externalControlLists?: string[];
+  externalControlListsIds?: string[];
 
   @OptionalField()
-  externalKycLists?: string[];
+  externalKycListsIds?: string[];
 
   @OptionalField()
   diamondOwnerAccount?: string;
@@ -276,9 +276,9 @@ export default class CreateBondRequest extends ValidatedRequest<CreateBondReques
     isMultiPartition,
     clearingActive,
     internalKycActivated,
-    externalPauses,
-    externalControlLists,
-    externalKycLists,
+    externalPausesIds,
+    externalControlListsIds,
+    externalKycListsIds,
     diamondOwnerAccount,
     currency,
     numberOfUnits,
@@ -309,9 +309,9 @@ export default class CreateBondRequest extends ValidatedRequest<CreateBondReques
     isMultiPartition: boolean;
     clearingActive: boolean;
     internalKycActivated: boolean;
-    externalPauses?: string[];
-    externalControlLists?: string[];
-    externalKycLists?: string[];
+    externalPausesIds?: string[];
+    externalControlListsIds?: string[];
+    externalKycListsIds?: string[];
     diamondOwnerAccount?: string;
     currency: string;
     numberOfUnits: string;
@@ -381,24 +381,24 @@ export default class CreateBondRequest extends ValidatedRequest<CreateBondReques
         return Factory.checkRegulationSubType(val, this.regulationType);
       },
       configId: FormatValidation.checkBytes32Format(),
-      externalPauses: (val) => {
+      externalPausesIds: (val) => {
         return FormatValidation.checkHederaIdOrEvmAddressArray(
           val ?? [],
-          'externalPauses',
+          'externalPausesIds',
           true,
         );
       },
-      externalControlLists: (val) => {
+      externalControlListsIds: (val) => {
         return FormatValidation.checkHederaIdOrEvmAddressArray(
           val ?? [],
-          'externalControlLists',
+          'externalControlListsIds',
           true,
         );
       },
-      externalKycLists: (val) => {
+      externalKycListsIds: (val) => {
         return FormatValidation.checkHederaIdOrEvmAddressArray(
           val ?? [],
-          'externalKycLists',
+          'externalKycListsIds',
           true,
         );
       },
@@ -419,9 +419,9 @@ export default class CreateBondRequest extends ValidatedRequest<CreateBondReques
     this.clearingActive = clearingActive;
     this.internalKycActivated = internalKycActivated;
     this.diamondOwnerAccount = diamondOwnerAccount;
-    this.externalPauses = externalPauses;
-    this.externalControlLists = externalControlLists;
-    this.externalKycLists = externalKycLists;
+    this.externalPausesIds = externalPausesIds;
+    this.externalControlListsIds = externalControlListsIds;
+    this.externalKycListsIds = externalKycListsIds;
     this.currency = currency;
     this.numberOfUnits = numberOfUnits;
     this.nominalValue = nominalValue;
diff --git a/packages/ats/sdk/src/port/in/request/bond/CreateTrexSuiteBondRequest.ts b/packages/ats/sdk/src/port/in/request/bond/CreateTrexSuiteBondRequest.ts
new file mode 100644
index 000000000..190678a5a
--- /dev/null
+++ b/packages/ats/sdk/src/port/in/request/bond/CreateTrexSuiteBondRequest.ts
@@ -0,0 +1,492 @@
+/*
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+import { OptionalField } from '@core/decorator/OptionalDecorator';
+import { Security } from '@domain/context/security/Security';
+import ValidatedRequest from '@core/validation/ValidatedArgs';
+import FormatValidation from '../FormatValidation';
+
+import { SecurityDate } from '@domain/context/shared/SecurityDate';
+import { Factory } from '@domain/context/factory/Factories';
+
+export default class CreateTrexSuiteBondRequest extends ValidatedRequest<CreateTrexSuiteBondRequest> {
+  salt: string;
+  owner: string;
+  irs: string;
+  onchainId: string;
+  irAgents: string[];
+  tokenAgents: string[];
+  compliancesModules: string[];
+  complianceSettings: string[];
+  claimTopics: number[];
+  issuers: string[];
+  issuerClaims: number[][];
+
+  name: string;
+  symbol: string;
+  isin: string;
+  private _decimals: number;
+  public get decimals(): number {
+    return this._decimals;
+  }
+  public set decimals(value: number | string) {
+    this._decimals = typeof value === 'number' ? value : parseFloat(value);
+  }
+  isWhiteList: boolean;
+  erc20VotesActivated: boolean;
+  isControllable: boolean;
+  arePartitionsProtected: boolean;
+  isMultiPartition: boolean;
+  clearingActive: boolean;
+  internalKycActivated: boolean;
+
+  @OptionalField()
+  externalPauses?: string[];
+
+  @OptionalField()
+  externalControlLists?: string[];
+
+  @OptionalField()
+  externalKycLists?: string[];
+
+  diamondOwnerAccount: string;
+
+  @OptionalField()
+  complianceId?: string;
+
+  @OptionalField()
+  identityRegistryId?: string;
+
+  currency: string;
+  numberOfUnits: string;
+  nominalValue: string;
+  startingDate: string;
+  maturityDate: string;
+  couponFrequency: string;
+  couponRate: string;
+  firstCouponDate: string;
+  regulationType: number;
+  regulationSubType: number;
+  isCountryControlListWhiteList: boolean;
+  countries: string;
+  info: string;
+  configId: string;
+  configVersion: number;
+
+  constructor({
+    salt,
+    owner,
+    irs,
+    onchainId,
+    irAgents,
+    tokenAgents,
+    compliancesModules,
+    complianceSettings,
+    claimTopics,
+    issuers,
+    issuerClaims,
+
+    name,
+    symbol,
+    isin,
+    decimals,
+    isWhiteList,
+    erc20VotesActivated,
+    isControllable,
+    arePartitionsProtected,
+    isMultiPartition,
+    clearingActive,
+    internalKycActivated,
+    externalPauses,
+    externalControlLists,
+    externalKycLists,
+    diamondOwnerAccount,
+    currency,
+    numberOfUnits,
+    nominalValue,
+    startingDate,
+    maturityDate,
+    couponFrequency,
+    couponRate,
+    firstCouponDate,
+    regulationType,
+    regulationSubType,
+    isCountryControlListWhiteList,
+    countries,
+    info,
+    configId,
+    configVersion,
+    complianceId,
+    identityRegistryId,
+  }: {
+    salt: string;
+    owner: string;
+    irs: string;
+    onchainId: string;
+    irAgents: string[];
+    tokenAgents: string[];
+    compliancesModules: string[];
+    complianceSettings: string[];
+    claimTopics: number[];
+    issuers: string[];
+    issuerClaims: number[][];
+
+    name: string;
+    symbol: string;
+    isin: string;
+    decimals: number | string;
+    isWhiteList: boolean;
+    erc20VotesActivated: boolean;
+    isControllable: boolean;
+    arePartitionsProtected: boolean;
+    isMultiPartition: boolean;
+    clearingActive: boolean;
+    internalKycActivated: boolean;
+    externalPauses?: string[];
+    externalControlLists?: string[];
+    externalKycLists?: string[];
+    diamondOwnerAccount: string;
+    currency: string;
+    numberOfUnits: string;
+    nominalValue: string;
+    startingDate: string;
+    maturityDate: string;
+    couponFrequency: string;
+    couponRate: string;
+    firstCouponDate: string;
+    regulationType: number;
+    regulationSubType: number;
+    isCountryControlListWhiteList: boolean;
+    countries: string;
+    info: string;
+    configId: string;
+    configVersion: number;
+    complianceId?: string;
+    identityRegistryId?: string;
+  }) {
+    super({
+      name: (val) => {
+        return Security.checkName(val);
+      },
+      symbol: (val) => {
+        return Security.checkSymbol(val);
+      },
+      isin: (val) => {
+        return Security.checkISIN(val);
+      },
+      decimals: (val) => {
+        return Security.checkInteger(val);
+      },
+      diamondOwnerAccount:
+        FormatValidation.checkHederaIdFormatOrEvmAddress(false),
+      currency: FormatValidation.checkBytes3Format(),
+      numberOfUnits: FormatValidation.checkNumber(),
+      nominalValue: FormatValidation.checkNumber(),
+      startingDate: (val) => {
+        return SecurityDate.checkDateTimestamp(
+          parseInt(val),
+          Math.ceil(new Date().getTime() / 1000),
+          parseInt(this.maturityDate),
+        );
+      },
+      maturityDate: (val) => {
+        return SecurityDate.checkDateTimestamp(
+          parseInt(val),
+          parseInt(this.startingDate),
+          undefined,
+        );
+      },
+      couponFrequency: FormatValidation.checkNumber(),
+      couponRate: FormatValidation.checkNumber(),
+      firstCouponDate: (val) => {
+        if (parseInt(val) != 0) {
+          return SecurityDate.checkDateTimestamp(
+            parseInt(val),
+            parseInt(this.startingDate),
+            parseInt(this.maturityDate),
+          );
+        }
+      },
+      regulationType: (val) => {
+        return Factory.checkRegulationType(val);
+      },
+      regulationSubType: (val) => {
+        return Factory.checkRegulationSubType(val, this.regulationType);
+      },
+      configId: FormatValidation.checkBytes32Format(),
+      externalPauses: (val) => {
+        return FormatValidation.checkHederaIdOrEvmAddressArray(
+          val ?? [],
+          'externalPauses',
+          true,
+        );
+      },
+      externalControlLists: (val) => {
+        return FormatValidation.checkHederaIdOrEvmAddressArray(
+          val ?? [],
+          'externalControlLists',
+          true,
+        );
+      },
+      externalKycLists: (val) => {
+        return FormatValidation.checkHederaIdOrEvmAddressArray(
+          val ?? [],
+          'externalKycLists',
+          true,
+        );
+      },
+      complianceId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
+      identityRegistryId:
+        FormatValidation.checkHederaIdFormatOrEvmAddress(true),
+      claimTopics: FormatValidation.checkArrayNumber(),
+    });
+
+    this.salt = salt;
+    this.owner = owner;
+    this.irs = irs;
+    this.onchainId = onchainId;
+    this.irAgents = irAgents;
+    this.tokenAgents = tokenAgents;
+    this.compliancesModules = compliancesModules;
+    this.complianceSettings = complianceSettings;
+    this.claimTopics = claimTopics;
+    this.issuers = issuers;
+    this.issuerClaims = issuerClaims;
+
+    this.name = name;
+    this.symbol = symbol;
+    this.isin = isin;
+    this.decimals =
+      typeof decimals === 'number' ? decimals : parseInt(decimals);
+    this.isWhiteList = isWhiteList;
+    this.erc20VotesActivated = erc20VotesActivated;
+    this.isControllable = isControllable;
+    this.arePartitionsProtected = arePartitionsProtected;
+    this.isMultiPartition = isMultiPartition;
+    this.clearingActive = clearingActive;
+    this.internalKycActivated = internalKycActivated;
+    this.diamondOwnerAccount = diamondOwnerAccount;
+    this.externalPauses = externalPauses;
+    this.externalControlLists = externalControlLists;
+    this.externalKycLists = externalKycLists;
+    this.currency = currency;
+    this.numberOfUnits = numberOfUnits;
+    this.nominalValue = nominalValue;
+    this.startingDate = startingDate;
+    this.maturityDate = maturityDate;
+    this.couponFrequency = couponFrequency;
+    this.couponRate = couponRate;
+    this.firstCouponDate = firstCouponDate;
+    this.regulationType = regulationType;
+    this.regulationSubType = regulationSubType;
+    this.isCountryControlListWhiteList = isCountryControlListWhiteList;
+    this.countries = countries;
+    this.info = info;
+    this.configId = configId;
+    this.configVersion = configVersion;
+    this.complianceId = complianceId;
+    this.identityRegistryId = identityRegistryId;
+  }
+}
diff --git a/packages/ats/sdk/src/port/in/request/bond/SetCouponRequest.ts b/packages/ats/sdk/src/port/in/request/bond/SetCouponRequest.ts
index e73f8d360..b86a2e60b 100644
--- a/packages/ats/sdk/src/port/in/request/bond/SetCouponRequest.ts
+++ b/packages/ats/sdk/src/port/in/request/bond/SetCouponRequest.ts
@@ -213,17 +213,20 @@ export default class SetCouponRequest extends ValidatedRequest<SetCouponRequest>
   rate: string;
   recordTimestamp: string;
   executionTimestamp: string;
+  period: string;
 
   constructor({
     securityId,
     rate,
     recordTimestamp,
     executionTimestamp,
+    period,
   }: {
     securityId: string;
     rate: string;
     recordTimestamp: string;
     executionTimestamp: string;
+    period: string;
   }) {
     super({
       rate: FormatValidation.checkAmount(),
@@ -242,11 +245,13 @@ export default class SetCouponRequest extends ValidatedRequest<SetCouponRequest>
         );
       },
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      period: FormatValidation.checkAmount(),
     });
 
     this.securityId = securityId;
     this.rate = rate;
     this.recordTimestamp = recordTimestamp;
     this.executionTimestamp = executionTimestamp;
+    this.period = period;
   }
 }
diff --git a/packages/ats/sdk/src/port/in/request/equity/CreateEquityRequest.ts b/packages/ats/sdk/src/port/in/request/equity/CreateEquityRequest.ts
index 2fcf58f04..7321706aa 100644
--- a/packages/ats/sdk/src/port/in/request/equity/CreateEquityRequest.ts
+++ b/packages/ats/sdk/src/port/in/request/equity/CreateEquityRequest.ts
@@ -231,13 +231,13 @@ export default class CreateEquityRequest extends ValidatedRequest<CreateEquityRe
   internalKycActivated: boolean;
 
   @OptionalField()
-  externalPauses?: string[];
+  externalPausesIds?: string[];
 
   @OptionalField()
-  externalControlLists?: string[];
+  externalControlListsIds?: string[];
 
   @OptionalField()
-  externalKycLists?: string[];
+  externalKycListsIds?: string[];
 
   @OptionalField()
   diamondOwnerAccount?: string;
@@ -279,9 +279,9 @@ export default class CreateEquityRequest extends ValidatedRequest<CreateEquityRe
     isMultiPartition,
     clearingActive,
     internalKycActivated,
-    externalPauses,
-    externalControlLists,
-    externalKycLists,
+    externalPausesIds,
+    externalControlListsIds,
+    externalKycListsIds,
     diamondOwnerAccount,
     votingRight,
     informationRight,
@@ -315,9 +315,9 @@ export default class CreateEquityRequest extends ValidatedRequest<CreateEquityRe
     clearingActive: boolean;
     internalKycActivated: boolean;
     isMultiPartition: boolean;
-    externalPauses?: string[];
-    externalControlLists?: string[];
-    externalKycLists?: string[];
+    externalPausesIds?: string[];
+    externalControlListsIds?: string[];
+    externalKycListsIds?: string[];
     diamondOwnerAccount?: string;
     votingRight: boolean;
     informationRight: boolean;
@@ -368,24 +368,24 @@ export default class CreateEquityRequest extends ValidatedRequest<CreateEquityRe
         return Factory.checkRegulationSubType(val, this.regulationType);
       },
       configId: FormatValidation.checkBytes32Format(),
-      externalPauses: (val) => {
+      externalPausesIds: (val) => {
         return FormatValidation.checkHederaIdOrEvmAddressArray(
           val ?? [],
-          'externalPauses',
+          'externalPausesIds',
           true,
         );
       },
-      externalControlLists: (val) => {
+      externalControlListsIds: (val) => {
         return FormatValidation.checkHederaIdOrEvmAddressArray(
           val ?? [],
-          'externalControlLists',
+          'externalControlListsIds',
           true,
         );
       },
-      externalKycLists: (val) => {
+      externalKycListsIds: (val) => {
         return FormatValidation.checkHederaIdOrEvmAddressArray(
           val ?? [],
-          'externalKycLists',
+          'externalKycListsIds',
           true,
         );
       },
@@ -405,10 +405,10 @@ export default class CreateEquityRequest extends ValidatedRequest<CreateEquityRe
     this.isMultiPartition = isMultiPartition;
     this.clearingActive = clearingActive;
     this.internalKycActivated = internalKycActivated;
-    this.externalPauses = externalPauses;
+    this.externalPausesIds = externalPausesIds;
     this.diamondOwnerAccount = diamondOwnerAccount;
-    this.externalControlLists = externalControlLists;
-    this.externalKycLists = externalKycLists;
+    this.externalControlListsIds = externalControlListsIds;
+    this.externalKycListsIds = externalKycListsIds;
     this.votingRight = votingRight;
     this.informationRight = informationRight;
     this.liquidationRight = liquidationRight;
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AdjustBalancesTimeTravel.sol b/packages/ats/sdk/src/port/in/request/equity/CreateTrexSuiteEquityRequest.ts
similarity index 59%
rename from packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AdjustBalancesTimeTravel.sol
rename to packages/ats/sdk/src/port/in/request/equity/CreateTrexSuiteEquityRequest.ts
index d97424232..a2040af63 100644
--- a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/AdjustBalancesTimeTravel.sol
+++ b/packages/ats/sdk/src/port/in/request/equity/CreateTrexSuiteEquityRequest.ts
@@ -203,32 +203,278 @@
 
 */
 
-pragma solidity 0.8.18;
-// SPDX-License-Identifier: BSD-3-Clause-Attribution
-import {
-    AdjustBalances
-} from '../../../layer_2/adjustBalances/AdjustBalances.sol';
-import {
-    TimeTravelStorageWrapper
-} from '../timeTravel/TimeTravelStorageWrapper.sol';
-import {LocalContext} from '../../../layer_0/context/LocalContext.sol';
-
-contract AdjustBalancesTimeTravel is AdjustBalances, TimeTravelStorageWrapper {
-    function _blockTimestamp()
-        internal
-        view
-        override(LocalContext, TimeTravelStorageWrapper)
-        returns (uint256)
-    {
-        return TimeTravelStorageWrapper._blockTimestamp();
-    }
-
-    function _blockNumber()
-        internal
-        view
-        override(LocalContext, TimeTravelStorageWrapper)
-        returns (uint256)
-    {
-        return TimeTravelStorageWrapper._blockNumber();
-    }
+import { OptionalField } from '@core/decorator/OptionalDecorator';
+import { Equity } from '@domain/context/equity/Equity';
+import { Security } from '@domain/context/security/Security';
+import ValidatedRequest from '@core/validation/ValidatedArgs';
+import FormatValidation from '../FormatValidation';
+
+import { Factory } from '@domain/context/factory/Factories';
+
+export default class CreateTrexSuiteEquityRequest extends ValidatedRequest<CreateTrexSuiteEquityRequest> {
+  salt: string;
+  owner: string;
+  irs: string;
+  onchainId: string;
+  irAgents: string[];
+  tokenAgents: string[];
+  compliancesModules: string[];
+  complianceSettings: string[];
+  claimTopics: number[];
+  issuers: string[];
+  issuerClaims: number[][];
+  name: string;
+  symbol: string;
+  isin: string;
+  private _decimals: number;
+  public get decimals(): number {
+    return this._decimals;
+  }
+  public set decimals(value: number | string) {
+    this._decimals = typeof value === 'number' ? value : parseFloat(value);
+  }
+  isWhiteList: boolean;
+  erc20VotesActivated: boolean;
+  isControllable: boolean;
+  arePartitionsProtected: boolean;
+  isMultiPartition: boolean;
+  clearingActive: boolean;
+  internalKycActivated: boolean;
+
+  @OptionalField()
+  externalPauses?: string[];
+
+  @OptionalField()
+  externalControlLists?: string[];
+
+  @OptionalField()
+  externalKycLists?: string[];
+
+  diamondOwnerAccount: string;
+
+  @OptionalField()
+  complianceId?: string;
+
+  @OptionalField()
+  identityRegistryId?: string;
+
+  votingRight: boolean;
+  informationRight: boolean;
+  liquidationRight: boolean;
+  subscriptionRight: boolean;
+  conversionRight: boolean;
+  redemptionRight: boolean;
+  putRight: boolean;
+  dividendRight: number;
+  currency: string;
+  numberOfShares: string;
+  nominalValue: string;
+  regulationType: number;
+  regulationSubType: number;
+  isCountryControlListWhiteList: boolean;
+  countries: string;
+  info: string;
+  configId: string;
+  configVersion: number;
+
+  constructor({
+    salt,
+    owner,
+    irs,
+    onchainId,
+    irAgents,
+    tokenAgents,
+    compliancesModules,
+    complianceSettings,
+    claimTopics,
+    issuers,
+    issuerClaims,
+
+    name,
+    symbol,
+    isin,
+    decimals,
+    isWhiteList,
+    erc20VotesActivated,
+    isControllable,
+    arePartitionsProtected,
+    isMultiPartition,
+    clearingActive,
+    internalKycActivated,
+    externalPauses,
+    externalControlLists,
+    externalKycLists,
+    diamondOwnerAccount,
+    votingRight,
+    informationRight,
+    liquidationRight,
+    subscriptionRight,
+    conversionRight,
+    redemptionRight,
+    putRight,
+    dividendRight,
+    currency,
+    numberOfShares,
+    nominalValue,
+    regulationType,
+    regulationSubType,
+    isCountryControlListWhiteList,
+    countries,
+    info,
+    configId,
+    configVersion,
+    complianceId,
+    identityRegistryId,
+  }: {
+    salt: string;
+    owner: string;
+    irs: string;
+    onchainId: string;
+    irAgents: string[];
+    tokenAgents: string[];
+    compliancesModules: string[];
+    complianceSettings: string[];
+    claimTopics: number[];
+    issuers: string[];
+    issuerClaims: number[][];
+
+    name: string;
+    symbol: string;
+    isin: string;
+    decimals: number | string;
+    isWhiteList: boolean;
+    erc20VotesActivated: boolean;
+    isControllable: boolean;
+    arePartitionsProtected: boolean;
+    clearingActive: boolean;
+    internalKycActivated: boolean;
+    isMultiPartition: boolean;
+    externalPauses?: string[];
+    externalControlLists?: string[];
+    externalKycLists?: string[];
+    diamondOwnerAccount: string;
+    votingRight: boolean;
+    informationRight: boolean;
+    liquidationRight: boolean;
+    subscriptionRight: boolean;
+    conversionRight: boolean;
+    redemptionRight: boolean;
+    putRight: boolean;
+    dividendRight: number;
+    currency: string;
+    numberOfShares: string;
+    nominalValue: string;
+    regulationType: number;
+    regulationSubType: number;
+    isCountryControlListWhiteList: boolean;
+    countries: string;
+    info: string;
+    configId: string;
+    configVersion: number;
+    complianceId?: string;
+    identityRegistryId?: string;
+  }) {
+    super({
+      name: (val) => {
+        return Security.checkName(val);
+      },
+      symbol: (val) => {
+        return Security.checkSymbol(val);
+      },
+      isin: (val) => {
+        return Security.checkISIN(val);
+      },
+      decimals: (val) => {
+        return Security.checkInteger(val);
+      },
+      diamondOwnerAccount:
+        FormatValidation.checkHederaIdFormatOrEvmAddress(false),
+      dividendRight: (val) => {
+        return Equity.checkDividend(val);
+      },
+      currency: FormatValidation.checkBytes3Format(),
+      numberOfShares: FormatValidation.checkNumber(),
+      nominalValue: FormatValidation.checkNumber(),
+      regulationType: (val) => {
+        return Factory.checkRegulationType(val);
+      },
+      regulationSubType: (val) => {
+        return Factory.checkRegulationSubType(val, this.regulationType);
+      },
+      configId: FormatValidation.checkBytes32Format(),
+      externalPauses: (val) => {
+        return FormatValidation.checkHederaIdOrEvmAddressArray(
+          val ?? [],
+          'externalPauses',
+          true,
+        );
+      },
+      externalControlLists: (val) => {
+        return FormatValidation.checkHederaIdOrEvmAddressArray(
+          val ?? [],
+          'externalControlLists',
+          true,
+        );
+      },
+      externalKycLists: (val) => {
+        return FormatValidation.checkHederaIdOrEvmAddressArray(
+          val ?? [],
+          'externalKycLists',
+          true,
+        );
+      },
+      complianceId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
+      identityRegistryId:
+        FormatValidation.checkHederaIdFormatOrEvmAddress(true),
+      claimTopics: FormatValidation.checkArrayNumber(),
+    });
+    this.salt = salt;
+    this.owner = owner;
+    this.irs = irs;
+    this.onchainId = onchainId;
+    this.irAgents = irAgents;
+    this.tokenAgents = tokenAgents;
+    this.compliancesModules = compliancesModules;
+    this.complianceSettings = complianceSettings;
+    this.claimTopics = claimTopics;
+    this.issuers = issuers;
+    this.issuerClaims = issuerClaims;
+
+    this.name = name;
+    this.symbol = symbol;
+    this.isin = isin;
+    this.decimals =
+      typeof decimals === 'number' ? decimals : parseInt(decimals);
+    this.isWhiteList = isWhiteList;
+    this.erc20VotesActivated = erc20VotesActivated;
+    this.isControllable = isControllable;
+    this.arePartitionsProtected = arePartitionsProtected;
+    this.isMultiPartition = isMultiPartition;
+    this.clearingActive = clearingActive;
+    this.internalKycActivated = internalKycActivated;
+    this.externalPauses = externalPauses;
+    this.diamondOwnerAccount = diamondOwnerAccount;
+    this.externalControlLists = externalControlLists;
+    this.externalKycLists = externalKycLists;
+    this.votingRight = votingRight;
+    this.informationRight = informationRight;
+    this.liquidationRight = liquidationRight;
+    this.subscriptionRight = subscriptionRight;
+    this.conversionRight = conversionRight;
+    this.redemptionRight = redemptionRight;
+    this.putRight = putRight;
+    this.dividendRight = dividendRight;
+    this.currency = currency;
+    this.numberOfShares = numberOfShares;
+    this.nominalValue = nominalValue;
+    this.regulationType = regulationType;
+    this.regulationSubType = regulationSubType;
+    this.isCountryControlListWhiteList = isCountryControlListWhiteList;
+    this.countries = countries;
+    this.info = info;
+    this.configId = configId;
+    this.configVersion = configVersion;
+    this.complianceId = complianceId;
+    this.identityRegistryId = identityRegistryId;
+  }
 }
diff --git a/packages/ats/sdk/src/port/in/request/index.ts b/packages/ats/sdk/src/port/in/request/index.ts
index 3482d5cd6..fb8717b94 100644
--- a/packages/ats/sdk/src/port/in/request/index.ts
+++ b/packages/ats/sdk/src/port/in/request/index.ts
@@ -391,6 +391,8 @@ import GetTotalVotingHoldersRequest from './equity/GetTotalVotingHoldersRequest'
 import GetVotingHoldersRequest from './equity/GetVotingHoldersRequest';
 import GetSecurityHoldersRequest from './security/GetSecurityHoldersRequest';
 import GetTotalSecurityHoldersRequest from './security/GetTotalSecurityHoldersRequest';
+import CreateTrexSuiteEquityRequest from './equity/CreateTrexSuiteEquityRequest';
+import CreateTrexSuiteBondRequest from './bond/CreateTrexSuiteBondRequest';
 
 export {
   CreateEquityRequest,
@@ -580,4 +582,6 @@ export {
   GetTotalVotingHoldersRequest,
   GetSecurityHoldersRequest,
   GetTotalSecurityHoldersRequest,
+  CreateTrexSuiteBondRequest,
+  CreateTrexSuiteEquityRequest,
 };
diff --git a/packages/ats/sdk/src/port/in/request/security/operations/clearing/ClearingCreateHoldByPartitionRequest.ts b/packages/ats/sdk/src/port/in/request/security/operations/clearing/ClearingCreateHoldByPartitionRequest.ts
index 67513474c..1134dbd4e 100644
--- a/packages/ats/sdk/src/port/in/request/security/operations/clearing/ClearingCreateHoldByPartitionRequest.ts
+++ b/packages/ats/sdk/src/port/in/request/security/operations/clearing/ClearingCreateHoldByPartitionRequest.ts
@@ -212,7 +212,7 @@ export default class ClearingCreateHoldByPartitionRequest extends ValidatedReque
   securityId: string;
   partitionId: string;
   amount: string;
-  escrow: string;
+  escrowId: string;
   targetId: string;
   clearingExpirationDate: string;
   holdExpirationDate: string;
@@ -221,7 +221,7 @@ export default class ClearingCreateHoldByPartitionRequest extends ValidatedReque
     securityId,
     partitionId,
     amount,
-    escrow,
+    escrowId,
     targetId,
     clearingExpirationDate,
     holdExpirationDate,
@@ -229,7 +229,7 @@ export default class ClearingCreateHoldByPartitionRequest extends ValidatedReque
     securityId: string;
     partitionId: string;
     amount: string;
-    escrow: string;
+    escrowId: string;
     targetId: string;
     clearingExpirationDate: string;
     holdExpirationDate: string;
@@ -238,7 +238,7 @@ export default class ClearingCreateHoldByPartitionRequest extends ValidatedReque
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       partitionId: FormatValidation.checkBytes32Format(),
       amount: FormatValidation.checkAmount(),
-      escrow: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      escrowId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       targetId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
       clearingExpirationDate: (val) => {
         return SecurityDate.checkDateTimestamp(
@@ -257,7 +257,7 @@ export default class ClearingCreateHoldByPartitionRequest extends ValidatedReque
     this.securityId = securityId;
     this.partitionId = partitionId;
     this.amount = amount;
-    this.escrow = escrow;
+    this.escrowId = escrowId;
     this.targetId = targetId;
     this.clearingExpirationDate = clearingExpirationDate;
     this.holdExpirationDate = holdExpirationDate;
diff --git a/packages/ats/sdk/src/port/in/request/security/operations/clearing/ClearingCreateHoldFromByPartitionRequest.ts b/packages/ats/sdk/src/port/in/request/security/operations/clearing/ClearingCreateHoldFromByPartitionRequest.ts
index a960539ee..c9243e7d4 100644
--- a/packages/ats/sdk/src/port/in/request/security/operations/clearing/ClearingCreateHoldFromByPartitionRequest.ts
+++ b/packages/ats/sdk/src/port/in/request/security/operations/clearing/ClearingCreateHoldFromByPartitionRequest.ts
@@ -211,7 +211,7 @@ export default class ClearingCreateHoldFromByPartitionRequest extends ValidatedR
   securityId: string;
   partitionId: string;
   amount: string;
-  escrow: string;
+  escrowId: string;
   sourceId: string;
   targetId: string;
   clearingExpirationDate: string;
@@ -221,7 +221,7 @@ export default class ClearingCreateHoldFromByPartitionRequest extends ValidatedR
     securityId,
     partitionId,
     amount,
-    escrow,
+    escrowId,
     sourceId,
     targetId,
     clearingExpirationDate,
@@ -230,7 +230,7 @@ export default class ClearingCreateHoldFromByPartitionRequest extends ValidatedR
     securityId: string;
     partitionId: string;
     amount: string;
-    escrow: string;
+    escrowId: string;
     sourceId: string;
     targetId: string;
     clearingExpirationDate: string;
@@ -240,7 +240,7 @@ export default class ClearingCreateHoldFromByPartitionRequest extends ValidatedR
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       partitionId: FormatValidation.checkBytes32Format(),
       amount: FormatValidation.checkAmount(),
-      escrow: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      escrowId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       sourceId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       targetId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
       clearingExpirationDate: (val) => {
@@ -260,7 +260,7 @@ export default class ClearingCreateHoldFromByPartitionRequest extends ValidatedR
     this.securityId = securityId;
     this.partitionId = partitionId;
     this.amount = amount;
-    this.escrow = escrow;
+    this.escrowId = escrowId;
     this.sourceId = sourceId;
     this.targetId = targetId;
     this.clearingExpirationDate = clearingExpirationDate;
diff --git a/packages/ats/sdk/src/port/in/request/security/operations/clearing/OperatorClearingCreateHoldByPartitionRequest.ts b/packages/ats/sdk/src/port/in/request/security/operations/clearing/OperatorClearingCreateHoldByPartitionRequest.ts
index 4907ecd4e..87322ac82 100644
--- a/packages/ats/sdk/src/port/in/request/security/operations/clearing/OperatorClearingCreateHoldByPartitionRequest.ts
+++ b/packages/ats/sdk/src/port/in/request/security/operations/clearing/OperatorClearingCreateHoldByPartitionRequest.ts
@@ -212,7 +212,7 @@ export default class OperatorClearingCreateHoldByPartitionRequest extends Valida
   securityId: string;
   partitionId: string;
   amount: string;
-  escrow: string;
+  escrowId: string;
   sourceId: string;
   targetId: string;
   clearingExpirationDate: string;
@@ -222,7 +222,7 @@ export default class OperatorClearingCreateHoldByPartitionRequest extends Valida
     securityId,
     partitionId,
     amount,
-    escrow,
+    escrowId,
     sourceId,
     targetId,
     clearingExpirationDate,
@@ -231,7 +231,7 @@ export default class OperatorClearingCreateHoldByPartitionRequest extends Valida
     securityId: string;
     partitionId: string;
     amount: string;
-    escrow: string;
+    escrowId: string;
     sourceId: string;
     targetId: string;
     clearingExpirationDate: string;
@@ -241,7 +241,7 @@ export default class OperatorClearingCreateHoldByPartitionRequest extends Valida
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       partitionId: FormatValidation.checkBytes32Format(),
       amount: FormatValidation.checkAmount(),
-      escrow: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      escrowId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       sourceId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       targetId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
       clearingExpirationDate: (val) => {
@@ -261,7 +261,7 @@ export default class OperatorClearingCreateHoldByPartitionRequest extends Valida
     this.securityId = securityId;
     this.partitionId = partitionId;
     this.amount = amount;
-    this.escrow = escrow;
+    this.escrowId = escrowId;
     this.sourceId = sourceId;
     this.targetId = targetId;
     this.clearingExpirationDate = clearingExpirationDate;
diff --git a/packages/ats/sdk/src/port/in/request/security/operations/clearing/ProtectedClearingCreateHoldByPartitionRequest.ts b/packages/ats/sdk/src/port/in/request/security/operations/clearing/ProtectedClearingCreateHoldByPartitionRequest.ts
index dc5c6cefb..77ebc0d36 100644
--- a/packages/ats/sdk/src/port/in/request/security/operations/clearing/ProtectedClearingCreateHoldByPartitionRequest.ts
+++ b/packages/ats/sdk/src/port/in/request/security/operations/clearing/ProtectedClearingCreateHoldByPartitionRequest.ts
@@ -212,7 +212,7 @@ export default class ProtectedClearingCreateHoldByPartitionRequest extends Valid
   securityId: string;
   partitionId: string;
   amount: string;
-  escrow: string;
+  escrowId: string;
   sourceId: string;
   targetId: string;
   clearingExpirationDate: string;
@@ -225,7 +225,7 @@ export default class ProtectedClearingCreateHoldByPartitionRequest extends Valid
     securityId,
     partitionId,
     amount,
-    escrow,
+    escrowId,
     sourceId,
     targetId,
     clearingExpirationDate,
@@ -237,7 +237,7 @@ export default class ProtectedClearingCreateHoldByPartitionRequest extends Valid
     securityId: string;
     partitionId: string;
     amount: string;
-    escrow: string;
+    escrowId: string;
     sourceId: string;
     targetId: string;
     clearingExpirationDate: string;
@@ -250,7 +250,7 @@ export default class ProtectedClearingCreateHoldByPartitionRequest extends Valid
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       partitionId: FormatValidation.checkBytes32Format(),
       amount: FormatValidation.checkAmount(),
-      escrow: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      escrowId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       sourceId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       targetId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
       nonce: FormatValidation.checkNumber({ min: 0 }),
@@ -277,7 +277,7 @@ export default class ProtectedClearingCreateHoldByPartitionRequest extends Valid
     this.securityId = securityId;
     this.partitionId = partitionId;
     this.amount = amount;
-    this.escrow = escrow;
+    this.escrowId = escrowId;
     this.sourceId = sourceId;
     this.targetId = targetId;
     this.clearingExpirationDate = clearingExpirationDate;
diff --git a/packages/ats/sdk/src/port/in/request/security/operations/hold/ControllerCreateHoldFromByPartition.ts b/packages/ats/sdk/src/port/in/request/security/operations/hold/ControllerCreateHoldFromByPartition.ts
index dfaafc51a..5713a7c7c 100644
--- a/packages/ats/sdk/src/port/in/request/security/operations/hold/ControllerCreateHoldFromByPartition.ts
+++ b/packages/ats/sdk/src/port/in/request/security/operations/hold/ControllerCreateHoldFromByPartition.ts
@@ -212,7 +212,7 @@ export default class ControllerCreateHoldByPartitionRequest extends ValidatedReq
   securityId: string;
   partitionId: string;
   amount: string;
-  escrow: string;
+  escrowId: string;
   sourceId: string;
   targetId: string;
   expirationDate: string;
@@ -221,7 +221,7 @@ export default class ControllerCreateHoldByPartitionRequest extends ValidatedReq
     securityId,
     partitionId,
     amount,
-    escrow,
+    escrowId,
     sourceId,
     targetId,
     expirationDate,
@@ -229,7 +229,7 @@ export default class ControllerCreateHoldByPartitionRequest extends ValidatedReq
     securityId: string;
     partitionId: string;
     amount: string;
-    escrow: string;
+    escrowId: string;
     sourceId: string;
     targetId: string;
     expirationDate: string;
@@ -238,7 +238,7 @@ export default class ControllerCreateHoldByPartitionRequest extends ValidatedReq
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       partitionId: FormatValidation.checkBytes32Format(),
       amount: FormatValidation.checkAmount(),
-      escrow: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      escrowId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       sourceId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       targetId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
       expirationDate: (val) => {
@@ -252,7 +252,7 @@ export default class ControllerCreateHoldByPartitionRequest extends ValidatedReq
     this.securityId = securityId;
     this.partitionId = partitionId;
     this.amount = amount;
-    this.escrow = escrow;
+    this.escrowId = escrowId;
     this.sourceId = sourceId;
     this.targetId = targetId;
     this.expirationDate = expirationDate;
diff --git a/packages/ats/sdk/src/port/in/request/security/operations/hold/CreateHoldByPartition.ts b/packages/ats/sdk/src/port/in/request/security/operations/hold/CreateHoldByPartition.ts
index 971db46e0..8d0e33c2d 100644
--- a/packages/ats/sdk/src/port/in/request/security/operations/hold/CreateHoldByPartition.ts
+++ b/packages/ats/sdk/src/port/in/request/security/operations/hold/CreateHoldByPartition.ts
@@ -211,7 +211,7 @@ export default class CreateHoldByPartitionRequest extends ValidatedRequest<Creat
   securityId: string;
   partitionId: string;
   amount: string;
-  escrow: string;
+  escrowId: string;
   targetId: string;
   expirationDate: string;
 
@@ -219,14 +219,14 @@ export default class CreateHoldByPartitionRequest extends ValidatedRequest<Creat
     securityId,
     partitionId,
     amount,
-    escrow,
+    escrowId,
     targetId,
     expirationDate,
   }: {
     securityId: string;
     partitionId: string;
     amount: string;
-    escrow: string;
+    escrowId: string;
     targetId: string;
     expirationDate: string;
   }) {
@@ -234,7 +234,7 @@ export default class CreateHoldByPartitionRequest extends ValidatedRequest<Creat
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       partitionId: FormatValidation.checkBytes32Format(),
       amount: FormatValidation.checkAmount(),
-      escrow: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      escrowId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       targetId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
       expirationDate: (val) => {
         return SecurityDate.checkDateTimestamp(
@@ -247,7 +247,7 @@ export default class CreateHoldByPartitionRequest extends ValidatedRequest<Creat
     this.securityId = securityId;
     this.partitionId = partitionId;
     this.amount = amount;
-    this.escrow = escrow;
+    this.escrowId = escrowId;
     this.targetId = targetId;
     this.expirationDate = expirationDate;
   }
diff --git a/packages/ats/sdk/src/port/in/request/security/operations/hold/CreateHoldFromByPartition.ts b/packages/ats/sdk/src/port/in/request/security/operations/hold/CreateHoldFromByPartition.ts
index 162901ff2..e79d9ddc6 100644
--- a/packages/ats/sdk/src/port/in/request/security/operations/hold/CreateHoldFromByPartition.ts
+++ b/packages/ats/sdk/src/port/in/request/security/operations/hold/CreateHoldFromByPartition.ts
@@ -211,7 +211,7 @@ export default class CreateHoldFromByPartitionRequest extends ValidatedRequest<C
   securityId: string;
   partitionId: string;
   amount: string;
-  escrow: string;
+  escrowId: string;
   sourceId: string;
   targetId: string;
   expirationDate: string;
@@ -220,7 +220,7 @@ export default class CreateHoldFromByPartitionRequest extends ValidatedRequest<C
     securityId,
     partitionId,
     amount,
-    escrow,
+    escrowId,
     sourceId,
     targetId,
     expirationDate,
@@ -228,7 +228,7 @@ export default class CreateHoldFromByPartitionRequest extends ValidatedRequest<C
     securityId: string;
     partitionId: string;
     amount: string;
-    escrow: string;
+    escrowId: string;
     sourceId: string;
     targetId: string;
     expirationDate: string;
@@ -237,7 +237,7 @@ export default class CreateHoldFromByPartitionRequest extends ValidatedRequest<C
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       partitionId: FormatValidation.checkBytes32Format(),
       amount: FormatValidation.checkAmount(),
-      escrow: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      escrowId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       sourceId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       targetId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
       expirationDate: (val) => {
@@ -251,7 +251,7 @@ export default class CreateHoldFromByPartitionRequest extends ValidatedRequest<C
     this.securityId = securityId;
     this.partitionId = partitionId;
     this.amount = amount;
-    this.escrow = escrow;
+    this.escrowId = escrowId;
     this.sourceId = sourceId;
     this.targetId = targetId;
     this.expirationDate = expirationDate;
diff --git a/packages/ats/sdk/src/port/in/request/security/operations/hold/ProtectedCreateHoldFromByPartition.ts b/packages/ats/sdk/src/port/in/request/security/operations/hold/ProtectedCreateHoldFromByPartition.ts
index 5d3f63fef..eb710c193 100644
--- a/packages/ats/sdk/src/port/in/request/security/operations/hold/ProtectedCreateHoldFromByPartition.ts
+++ b/packages/ats/sdk/src/port/in/request/security/operations/hold/ProtectedCreateHoldFromByPartition.ts
@@ -211,7 +211,7 @@ export default class ProtectedCreateHoldByPartitionRequest extends ValidatedRequ
   securityId: string;
   partitionId: string;
   amount: string;
-  escrow: string;
+  escrowId: string;
   sourceId: string;
   targetId: string;
   expirationDate: string;
@@ -223,7 +223,7 @@ export default class ProtectedCreateHoldByPartitionRequest extends ValidatedRequ
     securityId,
     partitionId,
     amount,
-    escrow,
+    escrowId,
     sourceId,
     targetId,
     expirationDate,
@@ -234,7 +234,7 @@ export default class ProtectedCreateHoldByPartitionRequest extends ValidatedRequ
     securityId: string;
     partitionId: string;
     amount: string;
-    escrow: string;
+    escrowId: string;
     sourceId: string;
     targetId: string;
     expirationDate: string;
@@ -246,7 +246,7 @@ export default class ProtectedCreateHoldByPartitionRequest extends ValidatedRequ
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       partitionId: FormatValidation.checkBytes32Format(),
       amount: FormatValidation.checkAmount(),
-      escrow: FormatValidation.checkHederaIdFormatOrEvmAddress(),
+      escrowId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       sourceId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
       targetId: FormatValidation.checkHederaIdFormatOrEvmAddress(true),
       nonce: FormatValidation.checkNumber({ min: 0 }),
@@ -267,7 +267,7 @@ export default class ProtectedCreateHoldByPartitionRequest extends ValidatedRequ
     this.securityId = securityId;
     this.partitionId = partitionId;
     this.amount = amount;
-    this.escrow = escrow;
+    this.escrowId = escrowId;
     this.sourceId = sourceId;
     this.targetId = targetId;
     this.expirationDate = expirationDate;
diff --git a/packages/ats/sdk/src/port/in/response/ClearingCreateHoldViewModel.ts b/packages/ats/sdk/src/port/in/response/ClearingCreateHoldViewModel.ts
index a5e31c176..9a47af892 100644
--- a/packages/ats/sdk/src/port/in/response/ClearingCreateHoldViewModel.ts
+++ b/packages/ats/sdk/src/port/in/response/ClearingCreateHoldViewModel.ts
@@ -211,7 +211,7 @@ export default interface ClearingCreateHoldViewModel extends QueryResponse {
   expirationDate: Date;
   data: string;
   operatorData: string;
-  holdEscrow: string;
+  holdEscrowId: string;
   holdExpirationDate: Date;
   holdTo: string;
   holdData: string;
diff --git a/packages/ats/sdk/src/port/in/response/CouponViewModel.ts b/packages/ats/sdk/src/port/in/response/CouponViewModel.ts
index d16845192..1ebdad255 100644
--- a/packages/ats/sdk/src/port/in/response/CouponViewModel.ts
+++ b/packages/ats/sdk/src/port/in/response/CouponViewModel.ts
@@ -210,5 +210,6 @@ export default interface CouponViewModel extends QueryResponse {
   recordDate: Date;
   executionDate: Date;
   rate: string;
+  period: number;
   snapshotId?: number;
 }
diff --git a/packages/ats/sdk/src/port/in/security/clearing/Clearing.ts b/packages/ats/sdk/src/port/in/security/clearing/Clearing.ts
index 6d404e018..ebe487278 100644
--- a/packages/ats/sdk/src/port/in/security/clearing/Clearing.ts
+++ b/packages/ats/sdk/src/port/in/security/clearing/Clearing.ts
@@ -532,7 +532,7 @@ export class SecurityInPortClearing
       new ClearingCreateHoldByPartitionCommand(
         request.securityId,
         request.partitionId,
-        request.escrow,
+        request.escrowId,
         request.amount,
         request.targetId,
         request.clearingExpirationDate,
@@ -553,7 +553,7 @@ export class SecurityInPortClearing
       new ClearingCreateHoldFromByPartitionCommand(
         request.securityId,
         request.partitionId,
-        request.escrow,
+        request.escrowId,
         request.amount,
         request.sourceId,
         request.targetId,
@@ -575,7 +575,7 @@ export class SecurityInPortClearing
       new ProtectedClearingCreateHoldByPartitionCommand(
         request.securityId,
         request.partitionId,
-        request.escrow,
+        request.escrowId,
         request.amount,
         request.sourceId,
         request.targetId,
@@ -668,7 +668,7 @@ export class SecurityInPortClearing
       expirationDate: new Date(res.expirationTimestamp * ONE_THOUSAND),
       data: res.data,
       operatorData: res.operatorData,
-      holdEscrow: res.holdEscrow,
+      holdEscrowId: res.holdEscrowId,
       holdExpirationDate: new Date(res.holdExpirationTimestamp * ONE_THOUSAND),
       holdTo: res.holdTo,
       holdData: res.holdData,
@@ -785,7 +785,7 @@ export class SecurityInPortClearing
       new OperatorClearingCreateHoldByPartitionCommand(
         request.securityId,
         request.partitionId,
-        request.escrow,
+        request.escrowId,
         request.amount,
         request.sourceId,
         request.targetId,
diff --git a/packages/ats/sdk/src/port/in/security/clearing/Clearing.unit.test.ts b/packages/ats/sdk/src/port/in/security/clearing/Clearing.unit.test.ts
index 8d3db4745..9a16f02ea 100644
--- a/packages/ats/sdk/src/port/in/security/clearing/Clearing.unit.test.ts
+++ b/packages/ats/sdk/src/port/in/security/clearing/Clearing.unit.test.ts
@@ -1112,7 +1112,7 @@ describe('Clearing', () => {
         new ClearingCreateHoldByPartitionCommand(
           clearingCreateHoldByPartitionRequest.securityId,
           clearingCreateHoldByPartitionRequest.partitionId,
-          clearingCreateHoldByPartitionRequest.escrow,
+          clearingCreateHoldByPartitionRequest.escrowId,
           clearingCreateHoldByPartitionRequest.amount,
           clearingCreateHoldByPartitionRequest.targetId,
           clearingCreateHoldByPartitionRequest.clearingExpirationDate,
@@ -1139,7 +1139,7 @@ describe('Clearing', () => {
         new ClearingCreateHoldByPartitionCommand(
           clearingCreateHoldByPartitionRequest.securityId,
           clearingCreateHoldByPartitionRequest.partitionId,
-          clearingCreateHoldByPartitionRequest.escrow,
+          clearingCreateHoldByPartitionRequest.escrowId,
           clearingCreateHoldByPartitionRequest.amount,
           clearingCreateHoldByPartitionRequest.targetId,
           clearingCreateHoldByPartitionRequest.clearingExpirationDate,
@@ -1184,10 +1184,10 @@ describe('Clearing', () => {
       ).rejects.toThrow(ValidationError);
     });
 
-    it('should throw error if escrow is invalid', async () => {
+    it('should throw error if escrowId is invalid', async () => {
       const invalidRequest = new ClearingCreateHoldByPartitionRequest({
         ...ClearingCreateHoldByPartitionRequestFixture.create({
-          escrow: 'invalid',
+          escrowId: 'invalid',
         }),
       });
 
@@ -1233,7 +1233,7 @@ describe('Clearing', () => {
         new ClearingCreateHoldFromByPartitionCommand(
           clearingCreateHoldFromByPartitionRequest.securityId,
           clearingCreateHoldFromByPartitionRequest.partitionId,
-          clearingCreateHoldFromByPartitionRequest.escrow,
+          clearingCreateHoldFromByPartitionRequest.escrowId,
           clearingCreateHoldFromByPartitionRequest.amount,
           clearingCreateHoldFromByPartitionRequest.sourceId,
           clearingCreateHoldFromByPartitionRequest.targetId,
@@ -1261,7 +1261,7 @@ describe('Clearing', () => {
         new ClearingCreateHoldFromByPartitionCommand(
           clearingCreateHoldFromByPartitionRequest.securityId,
           clearingCreateHoldFromByPartitionRequest.partitionId,
-          clearingCreateHoldFromByPartitionRequest.escrow,
+          clearingCreateHoldFromByPartitionRequest.escrowId,
           clearingCreateHoldFromByPartitionRequest.amount,
           clearingCreateHoldFromByPartitionRequest.sourceId,
           clearingCreateHoldFromByPartitionRequest.targetId,
@@ -1307,10 +1307,10 @@ describe('Clearing', () => {
       ).rejects.toThrow(ValidationError);
     });
 
-    it('should throw error if escrow is invalid', async () => {
+    it('should throw error if escrowId is invalid', async () => {
       const invalidRequest = new ClearingCreateHoldFromByPartitionRequest({
         ...ClearingCreateHoldFromByPartitionRequestFixture.create({
-          escrow: 'invalid',
+          escrowId: 'invalid',
         }),
       });
 
@@ -1368,7 +1368,7 @@ describe('Clearing', () => {
         new ProtectedClearingCreateHoldByPartitionCommand(
           protectedClearingCreateHoldByPartitionRequest.securityId,
           protectedClearingCreateHoldByPartitionRequest.partitionId,
-          protectedClearingCreateHoldByPartitionRequest.escrow,
+          protectedClearingCreateHoldByPartitionRequest.escrowId,
           protectedClearingCreateHoldByPartitionRequest.amount,
           protectedClearingCreateHoldByPartitionRequest.sourceId,
           protectedClearingCreateHoldByPartitionRequest.targetId,
@@ -1399,7 +1399,7 @@ describe('Clearing', () => {
         new ProtectedClearingCreateHoldByPartitionCommand(
           protectedClearingCreateHoldByPartitionRequest.securityId,
           protectedClearingCreateHoldByPartitionRequest.partitionId,
-          protectedClearingCreateHoldByPartitionRequest.escrow,
+          protectedClearingCreateHoldByPartitionRequest.escrowId,
           protectedClearingCreateHoldByPartitionRequest.amount,
           protectedClearingCreateHoldByPartitionRequest.sourceId,
           protectedClearingCreateHoldByPartitionRequest.targetId,
@@ -1448,10 +1448,10 @@ describe('Clearing', () => {
       ).rejects.toThrow(ValidationError);
     });
 
-    it('should throw error if escrow is invalid', async () => {
+    it('should throw error if escrowId is invalid', async () => {
       const invalidRequest = new ProtectedClearingCreateHoldByPartitionRequest({
         ...ProtectedClearingCreateHoldByPartitionRequestFixture.create({
-          escrow: 'invalid',
+          escrowId: 'invalid',
         }),
       });
 
@@ -1732,7 +1732,7 @@ describe('Clearing', () => {
           ),
           data: expectedResponse.payload.data,
           operatorData: expectedResponse.payload.operatorData,
-          holdEscrow: expectedResponse.payload.holdEscrow,
+          holdEscrowId: expectedResponse.payload.holdEscrowId,
           holdExpirationDate: new Date(
             expectedResponse.payload.holdExpirationTimestamp * ONE_THOUSAND,
           ),
@@ -2122,7 +2122,7 @@ describe('Clearing', () => {
         new OperatorClearingCreateHoldByPartitionCommand(
           operatorClearingCreateHoldByPartitionRequest.securityId,
           operatorClearingCreateHoldByPartitionRequest.partitionId,
-          operatorClearingCreateHoldByPartitionRequest.escrow,
+          operatorClearingCreateHoldByPartitionRequest.escrowId,
           operatorClearingCreateHoldByPartitionRequest.amount,
           operatorClearingCreateHoldByPartitionRequest.sourceId,
           operatorClearingCreateHoldByPartitionRequest.targetId,
@@ -2150,7 +2150,7 @@ describe('Clearing', () => {
         new OperatorClearingCreateHoldByPartitionCommand(
           operatorClearingCreateHoldByPartitionRequest.securityId,
           operatorClearingCreateHoldByPartitionRequest.partitionId,
-          operatorClearingCreateHoldByPartitionRequest.escrow,
+          operatorClearingCreateHoldByPartitionRequest.escrowId,
           operatorClearingCreateHoldByPartitionRequest.amount,
           operatorClearingCreateHoldByPartitionRequest.sourceId,
           operatorClearingCreateHoldByPartitionRequest.targetId,
@@ -2196,10 +2196,10 @@ describe('Clearing', () => {
       ).rejects.toThrow(ValidationError);
     });
 
-    it('should throw error if escrow is invalid', async () => {
+    it('should throw error if escrowId is invalid', async () => {
       const invalidRequest = new OperatorClearingCreateHoldByPartitionRequest({
         ...OperatorClearingCreateHoldByPartitionRequestFixture.create({
-          escrow: 'invalid',
+          escrowId: 'invalid',
         }),
       });
 
diff --git a/packages/ats/sdk/src/port/in/security/hold/Hold.ts b/packages/ats/sdk/src/port/in/security/hold/Hold.ts
index 83f5115d2..d979537c4 100644
--- a/packages/ats/sdk/src/port/in/security/hold/Hold.ts
+++ b/packages/ats/sdk/src/port/in/security/hold/Hold.ts
@@ -284,7 +284,7 @@ export class SecurityInPortHold
       securityId,
       partitionId,
       amount,
-      escrow,
+      escrowId,
       targetId,
       expirationDate,
     } = request;
@@ -294,7 +294,7 @@ export class SecurityInPortHold
       new CreateHoldByPartitionCommand(
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         targetId,
         expirationDate,
@@ -310,7 +310,7 @@ export class SecurityInPortHold
       securityId,
       partitionId,
       amount,
-      escrow,
+      escrowId,
       sourceId,
       targetId,
       expirationDate,
@@ -323,7 +323,7 @@ export class SecurityInPortHold
       new CreateHoldFromByPartitionCommand(
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
@@ -340,7 +340,7 @@ export class SecurityInPortHold
       securityId,
       partitionId,
       amount,
-      escrow,
+      escrowId,
       sourceId,
       targetId,
       expirationDate,
@@ -353,7 +353,7 @@ export class SecurityInPortHold
       new ControllerCreateHoldByPartitionCommand(
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
@@ -370,7 +370,7 @@ export class SecurityInPortHold
       securityId,
       partitionId,
       amount,
-      escrow,
+      escrowId,
       sourceId,
       targetId,
       expirationDate,
@@ -386,7 +386,7 @@ export class SecurityInPortHold
       new ProtectedCreateHoldByPartitionCommand(
         securityId,
         partitionId,
-        escrow,
+        escrowId,
         amount,
         sourceId,
         targetId,
diff --git a/packages/ats/sdk/src/port/in/security/hold/Hold.unit.test.ts b/packages/ats/sdk/src/port/in/security/hold/Hold.unit.test.ts
index 3480b6b88..fad200ebd 100644
--- a/packages/ats/sdk/src/port/in/security/hold/Hold.unit.test.ts
+++ b/packages/ats/sdk/src/port/in/security/hold/Hold.unit.test.ts
@@ -319,7 +319,7 @@ describe('Hold', () => {
         new CreateHoldByPartitionCommand(
           createHoldByPartitionRequest.securityId,
           createHoldByPartitionRequest.partitionId,
-          createHoldByPartitionRequest.escrow,
+          createHoldByPartitionRequest.escrowId,
           createHoldByPartitionRequest.amount,
           createHoldByPartitionRequest.targetId,
           createHoldByPartitionRequest.expirationDate,
@@ -345,7 +345,7 @@ describe('Hold', () => {
         new CreateHoldByPartitionCommand(
           createHoldByPartitionRequest.securityId,
           createHoldByPartitionRequest.partitionId,
-          createHoldByPartitionRequest.escrow,
+          createHoldByPartitionRequest.escrowId,
           createHoldByPartitionRequest.amount,
           createHoldByPartitionRequest.targetId,
           createHoldByPartitionRequest.expirationDate,
@@ -389,10 +389,10 @@ describe('Hold', () => {
       ).rejects.toThrow(ValidationError);
     });
 
-    it('should throw error if escrow is invalid', async () => {
+    it('should throw error if escrowId is invalid', async () => {
       createHoldByPartitionRequest = new CreateHoldByPartitionRequest({
         ...CreateHoldByPartitionRequestFixture.create({
-          escrow: 'invalid',
+          escrowId: 'invalid',
         }),
       });
 
@@ -440,7 +440,7 @@ describe('Hold', () => {
         new CreateHoldFromByPartitionCommand(
           createHoldFromByPartitionRequest.securityId,
           createHoldFromByPartitionRequest.partitionId,
-          createHoldFromByPartitionRequest.escrow,
+          createHoldFromByPartitionRequest.escrowId,
           createHoldFromByPartitionRequest.amount,
           createHoldFromByPartitionRequest.sourceId,
           createHoldFromByPartitionRequest.targetId,
@@ -467,7 +467,7 @@ describe('Hold', () => {
         new CreateHoldFromByPartitionCommand(
           createHoldFromByPartitionRequest.securityId,
           createHoldFromByPartitionRequest.partitionId,
-          createHoldFromByPartitionRequest.escrow,
+          createHoldFromByPartitionRequest.escrowId,
           createHoldFromByPartitionRequest.amount,
           createHoldFromByPartitionRequest.sourceId,
           createHoldFromByPartitionRequest.targetId,
@@ -512,10 +512,10 @@ describe('Hold', () => {
       ).rejects.toThrow(ValidationError);
     });
 
-    it('should throw error if escrow is invalid', async () => {
+    it('should throw error if escrowId is invalid', async () => {
       createHoldFromByPartitionRequest = new CreateHoldFromByPartitionRequest({
         ...CreateHoldFromByPartitionRequestFixture.create({
-          escrow: 'invalid',
+          escrowId: 'invalid',
         }),
       });
 
@@ -575,7 +575,7 @@ describe('Hold', () => {
         new ControllerCreateHoldByPartitionCommand(
           controllerCreateHoldByPartitionRequest.securityId,
           controllerCreateHoldByPartitionRequest.partitionId,
-          controllerCreateHoldByPartitionRequest.escrow,
+          controllerCreateHoldByPartitionRequest.escrowId,
           controllerCreateHoldByPartitionRequest.amount,
           controllerCreateHoldByPartitionRequest.sourceId,
           controllerCreateHoldByPartitionRequest.targetId,
@@ -604,7 +604,7 @@ describe('Hold', () => {
         new ControllerCreateHoldByPartitionCommand(
           controllerCreateHoldByPartitionRequest.securityId,
           controllerCreateHoldByPartitionRequest.partitionId,
-          controllerCreateHoldByPartitionRequest.escrow,
+          controllerCreateHoldByPartitionRequest.escrowId,
           controllerCreateHoldByPartitionRequest.amount,
           controllerCreateHoldByPartitionRequest.sourceId,
           controllerCreateHoldByPartitionRequest.targetId,
@@ -658,11 +658,11 @@ describe('Hold', () => {
       ).rejects.toThrow(ValidationError);
     });
 
-    it('should throw error if escrow is invalid', async () => {
+    it('should throw error if escrowId is invalid', async () => {
       controllerCreateHoldByPartitionRequest =
         new ControllerCreateHoldByPartitionRequest({
           ...ControllerCreateHoldByPartitionRequestFixture.create({
-            escrow: 'invalid',
+            escrowId: 'invalid',
           }),
         });
 
@@ -730,7 +730,7 @@ describe('Hold', () => {
         new ProtectedCreateHoldByPartitionCommand(
           protectedCreateHoldByPartitionRequest.securityId,
           protectedCreateHoldByPartitionRequest.partitionId,
-          protectedCreateHoldByPartitionRequest.escrow,
+          protectedCreateHoldByPartitionRequest.escrowId,
           protectedCreateHoldByPartitionRequest.amount,
           protectedCreateHoldByPartitionRequest.sourceId,
           protectedCreateHoldByPartitionRequest.targetId,
@@ -762,7 +762,7 @@ describe('Hold', () => {
         new ProtectedCreateHoldByPartitionCommand(
           protectedCreateHoldByPartitionRequest.securityId,
           protectedCreateHoldByPartitionRequest.partitionId,
-          protectedCreateHoldByPartitionRequest.escrow,
+          protectedCreateHoldByPartitionRequest.escrowId,
           protectedCreateHoldByPartitionRequest.amount,
           protectedCreateHoldByPartitionRequest.sourceId,
           protectedCreateHoldByPartitionRequest.targetId,
@@ -819,11 +819,11 @@ describe('Hold', () => {
       ).rejects.toThrow(ValidationError);
     });
 
-    it('should throw error if escrow is invalid', async () => {
+    it('should throw error if escrowId is invalid', async () => {
       protectedCreateHoldByPartitionRequest =
         new ProtectedCreateHoldByPartitionRequest({
           ...ProtectedCreateHoldByPartitionRequestFixture.create({
-            escrow: 'invalid',
+            escrowId: 'invalid',
           }),
         });
 
diff --git a/packages/ats/sdk/src/port/out/TransactionAdapter.ts b/packages/ats/sdk/src/port/out/TransactionAdapter.ts
index 3bc017cc1..c49ac7612 100644
--- a/packages/ats/sdk/src/port/out/TransactionAdapter.ts
+++ b/packages/ats/sdk/src/port/out/TransactionAdapter.ts
@@ -381,6 +381,7 @@ interface ITransactionAdapter {
     recordDate: BigDecimal,
     executionDate: BigDecimal,
     rate: BigDecimal,
+    period: BigDecimal,
     securityId?: ContractId | string,
   ): Promise<TransactionResponse<any, Error>>;
   setDocument(
@@ -561,7 +562,7 @@ interface IHoldTransactionAdapter {
   createHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
@@ -570,7 +571,7 @@ interface IHoldTransactionAdapter {
   createHoldFromByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -580,7 +581,7 @@ interface IHoldTransactionAdapter {
   controllerCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -591,7 +592,7 @@ interface IHoldTransactionAdapter {
     security: EvmAddress,
     partitionId: string,
     amount: BigDecimal,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
@@ -760,7 +761,7 @@ interface IClearingAdapter {
   clearingCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     targetId: EvmAddress,
     clearingExpirationDate: BigDecimal,
@@ -770,7 +771,7 @@ interface IClearingAdapter {
   clearingCreateHoldFromByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -782,7 +783,7 @@ interface IClearingAdapter {
     security: EvmAddress,
     partitionId: string,
     amount: BigDecimal,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     clearingExpirationDate: BigDecimal,
@@ -795,7 +796,7 @@ interface IClearingAdapter {
   operatorClearingCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -1269,6 +1270,7 @@ export default abstract class TransactionAdapter
     recordDate: BigDecimal,
     executionDate: BigDecimal,
     rate: BigDecimal,
+    period: BigDecimal,
     securityId?: ContractId | string,
   ): Promise<TransactionResponse<any, Error>>;
   abstract setVotingRights(
@@ -1391,7 +1393,7 @@ export default abstract class TransactionAdapter
   abstract createHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
@@ -1400,7 +1402,7 @@ export default abstract class TransactionAdapter
   abstract createHoldFromByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -1410,7 +1412,7 @@ export default abstract class TransactionAdapter
   abstract controllerCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -1421,7 +1423,7 @@ export default abstract class TransactionAdapter
     security: EvmAddress,
     partitionId: string,
     amount: BigDecimal,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
@@ -1573,7 +1575,7 @@ export default abstract class TransactionAdapter
   abstract clearingCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     targetId: EvmAddress,
     clearingExpirationDate: BigDecimal,
@@ -1583,7 +1585,7 @@ export default abstract class TransactionAdapter
   abstract clearingCreateHoldFromByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -1595,7 +1597,7 @@ export default abstract class TransactionAdapter
     security: EvmAddress,
     partitionId: string,
     amount: BigDecimal,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     clearingExpirationDate: BigDecimal,
@@ -1608,7 +1610,7 @@ export default abstract class TransactionAdapter
   abstract operatorClearingCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -1837,4 +1839,59 @@ export default abstract class TransactionAdapter
     amount: BigDecimal,
     securityId?: ContractId | string,
   ): Promise<TransactionResponse>;
+
+  abstract createTrexSuiteBond(
+    salt: string,
+    owner: string,
+    irs: string,
+    onchainId: string,
+    irAgents: string[],
+    tokenAgents: string[],
+    compliancesModules: string[],
+    complianceSettings: string[],
+    claimTopics: number[],
+    issuers: string[],
+    issuerClaims: number[][],
+    security: Security,
+    bondDetails: BondDetails,
+    couponDetails: CouponDetails,
+    factory: EvmAddress,
+    resolver: EvmAddress,
+    configId: string,
+    configVersion: number,
+    compliance: EvmAddress,
+    identityRegistryAddress: EvmAddress,
+    diamondOwnerAccount: EvmAddress,
+    externalPauses?: EvmAddress[],
+    externalControlLists?: EvmAddress[],
+    externalKycLists?: EvmAddress[],
+    factoryId?: ContractId | string,
+  ): Promise<TransactionResponse>;
+
+  abstract createTrexSuiteEquity(
+    salt: string,
+    owner: string,
+    irs: string,
+    onchainId: string,
+    irAgents: string[],
+    tokenAgents: string[],
+    compliancesModules: string[],
+    complianceSettings: string[],
+    claimTopics: number[],
+    issuers: string[],
+    issuerClaims: number[][],
+    security: Security,
+    equityDetails: EquityDetails,
+    factory: EvmAddress,
+    resolver: EvmAddress,
+    configId: string,
+    configVersion: number,
+    compliance: EvmAddress,
+    identityRegistryAddress: EvmAddress,
+    diamondOwnerAccount: EvmAddress,
+    externalPauses?: EvmAddress[],
+    externalControlLists?: EvmAddress[],
+    externalKycLists?: EvmAddress[],
+    factoryId?: ContractId | string,
+  ): Promise<TransactionResponse>;
 }
diff --git a/packages/ats/sdk/src/port/out/hs/HederaTransactionAdapter.ts b/packages/ats/sdk/src/port/out/hs/HederaTransactionAdapter.ts
index eacfb4f06..30cd21391 100644
--- a/packages/ats/sdk/src/port/out/hs/HederaTransactionAdapter.ts
+++ b/packages/ats/sdk/src/port/out/hs/HederaTransactionAdapter.ts
@@ -216,31 +216,31 @@ import {
   Transaction,
 } from '@hashgraph/sdk';
 import {
-  AccessControl__factory,
+  AccessControlFacet__factory,
   Bond__factory,
-  BondUSA__factory,
-  Cap__factory,
-  ControlList__factory,
+  BondUSAFacet__factory,
+  CapFacet__factory,
+  ControlListFacet__factory,
   DiamondFacet__factory,
-  EquityUSA__factory,
-  ERC1643__factory,
+  EquityUSAFacet__factory,
+  ERC1643Facet__factory,
   Factory__factory,
-  Lock__factory,
-  ScheduledTasks__factory,
-  Snapshots__factory,
-  TransferAndLock__factory,
-  SsiManagement__factory,
-  Kyc__factory,
+  LockFacet__factory,
+  ScheduledTasksFacet__factory,
+  SnapshotsFacet__factory,
+  TransferAndLockFacet__factory,
+  SsiManagementFacet__factory,
+  KycFacet__factory,
   ClearingTransferFacet__factory,
   ClearingRedeemFacet__factory,
   ClearingHoldCreationFacet__factory,
   ClearingActionsFacet__factory,
-  ExternalPauseManagement__factory,
+  ExternalPauseManagementFacet__factory,
   MockedExternalPause__factory,
-  ExternalControlListManagement__factory,
+  ExternalControlListManagementFacet__factory,
   MockedBlacklist__factory,
   MockedWhitelist__factory,
-  ExternalKycListManagement__factory,
+  ExternalKycListManagementFacet__factory,
   MockedExternalKycList__factory,
   FreezeFacet__factory,
   ERC1410TokenHolderFacet__factory,
@@ -250,6 +250,7 @@ import {
   ERC3643ManagementFacet__factory,
   ERC3643OperationsFacet__factory,
   ERC3643BatchFacet__factory,
+  TREXFactoryAts__factory,
 } from '@hashgraph/asset-tokenization-contracts';
 import { _PARTITION_ID_1, EVM_ZERO_ADDRESS, GAS } from '@core/Constants';
 import TransactionAdapter from '../TransactionAdapter';
@@ -689,7 +690,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Transfering ${amount} securities to account ${targetId.toString()} and locking them until ${expirationDate.toString()}`,
     );
     return this.executeWithArgs(
-      new TransferAndLock__factory().attach(security.toString()),
+      new TransferAndLockFacet__factory().attach(security.toString()),
       'transferAndLockByPartition',
       securityId,
       GAS.TRANSFER_AND_LOCK,
@@ -778,7 +779,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
 
     const contract = new Contract(
       security.toString(),
-      AccessControl__factory.abi,
+      AccessControlFacet__factory.abi,
     );
 
     return this.executeWithArgs(
@@ -802,7 +803,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
 
     const contract = new Contract(
       security.toString(),
-      AccessControl__factory.abi,
+      AccessControlFacet__factory.abi,
     );
     return this.executeWithArgs(contract, 'applyRoles', securityId, gas, [
       roles,
@@ -823,7 +824,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
 
     const contract = new Contract(
       security.toString(),
-      AccessControl__factory.abi,
+      AccessControlFacet__factory.abi,
     );
     return this.executeWithArgs(
       contract,
@@ -843,7 +844,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
 
     const contract = new Contract(
       security.toString(),
-      AccessControl__factory.abi,
+      AccessControlFacet__factory.abi,
     );
     return this.executeWithArgs(
       contract,
@@ -906,7 +907,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Adding account ${targetId.toString()} to a control list`,
     );
     return this.executeWithArgs(
-      new ControlList__factory().attach(security.toString()),
+      new ControlListFacet__factory().attach(security.toString()),
       'addToControlList',
       securityId,
       GAS.ADD_TO_CONTROL_LIST,
@@ -923,7 +924,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Removing account ${targetId.toString()} from a control list`,
     );
     return this.executeWithArgs(
-      new ControlList__factory().attach(security.toString()),
+      new ControlListFacet__factory().attach(security.toString()),
       'removeFromControlList',
       securityId,
       GAS.REMOVE_FROM_CONTROL_LIST,
@@ -955,7 +956,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     };
 
     return this.executeWithArgs(
-      new TransferAndLock__factory().attach(security.toString()),
+      new TransferAndLockFacet__factory().attach(security.toString()),
       'protectedTransferAndLockByPartition',
       securityId,
       GAS.PROTECTED_TRANSFER_AND_LOCK,
@@ -1052,7 +1053,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       amount: amount.toHexString(),
     };
     return this.executeWithArgs(
-      new EquityUSA__factory().attach(security.toString()),
+      new EquityUSAFacet__factory().attach(security.toString()),
       'setDividends',
       securityId,
       GAS.SET_DIVIDENDS,
@@ -1076,7 +1077,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       data: data,
     };
     return this.executeWithArgs(
-      new EquityUSA__factory().attach(security.toString()),
+      new EquityUSAFacet__factory().attach(security.toString()),
       'setVoting',
       securityId,
       GAS.SET_VOTING_RIGHTS,
@@ -1089,22 +1090,25 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     recordDate: BigDecimal,
     executionDate: BigDecimal,
     rate: BigDecimal,
+    period: BigDecimal,
     securityId: ContractId | string,
   ): Promise<TransactionResponse<any, Error>> {
     LogService.logTrace(
       `bond: ${security} ,
       recordDate :${recordDate} , 
       executionDate: ${executionDate},
-      rate : ${rate}  `,
+      rate : ${rate},
+      period: ${period}`,
     );
 
     const coupon = {
       recordDate: recordDate.toHexString(),
       executionDate: executionDate.toHexString(),
       rate: rate.toHexString(),
+      period: period.toHexString(),
     };
     return this.executeWithArgs(
-      new BondUSA__factory().attach(security.toString()),
+      new BondUSAFacet__factory().attach(security.toString()),
       'setCoupon',
       securityId,
       GAS.SET_COUPON,
@@ -1119,7 +1123,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Take snapshot of: ${security.toString()}`);
 
     return this.executeWithArgs(
-      new Snapshots__factory().attach(security.toString()),
+      new SnapshotsFacet__factory().attach(security.toString()),
       'takeSnapshot',
       securityId,
       GAS.TAKE_SNAPSHOT,
@@ -1138,7 +1142,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Setting document: ${name}, with ${uri}, and hash ${hash} for security ${security.toString()}`,
     );
     return this.executeWithArgs(
-      new ERC1643__factory().attach(security.toString()),
+      new ERC1643Facet__factory().attach(security.toString()),
       'setDocument',
       securityId,
       GAS.SET_DOCUMENT,
@@ -1155,7 +1159,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Removing document: ${name} for security ${security.toString()}`,
     );
     return this.executeWithArgs(
-      new ERC1643__factory().attach(security.toString()),
+      new ERC1643Facet__factory().attach(security.toString()),
       'removeDocument',
       securityId,
       GAS.REMOVE_DOCUMENT,
@@ -1272,7 +1276,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new Cap__factory().attach(security.toString()),
+      new CapFacet__factory().attach(security.toString()),
       'setMaxSupply',
       securityId,
       GAS.SET_MAX_SUPPLY,
@@ -1288,7 +1292,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Triggering pending scheduled snapshots for ${security.toString()}`,
     );
     return this.executeWithArgs(
-      new ScheduledTasks__factory().attach(security.toString()),
+      new ScheduledTasksFacet__factory().attach(security.toString()),
       'triggerPendingScheduledTasks',
       securityId,
       GAS.TRIGGER_PENDING_SCHEDULED_SNAPSHOTS,
@@ -1305,7 +1309,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Triggering up to ${max.toString()} pending scheduled snapshots for ${security.toString()}`,
     );
     return this.executeWithArgs(
-      new ScheduledTasks__factory().attach(security.toString()),
+      new ScheduledTasksFacet__factory().attach(security.toString()),
       'triggerScheduledTasks',
       securityId,
       GAS.TRIGGER_PENDING_SCHEDULED_SNAPSHOTS,
@@ -1324,7 +1328,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Locking ${amount} tokens from account ${sourceId.toString()} until ${expirationDate}`,
     );
     return this.executeWithArgs(
-      new Lock__factory().attach(security.toString()),
+      new LockFacet__factory().attach(security.toString()),
       'lockByPartition',
       securityId,
       GAS.LOCK,
@@ -1347,7 +1351,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Releasing lock ${lockId} from account ${sourceId.toString()}`,
     );
     return this.executeWithArgs(
-      new Lock__factory().attach(security.toString()),
+      new LockFacet__factory().attach(security.toString()),
       'releaseByPartition',
       securityId,
       GAS.RELEASE,
@@ -1441,7 +1445,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       decimals: decimals.toHexString(),
     };
     return this.executeWithArgs(
-      new EquityUSA__factory().attach(security.toString()),
+      new EquityUSAFacet__factory().attach(security.toString()),
       'setScheduledBalanceAdjustment',
       securityId,
       GAS.SET_SCHEDULED_BALANCE_ADJUSTMENT,
@@ -1562,7 +1566,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       expirationTimestamp: expirationDate.toBigNumber(),
     };
     return this.executeWithArgs(
-      new TransferAndLock__factory().attach(security.toString()),
+      new TransferAndLockFacet__factory().attach(security.toString()),
       'protectedTransferAndLock',
       securityId,
       GAS.PROTECTED_TRANSFER_AND_LOCK,
@@ -1578,19 +1582,19 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
   async createHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
     securityId: ContractId | string,
   ): Promise<TransactionResponse<any, Error>> {
     LogService.logTrace(
-      `Holding ${amount} tokens from account ${targetId.toString()} until ${expirationDate} with escrow ${escrow}`,
+      `Holding ${amount} tokens from account ${targetId.toString()} until ${expirationDate} with escrow ${escrowId}`,
     );
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: expirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -1606,7 +1610,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
   async createHoldFromByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -1614,13 +1618,13 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     securityId: ContractId | string,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
-      `Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrow}`,
+      `Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrowId}`,
     );
 
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: expirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -1636,7 +1640,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
   async controllerCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -1644,13 +1648,13 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     securityId: ContractId | string,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
-      `Controller Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrow}`,
+      `Controller Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrowId}`,
     );
 
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: expirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -1668,7 +1672,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     security: EvmAddress,
     partitionId: string,
     amount: BigDecimal,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
@@ -1678,13 +1682,13 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     securityId: ContractId | string,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
-      `Protected Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrow}`,
+      `Protected Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrowId}`,
     );
 
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: expirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -1790,7 +1794,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Adding issuer ${issuer}`);
 
     return this.executeWithArgs(
-      new SsiManagement__factory().attach(security.toString()),
+      new SsiManagementFacet__factory().attach(security.toString()),
       'addIssuer',
       securityId,
       GAS.ADD_ISSUER,
@@ -1807,7 +1811,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       `Setting revocation registry address ${revocationRegistry}`,
     );
     return this.executeWithArgs(
-      new SsiManagement__factory().attach(security.toString()),
+      new SsiManagementFacet__factory().attach(security.toString()),
       'setRevocationRegistryAddress',
       securityId,
       GAS.SET_REVOCATION_REGISTRY,
@@ -1823,7 +1827,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Removing issuer ${issuer}`);
 
     return this.executeWithArgs(
-      new SsiManagement__factory().attach(security.toString()),
+      new SsiManagementFacet__factory().attach(security.toString()),
       'removeIssuer',
       securityId,
       GAS.REMOVE_ISSUER,
@@ -1845,7 +1849,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new Kyc__factory().attach(security.toString()),
+      new KycFacet__factory().attach(security.toString()),
       'grantKyc',
       securityId,
       GAS.GRANT_KYC,
@@ -1867,7 +1871,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Revoking KYC to address ${targetId.toString()}`);
 
     return this.executeWithArgs(
-      new Kyc__factory().attach(security.toString()),
+      new KycFacet__factory().attach(security.toString()),
       'revokeKyc',
       securityId,
       GAS.REVOKE_KYC,
@@ -2189,7 +2193,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
   async clearingCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     targetId: EvmAddress,
     clearingExpirationDate: BigDecimal,
@@ -2209,7 +2213,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: holdExpirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -2226,7 +2230,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
   async clearingCreateHoldFromByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -2251,7 +2255,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: holdExpirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -2269,7 +2273,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     security: EvmAddress,
     partitionId: string,
     amount: BigDecimal,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     clearingExpirationDate: BigDecimal,
@@ -2297,7 +2301,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: holdExpirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -2314,7 +2318,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
   async operatorClearingCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -2339,7 +2343,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: holdExpirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -2427,7 +2431,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalPauseManagement__factory().attach(security.toString()),
+      new ExternalPauseManagementFacet__factory().attach(security.toString()),
       'updateExternalPauses',
       securityId,
       GAS.UPDATE_EXTERNAL_PAUSES,
@@ -2445,7 +2449,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalPauseManagement__factory().attach(security.toString()),
+      new ExternalPauseManagementFacet__factory().attach(security.toString()),
       'addExternalPause',
       securityId,
       GAS.ADD_EXTERNAL_PAUSE,
@@ -2463,7 +2467,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalPauseManagement__factory().attach(security.toString()),
+      new ExternalPauseManagementFacet__factory().attach(security.toString()),
       'removeExternalPause',
       securityId,
       GAS.REMOVE_EXTERNAL_PAUSE,
@@ -2515,7 +2519,9 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalControlListManagement__factory().attach(security.toString()),
+      new ExternalControlListManagementFacet__factory().attach(
+        security.toString(),
+      ),
       'updateExternalControlLists',
       securityId,
       GAS.UPDATE_EXTERNAL_CONTROL_LISTS,
@@ -2536,7 +2542,9 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalControlListManagement__factory().attach(security.toString()),
+      new ExternalControlListManagementFacet__factory().attach(
+        security.toString(),
+      ),
       'addExternalControlList',
       securityId,
       GAS.ADD_EXTERNAL_CONTROL_LIST,
@@ -2554,7 +2562,9 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalControlListManagement__factory().attach(security.toString()),
+      new ExternalControlListManagementFacet__factory().attach(
+        security.toString(),
+      ),
       'removeExternalControlList',
       securityId,
       GAS.REMOVE_EXTERNAL_CONTROL_LIST,
@@ -2675,7 +2685,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalKycListManagement__factory().attach(security.toString()),
+      new ExternalKycListManagementFacet__factory().attach(security.toString()),
       'updateExternalKycLists',
       securityId,
       GAS.UPDATE_EXTERNAL_KYC_LISTS,
@@ -2693,7 +2703,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalKycListManagement__factory().attach(security.toString()),
+      new ExternalKycListManagementFacet__factory().attach(security.toString()),
       'addExternalKycList',
       securityId,
       GAS.ADD_EXTERNAL_KYC_LIST,
@@ -2711,7 +2721,7 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeWithArgs(
-      new ExternalKycListManagement__factory().attach(security.toString()),
+      new ExternalKycListManagementFacet__factory().attach(security.toString()),
       'removeExternalKycList',
       securityId,
       GAS.REMOVE_EXTERNAL_KYC_LIST,
@@ -3159,6 +3169,298 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
   }
 
+  async createTrexSuiteBond(
+    salt: string,
+    owner: string,
+    irs: string,
+    onchainId: string,
+    irAgents: string[],
+    tokenAgents: string[],
+    compliancesModules: string[],
+    complianceSettings: string[],
+    claimTopics: number[],
+    issuers: string[],
+    issuerClaims: number[][],
+    security: Security,
+    bondDetails: BondDetails,
+    couponDetails: CouponDetails,
+    factory: EvmAddress,
+    resolver: EvmAddress,
+    configId: string,
+    configVersion: number,
+    compliance: EvmAddress,
+    identityRegistryAddress: EvmAddress,
+    diamondOwnerAccount: EvmAddress,
+    externalPauses?: EvmAddress[],
+    externalControlLists?: EvmAddress[],
+    externalKycLists?: EvmAddress[],
+    factoryId?: ContractId | string,
+  ): Promise<TransactionResponse> {
+    LogService.logTrace(`Deploying trex suite bond: ${security.toString()}`);
+    if (!security.regulationType) {
+      throw new MissingRegulationType();
+    }
+    if (!security.regulationsubType) {
+      throw new MissingRegulationSubType();
+    }
+
+    const rbacAdmin: Rbac = {
+      role: SecurityRole._DEFAULT_ADMIN_ROLE,
+      members: [diamondOwnerAccount!.toString()],
+    };
+    const rbacs: Rbac[] = [rbacAdmin];
+
+    const erc20MetadataInfo: ERC20MetadataInfo = {
+      name: security.name,
+      symbol: security.symbol,
+      isin: security.isin,
+      decimals: security.decimals,
+    };
+
+    const resolverProxyConfiguration: ResolverProxyConfiguration = {
+      key: configId,
+      version: configVersion,
+    };
+
+    const securityData: SecurityData = {
+      arePartitionsProtected: security.arePartitionsProtected,
+      isMultiPartition: security.isMultiPartition,
+      resolver: resolver.toString(),
+      resolverProxyConfiguration: resolverProxyConfiguration,
+      rbacs: rbacs,
+      isControllable: security.isControllable,
+      isWhiteList: security.isWhiteList,
+      maxSupply: security.maxSupply ? security.maxSupply.toString() : '0',
+      erc20MetadataInfo: erc20MetadataInfo,
+      clearingActive: security.clearingActive,
+      internalKycActivated: security.internalKycActivated,
+      externalPauses:
+        externalPauses?.map((address) => address.toString()) ?? [],
+      externalControlLists:
+        externalControlLists?.map((address) => address.toString()) ?? [],
+      externalKycLists:
+        externalKycLists?.map((address) => address.toString()) ?? [],
+      compliance: compliance.toString(),
+      identityRegistry: identityRegistryAddress.toString(),
+      erc20VotesActivated: security.erc20VotesActivated,
+    };
+
+    const bondDetailsData = new BondDetailsData(
+      bondDetails.currency,
+      bondDetails.nominalValue.toString(),
+      bondDetails.startingDate.toString(),
+      bondDetails.maturityDate.toString(),
+    );
+
+    const couponDetailsData: CouponDetailsData = {
+      couponFrequency: couponDetails.couponFrequency.toString(),
+      couponRate: couponDetails.couponRate.toString(),
+      firstCouponDate: couponDetails.firstCouponDate.toString(),
+    };
+
+    const securityTokenToCreate = new FactoryBondToken(
+      securityData,
+      bondDetailsData,
+      couponDetailsData,
+    );
+
+    const additionalSecurityData: AdditionalSecurityData = {
+      countriesControlListType: security.isCountryControlListWhiteList,
+      listOfCountries: security.countries ?? '',
+      info: security.info ?? '',
+    };
+
+    const factoryRegulationData = new FactoryRegulationData(
+      CastRegulationType.toNumber(security.regulationType),
+      CastRegulationSubType.toNumber(security.regulationsubType),
+      additionalSecurityData,
+    );
+    const contract = new Contract(
+      factory.toString(),
+      TREXFactoryAts__factory.abi,
+    );
+    try {
+      return this.executeWithArgs(
+        contract,
+        'deployTREXSuiteAtsBond',
+        factoryId!,
+        GAS.TREX_CREATE_SUITE,
+        [
+          salt,
+          {
+            owner,
+            irs,
+            ONCHAINID: onchainId,
+            irAgents,
+            tokenAgents,
+            complianceModules: compliancesModules,
+            complianceSettings,
+          },
+          {
+            claimTopics,
+            issuers,
+            issuerClaims,
+          },
+          securityTokenToCreate,
+          factoryRegulationData,
+        ],
+      );
+    } catch (error) {
+      LogService.logError(error);
+      throw new SigningError(
+        `Unexpected error in TREXFactoryAts__factory deploy operation : ${error}`,
+      );
+    }
+  }
+
+  async createTrexSuiteEquity(
+    salt: string,
+    owner: string,
+    irs: string,
+    onchainId: string,
+    irAgents: string[],
+    tokenAgents: string[],
+    compliancesModules: string[],
+    complianceSettings: string[],
+    claimTopics: number[],
+    issuers: string[],
+    issuerClaims: number[][],
+    security: Security,
+    equityDetails: EquityDetails,
+    factory: EvmAddress,
+    resolver: EvmAddress,
+    configId: string,
+    configVersion: number,
+    compliance: EvmAddress,
+    identityRegistryAddress: EvmAddress,
+    diamondOwnerAccount: EvmAddress,
+    externalPauses?: EvmAddress[],
+    externalControlLists?: EvmAddress[],
+    externalKycLists?: EvmAddress[],
+    factoryId?: ContractId | string,
+  ): Promise<TransactionResponse> {
+    LogService.logTrace(`Deploying trex suite equity: ${security.toString()}`);
+    try {
+      if (!security.regulationType) {
+        throw new MissingRegulationType();
+      }
+      if (!security.regulationsubType) {
+        throw new MissingRegulationSubType();
+      }
+
+      const rbacAdmin: Rbac = {
+        role: SecurityRole._DEFAULT_ADMIN_ROLE,
+        members: [diamondOwnerAccount!.toString()],
+      };
+      const rbacs: Rbac[] = [rbacAdmin];
+
+      const erc20MetadataInfo: ERC20MetadataInfo = {
+        name: security.name,
+        symbol: security.symbol,
+        isin: security.isin,
+        decimals: security.decimals,
+      };
+
+      const resolverProxyConfiguration: ResolverProxyConfiguration = {
+        key: configId,
+        version: configVersion,
+      };
+
+      const securityData: SecurityData = {
+        arePartitionsProtected: security.arePartitionsProtected,
+        isMultiPartition: security.isMultiPartition,
+        resolver: resolver.toString(),
+        resolverProxyConfiguration: resolverProxyConfiguration,
+        rbacs: rbacs,
+        isControllable: security.isControllable,
+        isWhiteList: security.isWhiteList,
+        maxSupply: security.maxSupply ? security.maxSupply.toString() : '0',
+        erc20MetadataInfo: erc20MetadataInfo,
+        clearingActive: security.clearingActive,
+        internalKycActivated: security.internalKycActivated,
+        externalPauses:
+          externalPauses?.map((address) => address.toString()) ?? [],
+        externalControlLists:
+          externalControlLists?.map((address) => address.toString()) ?? [],
+        externalKycLists:
+          externalKycLists?.map((address) => address.toString()) ?? [],
+        compliance: compliance.toString(),
+        identityRegistry: identityRegistryAddress?.toString(),
+        erc20VotesActivated: security.erc20VotesActivated,
+      };
+
+      const equityDetailsData: EquityDetailsData = {
+        votingRight: equityDetails.votingRight,
+        informationRight: equityDetails.informationRight,
+        liquidationRight: equityDetails.liquidationRight,
+        subscriptionRight: equityDetails.subscriptionRight,
+        conversionRight: equityDetails.conversionRight,
+        redemptionRight: equityDetails.redemptionRight,
+        putRight: equityDetails.putRight,
+        dividendRight: CastDividendType.toNumber(equityDetails.dividendRight),
+        currency: equityDetails.currency,
+        nominalValue: equityDetails.nominalValue.toString(),
+      };
+
+      const securityTokenToCreate = new FactoryEquityToken(
+        securityData,
+        equityDetailsData,
+      );
+
+      const additionalSecurityData: AdditionalSecurityData = {
+        countriesControlListType: security.isCountryControlListWhiteList,
+        listOfCountries: security.countries ?? '',
+        info: security.info ?? '',
+      };
+
+      const factoryRegulationData = new FactoryRegulationData(
+        CastRegulationType.toNumber(security.regulationType),
+        CastRegulationSubType.toNumber(security.regulationsubType),
+        additionalSecurityData,
+      );
+
+      LogService.logTrace(
+        `Deploying equity: ${{
+          security: securityTokenToCreate,
+        }}`,
+      );
+      const contract = new Contract(
+        factory.toString(),
+        TREXFactoryAts__factory.abi,
+      );
+      return this.executeWithArgs(
+        contract,
+        'deployTREXSuiteAtsEquity',
+        factoryId!,
+        GAS.TREX_CREATE_SUITE,
+        [
+          salt,
+          {
+            owner,
+            irs,
+            ONCHAINID: onchainId,
+            irAgents,
+            tokenAgents,
+            complianceModules: compliancesModules,
+            complianceSettings,
+          },
+          {
+            claimTopics,
+            issuers,
+            issuerClaims,
+          },
+          securityTokenToCreate,
+          factoryRegulationData,
+        ],
+      );
+    } catch (error) {
+      LogService.logError(error);
+      throw new SigningError(
+        `Unexpected error in HederaTransactionAdapter create operation : ${error}`,
+      );
+    }
+  }
+
   // * Definition of the abstract methods
   abstract signAndSendTransaction(
     transaction: Transaction,
diff --git a/packages/ats/sdk/src/port/out/rpc/RPCQueryAdapter.ts b/packages/ats/sdk/src/port/out/rpc/RPCQueryAdapter.ts
index 86c4a430d..a9b7a53ee 100644
--- a/packages/ats/sdk/src/port/out/rpc/RPCQueryAdapter.ts
+++ b/packages/ats/sdk/src/port/out/rpc/RPCQueryAdapter.ts
@@ -223,43 +223,43 @@ import { Dividend } from '@domain/context/equity/Dividend';
 import BigDecimal from '@domain/context/shared/BigDecimal';
 import { HederaId } from '@domain/context/shared/HederaId';
 import {
-  AccessControl__factory,
-  Bond__factory,
+  AccessControlFacet__factory,
   BondRead__factory,
-  Cap__factory,
+  CapFacet__factory,
   ClearingActionsFacet__factory,
   ClearingHoldCreationFacet__factory,
   ClearingReadFacet__factory,
   ClearingRedeemFacet__factory,
   ClearingTransferFacet__factory,
-  ControlList__factory,
+  ControlListFacet__factory,
   DiamondFacet__factory,
   Equity__factory,
   ERC1410ReadFacet__factory,
-  ERC1594__factory,
-  ERC1643__factory,
-  ERC1644__factory,
-  ERC20__factory,
   ERC20Votes__factory,
-  ExternalControlListManagement__factory,
-  ExternalKycListManagement__factory,
-  ExternalPauseManagement__factory,
+  ERC1594Facet__factory,
+  ERC1643Facet__factory,
+  ERC1644Facet__factory,
+  ERC20Facet__factory,
+  ExternalControlListManagementFacet__factory,
+  ExternalKycListManagementFacet__factory,
+  ExternalPauseManagementFacet__factory,
   Factory__factory,
   FreezeFacet__factory,
   HoldReadFacet__factory,
-  Kyc__factory,
-  Lock__factory,
+  KycFacet__factory,
+  LockFacet__factory,
   MockedBlacklist__factory,
   MockedExternalKycList__factory,
   MockedExternalPause__factory,
   MockedWhitelist__factory,
-  Pause__factory,
-  ProtectedPartitions__factory,
-  ScheduledSnapshots__factory,
+  PauseFacet__factory,
+  ProtectedPartitionsFacet__factory,
+  ScheduledSnapshotsFacet__factory,
   Security__factory,
-  Snapshots__factory,
-  SsiManagement__factory,
-  ERC3643Read__factory,
+  SnapshotsFacet__factory,
+  SsiManagementFacet__factory,
+  ERC3643ReadFacet__factory,
+  TREXFactoryAts__factory,
 } from '@hashgraph/asset-tokenization-contracts';
 import { ScheduledSnapshot } from '@domain/context/security/ScheduledSnapshot';
 import { VotingRights } from '@domain/context/equity/VotingRights';
@@ -367,7 +367,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      Snapshots__factory,
+      SnapshotsFacet__factory,
       address.toString(),
     ).balanceOfAtSnapshot(snapshotId, target.toString());
   }
@@ -383,7 +383,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      Snapshots__factory,
+      SnapshotsFacet__factory,
       address.toString(),
     ).balanceOfAtSnapshotByPartition(
       partitionId,
@@ -399,7 +399,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting Nounce`);
 
     return await this.connect(
-      ProtectedPartitions__factory,
+      ProtectedPartitionsFacet__factory,
       address.toString(),
     ).getNounceFor(target.toString());
   }
@@ -428,7 +428,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      Snapshots__factory,
+      SnapshotsFacet__factory,
       address.toString(),
     ).partitionsOfAtSnapshot(snapshotId, targetId.toString());
   }
@@ -453,7 +453,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      Snapshots__factory,
+      SnapshotsFacet__factory,
       address.toString(),
     ).totalSupplyAtSnapshot(snapshotId);
   }
@@ -469,7 +469,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      AccessControl__factory,
+      AccessControlFacet__factory,
       address.toString(),
     ).getRolesFor(target.toString(), start, end);
   }
@@ -485,7 +485,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      AccessControl__factory,
+      AccessControlFacet__factory,
       address.toString(),
     ).getRoleMembers(role, start, end);
   }
@@ -497,7 +497,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting role count for ${target.toString()}`);
 
     const roleCount = await this.connect(
-      AccessControl__factory,
+      AccessControlFacet__factory,
       address.toString(),
     ).getRoleCountFor(target.toString());
 
@@ -508,7 +508,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting role member count for ${role}`);
 
     const membersCount = await this.connect(
-      AccessControl__factory,
+      AccessControlFacet__factory,
       address.toString(),
     ).getRoleMemberCount(role);
 
@@ -525,7 +525,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      AccessControl__factory,
+      AccessControlFacet__factory,
       address.toString(),
     ).hasRole(role, target.toString());
   }
@@ -536,7 +536,7 @@ export class RPCQueryAdapter {
     );
 
     const erc20Metadata = await this.connect(
-      ERC20__factory,
+      ERC20Facet__factory,
       address.toString(),
     ).getERC20Metadata();
     const totalSupply = await this.connect(
@@ -544,11 +544,11 @@ export class RPCQueryAdapter {
       address.toString(),
     ).totalSupply();
     const maxSupply = await this.connect(
-      Cap__factory,
+      CapFacet__factory,
       address.toString(),
     ).getMaxSupply();
     const isWhiteList = await this.connect(
-      ControlList__factory,
+      ControlListFacet__factory,
       address.toString(),
     ).getControlListType();
     const erc20VotesActivated = await this.connect(
@@ -556,11 +556,11 @@ export class RPCQueryAdapter {
       address.toString(),
     ).isActivated();
     const isControllable = await this.connect(
-      ERC1644__factory,
+      ERC1644Facet__factory,
       address.toString(),
     ).isControllable();
     const arePartitionsProtected = await this.connect(
-      ProtectedPartitions__factory,
+      ProtectedPartitionsFacet__factory,
       address.toString(),
     ).arePartitionsProtected();
     const clearingActive = await this.connect(
@@ -568,7 +568,7 @@ export class RPCQueryAdapter {
       address.toString(),
     ).isClearingActivated();
     const internalKycActivated = await this.connect(
-      Kyc__factory,
+      KycFacet__factory,
       address.toString(),
     ).isInternalKycActivated();
     const isMultiPartition = await this.connect(
@@ -576,11 +576,11 @@ export class RPCQueryAdapter {
       address.toString(),
     ).isMultiPartition();
     const isIssuable = await this.connect(
-      ERC1594__factory,
+      ERC1594Facet__factory,
       address.toString(),
     ).isIssuable();
     const isPaused = await this.connect(
-      Pause__factory,
+      PauseFacet__factory,
       address.toString(),
     ).isPaused();
     const regulationInfo = await this.connect(
@@ -714,7 +714,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting control list members from ${start} to ${end}`);
 
     return await this.connect(
-      ControlList__factory,
+      ControlListFacet__factory,
       address.toString(),
     ).getControlListMembers(start, end);
   }
@@ -723,7 +723,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting control list count`);
 
     const controlListCount = await this.connect(
-      ControlList__factory,
+      ControlListFacet__factory,
       address.toString(),
     ).getControlListCount();
 
@@ -734,7 +734,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting control list type`);
 
     return await this.connect(
-      ControlList__factory,
+      ControlListFacet__factory,
       address.toString(),
     ).getControlListType();
   }
@@ -748,7 +748,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ControlList__factory,
+      ControlListFacet__factory,
       address.toString(),
     ).isInControlList(target.toString());
   }
@@ -889,7 +889,10 @@ export class RPCQueryAdapter {
       `Checking if the security: ${address.toString()} is paused`,
     );
 
-    return await this.connect(Pause__factory, address.toString()).isPaused();
+    return await this.connect(
+      PauseFacet__factory,
+      address.toString(),
+    ).isPaused();
   }
 
   async arePartitionsProtected(address: EvmAddress): Promise<boolean> {
@@ -898,7 +901,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ProtectedPartitions__factory,
+      ProtectedPartitionsFacet__factory,
       address.toString(),
     ).arePartitionsProtected();
   }
@@ -940,14 +943,12 @@ export class RPCQueryAdapter {
   ): Promise<[boolean, string, string]> {
     LogService.logTrace(`Checking can transfer`);
 
-    return await this.connect(ERC1594__factory, address.toString()).canTransfer(
-      targetId.toString(),
-      amount.toBigNumber(),
-      data,
-      {
-        from: operatorId,
-      },
-    );
+    return await this.connect(
+      ERC1594Facet__factory,
+      address.toString(),
+    ).canTransfer(targetId.toString(), amount.toBigNumber(), data, {
+      from: operatorId,
+    });
   }
 
   async canRedeemByPartition(
@@ -982,16 +983,17 @@ export class RPCQueryAdapter {
   ): Promise<[string, string, BigNumber]> {
     LogService.logTrace(`Getting document: ${name}`);
 
-    return await this.connect(ERC1643__factory, address.toString()).getDocument(
-      name,
-    );
+    return await this.connect(
+      ERC1643Facet__factory,
+      address.toString(),
+    ).getDocument(name);
   }
 
   async getAllDocuments(address: EvmAddress): Promise<string[]> {
     LogService.logTrace(`Getting all documents`);
 
     return await this.connect(
-      ERC1643__factory,
+      ERC1643Facet__factory,
       address.toString(),
     ).getAllDocuments();
   }
@@ -1039,7 +1041,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting scheduled snapshots from ${start} to ${end}`);
 
     const snapshots = await this.connect(
-      ScheduledSnapshots__factory,
+      ScheduledSnapshotsFacet__factory,
       address.toString(),
     ).getScheduledSnapshots(start, end);
 
@@ -1053,7 +1055,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting scheduled snapshots count`);
 
     const scheduledSnapshotsCount = await this.connect(
-      ScheduledSnapshots__factory,
+      ScheduledSnapshotsFacet__factory,
       address.toString(),
     ).scheduledSnapshotCount();
 
@@ -1065,7 +1067,10 @@ export class RPCQueryAdapter {
       `Getting max supply for ${address.toString()} security`,
     );
 
-    return await this.connect(Cap__factory, address.toString()).getMaxSupply();
+    return await this.connect(
+      CapFacet__factory,
+      address.toString(),
+    ).getMaxSupply();
   }
 
   async getMaxSupplyByPartition(
@@ -1077,7 +1082,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      Cap__factory,
+      CapFacet__factory,
       address.toString(),
     ).getMaxSupplyByPartition(partitionId);
   }
@@ -1140,7 +1145,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      Lock__factory,
+      LockFacet__factory,
       address.toString(),
     ).getLockedAmountForByPartition(_PARTITION_ID_1, target.toString());
   }
@@ -1151,7 +1156,7 @@ export class RPCQueryAdapter {
     );
 
     const count = await this.connect(
-      Lock__factory,
+      LockFacet__factory,
       address.toString(),
     ).getLockCountForByPartition(_PARTITION_ID_1, target.toString());
 
@@ -1169,7 +1174,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      Lock__factory,
+      LockFacet__factory,
       address.toString(),
     ).getLocksIdForByPartition(_PARTITION_ID_1, target.toString(), start, end);
   }
@@ -1183,7 +1188,7 @@ export class RPCQueryAdapter {
       `Getting lock ${lockId.toString()} of ${address.toString()} security for the account ${target.toString()}`,
     );
     return await this.connect(
-      Lock__factory,
+      LockFacet__factory,
       address.toString(),
     ).getLockForByPartition(_PARTITION_ID_1, target.toString(), lockId);
   }
@@ -1336,7 +1341,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      SsiManagement__factory,
+      SsiManagementFacet__factory,
       address.toString(),
     ).getRevocationRegistryAddress();
   }
@@ -1345,7 +1350,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting Issuer List Count of ${address.toString()}`);
 
     const count = await this.connect(
-      SsiManagement__factory,
+      SsiManagementFacet__factory,
       address.toString(),
     ).getIssuerListCount();
 
@@ -1362,7 +1367,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      SsiManagement__factory,
+      SsiManagementFacet__factory,
       address.toString(),
     ).getIssuerListMembers(start, end);
   }
@@ -1371,7 +1376,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting if ${issuer.toString()} is an Issuer`);
 
     return await this.connect(
-      SsiManagement__factory,
+      SsiManagementFacet__factory,
       address.toString(),
     ).isIssuer(issuer.toString());
   }
@@ -1380,7 +1385,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting KYC details for ${targetId}}`);
 
     const kycData = await this.connect(
-      Kyc__factory,
+      KycFacet__factory,
       address.toString(),
     ).getKycFor(targetId.toString());
 
@@ -1400,7 +1405,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting KYC status for ${targetId}}`);
 
     const kycData = await this.connect(
-      Kyc__factory,
+      KycFacet__factory,
       address.toString(),
     ).getKycStatusFor(targetId.toString());
 
@@ -1416,7 +1421,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting accounts data with KYC status ${kycStatus}`);
 
     const [accounts, kycAccountsData] = await this.connect(
-      Kyc__factory,
+      KycFacet__factory,
       address.toString(),
     ).getKycAccountsData(kycStatus, start, end);
 
@@ -1441,7 +1446,7 @@ export class RPCQueryAdapter {
       `Getting count of accounts with KYC status ${kycStatus}}`,
     );
     const kycAccountsCount = await this.connect(
-      Kyc__factory,
+      KycFacet__factory,
       address.toString(),
     ).getKycAccountsCount(kycStatus);
 
@@ -1633,7 +1638,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ExternalPauseManagement__factory,
+      ExternalPauseManagementFacet__factory,
       address.toString(),
     ).isExternalPause(externalPauseAddress.toString());
   }
@@ -1644,7 +1649,7 @@ export class RPCQueryAdapter {
     );
 
     const getExternalPausesCount = await this.connect(
-      ExternalPauseManagement__factory,
+      ExternalPauseManagementFacet__factory,
       address.toString(),
     ).getExternalPausesCount();
 
@@ -1661,7 +1666,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ExternalPauseManagement__factory,
+      ExternalPauseManagementFacet__factory,
       address.toString(),
     ).getExternalPausesMembers(start, end);
   }
@@ -1686,7 +1691,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ExternalControlListManagement__factory,
+      ExternalControlListManagementFacet__factory,
       address.toString(),
     ).isExternalControlList(externalControlListAddress.toString());
   }
@@ -1697,7 +1702,7 @@ export class RPCQueryAdapter {
     );
 
     const getExternalPausesCount = await this.connect(
-      ExternalControlListManagement__factory,
+      ExternalControlListManagementFacet__factory,
       address.toString(),
     ).getExternalControlListsCount();
 
@@ -1714,7 +1719,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ExternalControlListManagement__factory,
+      ExternalControlListManagementFacet__factory,
       address.toString(),
     ).getExternalControlListsMembers(start, end);
   }
@@ -1756,7 +1761,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ExternalKycListManagement__factory,
+      ExternalKycListManagementFacet__factory,
       address.toString(),
     ).isExternalKycList(externalKycListAddress.toString());
   }
@@ -1767,7 +1772,7 @@ export class RPCQueryAdapter {
     );
 
     const getExternalKycListsCount = await this.connect(
-      ExternalKycListManagement__factory,
+      ExternalKycListManagementFacet__factory,
       address.toString(),
     ).getExternalKycListsCount();
 
@@ -1784,7 +1789,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ExternalKycListManagement__factory,
+      ExternalKycListManagementFacet__factory,
       address.toString(),
     ).getExternalKycListsMembers(start, end);
   }
@@ -1799,7 +1804,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ExternalKycListManagement__factory,
+      ExternalKycListManagementFacet__factory,
       address.toString(),
     ).isExternallyGranted(targetId.toString(), kycStatus);
   }
@@ -1810,7 +1815,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      Kyc__factory,
+      KycFacet__factory,
       address.toString(),
     ).isInternalKycActivated();
   }
@@ -1834,7 +1839,10 @@ export class RPCQueryAdapter {
   async onchainID(address: EvmAddress): Promise<string> {
     LogService.logTrace(`Getting OnchainID for security ${address.toString()}`);
 
-    return await this.connect(ERC3643Read__factory, address.toString()).onchainID();
+    return await this.connect(
+      ERC3643ReadFacet__factory,
+      address.toString(),
+    ).onchainID();
   }
 
   async identityRegistry(address: EvmAddress): Promise<string> {
@@ -1843,7 +1851,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ERC3643Read__factory,
+      ERC3643ReadFacet__factory,
       address.toString(),
     ).identityRegistry();
   }
@@ -1854,7 +1862,7 @@ export class RPCQueryAdapter {
     );
 
     return await this.connect(
-      ERC3643Read__factory,
+      ERC3643ReadFacet__factory,
       address.toString(),
     ).compliance();
   }
@@ -1882,7 +1890,7 @@ export class RPCQueryAdapter {
     LogService.logTrace(`Getting recovery status of ${targetId}`);
 
     const isAddressRecovered = await this.connect(
-      ERC3643Read__factory,
+      ERC3643ReadFacet__factory,
       address.toString(),
     ).isAddressRecovered(targetId.toString());
 
@@ -1899,7 +1907,7 @@ export class RPCQueryAdapter {
       `Getting token holders at snapshot ${snapshotId} for security ${address.toString()}`,
     );
     return await this.connect(
-      Snapshots__factory,
+      SnapshotsFacet__factory,
       address.toString(),
     ).getTokenHoldersAtSnapshot(snapshotId, start, end);
   }
@@ -1913,7 +1921,7 @@ export class RPCQueryAdapter {
     );
 
     const total = await this.connect(
-      Snapshots__factory,
+      SnapshotsFacet__factory,
       address.toString(),
     ).getTotalTokenHoldersAtSnapshot(snapshotId);
 
@@ -2039,4 +2047,13 @@ export class RPCQueryAdapter {
 
     return total.toNumber();
   }
+
+  async getTrexTokenBySalt(factory: EvmAddress, salt: string): Promise<string> {
+    LogService.logTrace(`Getting TREX token by salt ${salt}`);
+    const token = await this.connect(
+      TREXFactoryAts__factory,
+      factory.toString(),
+    ).getToken(salt);
+    return token;
+  }
 }
diff --git a/packages/ats/sdk/src/port/out/rpc/RPCTransactionAdapter.ts b/packages/ats/sdk/src/port/out/rpc/RPCTransactionAdapter.ts
index ef168cfb7..d4c94e4d7 100644
--- a/packages/ats/sdk/src/port/out/rpc/RPCTransactionAdapter.ts
+++ b/packages/ats/sdk/src/port/out/rpc/RPCTransactionAdapter.ts
@@ -221,6 +221,7 @@ import { MirrorNodes } from '@domain/context/network/MirrorNode';
 import { JsonRpcRelays } from '@domain/context/network/JsonRpcRelay';
 import { Factories } from '@domain/context/factory/Factories';
 import BigDecimal from '@domain/context/shared/BigDecimal';
+import { ContractId } from '@hashgraph/sdk';
 import { RPCTransactionResponseAdapter } from './RPCTransactionResponseAdapter';
 import {
   _PARTITION_ID_1,
@@ -239,43 +240,44 @@ import {
 } from '@domain/context/factory/FactorySecurityToken';
 import { SigningError } from '../error/SigningError';
 import {
-  AccessControl__factory,
+  AccessControlFacet__factory,
   Bond__factory,
-  Cap__factory,
+  CapFacet__factory,
   ClearingActionsFacet__factory,
   ClearingHoldCreationFacet__factory,
   ClearingRedeemFacet__factory,
   ClearingTransferFacet__factory,
-  ControlList__factory,
+  ControlListFacet__factory,
   DiamondFacet__factory,
   Equity__factory,
   ERC1410ManagementFacet__factory,
-  ERC1643__factory,
+  ERC1643Facet__factory,
   ERC3643BatchFacet__factory,
   ERC3643ManagementFacet__factory,
   ERC3643OperationsFacet__factory,
-  ExternalControlListManagement__factory,
-  ExternalKycListManagement__factory,
-  ExternalPauseManagement__factory,
+  ExternalControlListManagementFacet__factory,
+  ExternalKycListManagementFacet__factory,
+  ExternalPauseManagementFacet__factory,
   Factory__factory,
   FreezeFacet__factory,
   HoldManagementFacet__factory,
   HoldTokenHolderFacet__factory,
   IBondRead,
   IEquity,
-  Kyc__factory,
-  Lock__factory,
+  KycFacet__factory,
+  LockFacet__factory,
   MockedBlacklist__factory,
   MockedExternalKycList__factory,
   MockedExternalPause__factory,
   MockedWhitelist__factory,
-  Pause__factory,
-  ProtectedPartitions__factory,
-  ScheduledTasks__factory,
-  Snapshots__factory,
-  SsiManagement__factory,
-  TransferAndLock__factory,
+  PauseFacet__factory,
+  ProtectedPartitionsFacet__factory,
+  ScheduledTasksFacet__factory,
+  SnapshotsFacet__factory,
+  SsiManagementFacet__factory,
+  TransferAndLockFacet__factory,
   ERC1410TokenHolderFacet__factory,
+  TREXFactoryAts__factory,
 } from '@hashgraph/asset-tokenization-contracts';
 import { Resolvers } from '@domain/context/factory/Resolvers';
 import EvmAddress from '@domain/context/contract/EvmAddress';
@@ -484,7 +486,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
       `Transfering ${amount} securities to account ${targetId.toString()} and locking them until ${expirationDate.toString()}`,
     );
     return this.executeTransaction(
-      TransferAndLock__factory.connect(
+      TransferAndLockFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -541,7 +543,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Pausing security: ${security.toString()}`);
 
     return this.executeTransaction(
-      Pause__factory.connect(security.toString(), this.getSignerOrProvider()),
+      PauseFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'pause',
       [],
       GAS.PAUSE,
@@ -552,7 +557,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Unpausing security: ${security.toString()}`);
 
     return this.executeTransaction(
-      Pause__factory.connect(security.toString(), this.getSignerOrProvider()),
+      PauseFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'unpause',
       [],
       GAS.UNPAUSE,
@@ -569,7 +577,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      AccessControl__factory.connect(
+      AccessControlFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -589,7 +597,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     gas = gas > GAS.MAX_ROLES ? GAS.MAX_ROLES : gas;
 
     return this.executeTransaction(
-      AccessControl__factory.connect(
+      AccessControlFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -609,7 +617,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      AccessControl__factory.connect(
+      AccessControlFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -626,7 +634,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Renounce role ${role.toString()}`);
 
     return this.executeTransaction(
-      AccessControl__factory.connect(
+      AccessControlFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -692,7 +700,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ControlList__factory.connect(
+      ControlListFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -711,7 +719,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ControlList__factory.connect(
+      ControlListFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -845,17 +853,21 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     recordDate: BigDecimal,
     executionDate: BigDecimal,
     rate: BigDecimal,
+    period: BigDecimal,
+    securityId?: ContractId | string,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
       `bond: ${security} ,
       recordDate :${recordDate} , 
       executionDate: ${executionDate},
-      rate : ${rate}  `,
+      rate : ${rate},
+      period: ${period}`,
     );
     const couponStruct: IBondRead.CouponStruct = {
       recordDate: recordDate.toBigNumber(),
       executionDate: executionDate.toBigNumber(),
       rate: rate.toBigNumber(),
+      period: period.toBigNumber(),
     };
 
     return this.executeTransaction(
@@ -871,7 +883,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Take snapshot of: ${security.toString()}`);
 
     return this.executeTransaction(
-      Snapshots__factory.connect(
+      SnapshotsFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -892,7 +904,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ERC1643__factory.connect(security.toString(), this.getSignerOrProvider()),
+      ERC1643Facet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'setDocument',
       [name, uri, hash],
       GAS.SET_DOCUMENT,
@@ -908,7 +923,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ERC1643__factory.connect(security.toString(), this.getSignerOrProvider()),
+      ERC1643Facet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'removeDocument',
       [name],
       GAS.REMOVE_DOCUMENT,
@@ -1033,7 +1051,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      Cap__factory.connect(security.toString(), this.getSignerOrProvider()),
+      CapFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'setMaxSupply',
       [maxSupply.toBigNumber()],
       GAS.SET_MAX_SUPPLY,
@@ -1048,7 +1069,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ScheduledTasks__factory.connect(
+      ScheduledTasksFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -1067,7 +1088,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ScheduledTasks__factory.connect(
+      ScheduledTasksFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -1088,7 +1109,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      Lock__factory.connect(security.toString(), this.getSignerOrProvider()),
+      LockFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'lockByPartition',
       [
         _PARTITION_ID_1,
@@ -1110,7 +1134,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      Lock__factory.connect(security.toString(), this.getSignerOrProvider()),
+      LockFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'releaseByPartition',
       [_PARTITION_ID_1, lockId.toBigNumber(), sourceId.toString()],
       GAS.RELEASE,
@@ -1227,7 +1254,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ProtectedPartitions__factory.connect(
+      ProtectedPartitionsFacet__factory.connect(
         address.toString(),
         this.getSignerOrProvider(),
       ),
@@ -1243,7 +1270,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ProtectedPartitions__factory.connect(
+      ProtectedPartitionsFacet__factory.connect(
         address.toString(),
         this.getSignerOrProvider(),
       ),
@@ -1341,7 +1368,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     };
 
     return this.executeTransaction(
-      TransferAndLock__factory.connect(
+      TransferAndLockFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -1360,19 +1387,19 @@ export class RPCTransactionAdapter extends TransactionAdapter {
   async createHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
-      `Holding ${amount} tokens from account ${targetId.toString()} until ${expirationDate} with escrow ${escrow}`,
+      `Holding ${amount} tokens from account ${targetId.toString()} until ${expirationDate} with escrow ${escrowId}`,
     );
 
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: expirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -1391,20 +1418,20 @@ export class RPCTransactionAdapter extends TransactionAdapter {
   async createHoldFromByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
-      `Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrow}`,
+      `Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrowId}`,
     );
 
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: expirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -1423,20 +1450,20 @@ export class RPCTransactionAdapter extends TransactionAdapter {
   async controllerCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
-      `Controller Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrow}`,
+      `Controller Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrowId}`,
     );
 
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: expirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -1456,7 +1483,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     security: EvmAddress,
     partitionId: string,
     amount: BigDecimal,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     expirationDate: BigDecimal,
@@ -1465,13 +1492,13 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     signature: string,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
-      `Protected Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrow}`,
+      `Protected Holding ${amount} tokens from account ${sourceId.toString()} until ${expirationDate} with escrow ${escrowId}`,
     );
 
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: expirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -1586,7 +1613,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      SsiManagement__factory.connect(
+      SsiManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -1603,7 +1630,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Adding issuer ${issuer}`);
 
     return this.executeTransaction(
-      SsiManagement__factory.connect(
+      SsiManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -1620,7 +1647,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Removing issuer ${issuer}`);
 
     return this.executeTransaction(
-      SsiManagement__factory.connect(
+      SsiManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -1643,7 +1670,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      Kyc__factory.connect(security.toString(), this.getSignerOrProvider()),
+      KycFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'grantKyc',
       [
         targetId.toString(),
@@ -1663,7 +1693,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     LogService.logTrace(`Revoking KYC to address ${targetId.toString()}`);
 
     return this.executeTransaction(
-      Kyc__factory.connect(security.toString(), this.getSignerOrProvider()),
+      KycFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'revokeKyc',
       [targetId.toString()],
       GAS.REVOKE_KYC,
@@ -1996,7 +2029,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
   async clearingCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     targetId: EvmAddress,
     clearingExpirationDate: BigDecimal,
@@ -2015,7 +2048,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: holdExpirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -2034,7 +2067,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
   async clearingCreateHoldFromByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -2058,7 +2091,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: holdExpirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -2078,7 +2111,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     security: EvmAddress,
     partitionId: string,
     amount: BigDecimal,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     sourceId: EvmAddress,
     targetId: EvmAddress,
     clearingExpirationDate: BigDecimal,
@@ -2105,7 +2138,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: holdExpirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -2124,7 +2157,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
   async operatorClearingCreateHoldByPartition(
     security: EvmAddress,
     partitionId: string,
-    escrow: EvmAddress,
+    escrowId: EvmAddress,
     amount: BigDecimal,
     sourceId: EvmAddress,
     targetId: EvmAddress,
@@ -2148,7 +2181,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     const hold: Hold = {
       amount: amount.toBigNumber(),
       expirationTimestamp: holdExpirationDate.toBigNumber(),
-      escrow: escrow.toString(),
+      escrow: escrowId.toString(),
       to: targetId.toString(),
       data: '0x',
     };
@@ -2239,7 +2272,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalPauseManagement__factory.connect(
+      ExternalPauseManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2258,7 +2291,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalPauseManagement__factory.connect(
+      ExternalPauseManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2277,7 +2310,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalPauseManagement__factory.connect(
+      ExternalPauseManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2331,7 +2364,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalControlListManagement__factory.connect(
+      ExternalControlListManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2350,7 +2383,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalControlListManagement__factory.connect(
+      ExternalControlListManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2369,7 +2402,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalControlListManagement__factory.connect(
+      ExternalControlListManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2495,7 +2528,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalKycListManagement__factory.connect(
+      ExternalKycListManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2514,7 +2547,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalKycListManagement__factory.connect(
+      ExternalKycListManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2533,7 +2566,7 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      ExternalKycListManagement__factory.connect(
+      ExternalKycListManagementFacet__factory.connect(
         security.toString(),
         this.getSignerOrProvider(),
       ),
@@ -2604,7 +2637,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      Kyc__factory.connect(security.toString(), this.getSignerOrProvider()),
+      KycFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'activateInternalKyc',
       [],
       GAS.ACTIVATE_INTERNAL_KYC,
@@ -2619,7 +2655,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
 
     return this.executeTransaction(
-      Kyc__factory.connect(security.toString(), this.getSignerOrProvider()),
+      KycFacet__factory.connect(
+        security.toString(),
+        this.getSignerOrProvider(),
+      ),
       'deactivateInternalKyc',
       [],
       GAS.DEACTIVATE_INTERNAL_KYC,
@@ -3076,4 +3115,228 @@ export class RPCTransactionAdapter extends TransactionAdapter {
       );
     }
   }
+
+  async createTrexSuiteBond(
+    salt: string,
+    owner: string,
+    irs: string,
+    onchainId: string,
+    irAgents: string[],
+    tokenAgents: string[],
+    compliancesModules: string[],
+    complianceSettings: string[],
+    claimTopics: number[],
+    issuers: string[],
+    issuerClaims: number[][],
+    security: Security,
+    bondDetails: BondDetails,
+    couponDetails: CouponDetails,
+    factory: EvmAddress,
+    resolver: EvmAddress,
+    configId: string,
+    configVersion: number,
+    compliance: EvmAddress,
+    identityRegistryAddress: EvmAddress,
+    diamondOwnerAccount: EvmAddress,
+    externalPauses?: EvmAddress[],
+    externalControlLists?: EvmAddress[],
+    externalKycLists?: EvmAddress[],
+  ): Promise<TransactionResponse> {
+    return this.createTrexSuite(
+      'bond',
+      salt,
+      owner,
+      irs,
+      onchainId,
+      irAgents,
+      tokenAgents,
+      compliancesModules,
+      complianceSettings,
+      claimTopics,
+      issuers,
+      issuerClaims,
+      security,
+      { bondDetails, couponDetails },
+      factory,
+      resolver,
+      configId,
+      configVersion,
+      compliance,
+      identityRegistryAddress,
+      diamondOwnerAccount,
+      externalPauses,
+      externalControlLists,
+      externalKycLists,
+    );
+  }
+
+  async createTrexSuiteEquity(
+    salt: string,
+    owner: string,
+    irs: string,
+    onchainId: string,
+    irAgents: string[],
+    tokenAgents: string[],
+    compliancesModules: string[],
+    complianceSettings: string[],
+    claimTopics: number[],
+    issuers: string[],
+    issuerClaims: number[][],
+    security: Security,
+    equityDetails: EquityDetails,
+    factory: EvmAddress,
+    resolver: EvmAddress,
+    configId: string,
+    configVersion: number,
+    compliance: EvmAddress,
+    identityRegistryAddress: EvmAddress,
+    diamondOwnerAccount: EvmAddress,
+    externalPauses?: EvmAddress[],
+    externalControlLists?: EvmAddress[],
+    externalKycLists?: EvmAddress[],
+  ): Promise<TransactionResponse> {
+    return this.createTrexSuite(
+      'equity',
+      salt,
+      owner,
+      irs,
+      onchainId,
+      irAgents,
+      tokenAgents,
+      compliancesModules,
+      complianceSettings,
+      claimTopics,
+      issuers,
+      issuerClaims,
+      security,
+      equityDetails,
+      factory,
+      resolver,
+      configId,
+      configVersion,
+      compliance,
+      identityRegistryAddress,
+      diamondOwnerAccount,
+      externalPauses,
+      externalControlLists,
+      externalKycLists,
+    );
+  }
+
+  private async createTrexSuite(
+    tokenType: 'bond' | 'equity',
+    salt: string,
+    owner: string,
+    irs: string,
+    onchainId: string,
+    irAgents: string[],
+    tokenAgents: string[],
+    compliancesModules: string[],
+    complianceSettings: string[],
+    claimTopics: number[],
+    issuers: string[],
+    issuerClaims: number[][],
+    security: Security,
+    tokenDetails:
+      | { bondDetails: BondDetails; couponDetails: CouponDetails }
+      | EquityDetails,
+    factory: EvmAddress,
+    resolver: EvmAddress,
+    configId: string,
+    configVersion: number,
+    compliance: EvmAddress,
+    identityRegistryAddress: EvmAddress,
+    diamondOwnerAccount: EvmAddress,
+    externalPauses?: EvmAddress[],
+    externalControlLists?: EvmAddress[],
+    externalKycLists?: EvmAddress[],
+  ): Promise<TransactionResponse> {
+    const securityData = SecurityDataBuilder.buildSecurityData(
+      security,
+      resolver,
+      configId,
+      configVersion,
+      externalPauses,
+      externalControlLists,
+      externalKycLists,
+      diamondOwnerAccount,
+      compliance,
+      identityRegistryAddress,
+    );
+
+    const regulationData = SecurityDataBuilder.buildRegulationData(security);
+
+    let tokenData: any;
+
+    if (tokenType === 'bond') {
+      const details = tokenDetails as {
+        bondDetails: BondDetails;
+        couponDetails: CouponDetails;
+      };
+      tokenData = {
+        securityData,
+        bondDetails: SecurityDataBuilder.buildBondDetails(details.bondDetails),
+        couponDetails: SecurityDataBuilder.buildCouponDetails(
+          details.couponDetails,
+        ),
+      };
+    } else {
+      tokenData = {
+        securityData,
+        equityDetails: SecurityDataBuilder.buildEquityDetails(
+          tokenDetails as EquityDetails,
+        ),
+      };
+    }
+
+    const factoryContract = TREXFactoryAts__factory.connect(
+      factory.toString(),
+      this.getSignerOrProvider(),
+    );
+
+    LogService.logTrace(
+      `Deploying TrexSuiteAts${tokenType.charAt(0).toUpperCase() + tokenType.slice(1)}:`,
+      {
+        security: tokenData,
+      },
+    );
+
+    const methodMap = {
+      bond: 'deployTREXSuiteAtsBond',
+      equity: 'deployTREXSuiteAtsEquity',
+    } as const;
+
+    try {
+      return this.executeTransaction(
+        factoryContract,
+        methodMap[tokenType],
+        [
+          salt,
+          {
+            owner,
+            irs,
+            ONCHAINID: onchainId,
+            irAgents,
+            tokenAgents,
+            complianceModules: compliancesModules,
+            complianceSettings,
+          },
+          {
+            claimTopics,
+            issuers,
+            issuerClaims,
+          },
+          tokenData,
+          regulationData,
+        ],
+        GAS.TREX_CREATE_SUITE,
+        'TREXSuiteDeployed',
+      );
+    } catch (error) {
+      LogService.logError(error);
+      throw new SigningError(
+        `Unexpected error in ${methodMap[tokenType]} operation: ${error}`,
+      );
+    }
+  }
 }
diff --git a/packages/mass-payout/package.json b/packages/mass-payout/package.json
index 0033465be..bc8d36242 100644
--- a/packages/mass-payout/package.json
+++ b/packages/mass-payout/package.json
@@ -10,5 +10,9 @@
     "dev": "echo 'Mass payout dev - placeholder'"
   },
   "keywords": ["hedera", "mass-payout", "placeholder"],
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  }
 }