diff --git a/apps/ats/web/src/i18n/en/security/coupons.ts b/apps/ats/web/src/i18n/en/security/coupons.ts
index 653d42bc7..c9a36204e 100644
--- a/apps/ats/web/src/i18n/en/security/coupons.ts
+++ b/apps/ats/web/src/i18n/en/security/coupons.ts
@@ -36,17 +36,20 @@ 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",
-        },
+      startDate: {
+        label: "Start date",
+        placeholder: "Select start date",
+        tooltip: "Coupon’s start date, must occur before the end date.",
+      },
+      endDate: {
+        label: "End date",
+        placeholder: "Select end date",
+        tooltip: "Coupon’s end date, Accrual period correspond to the period between start and end date.",
+      },
+      fixingDate: {
+        label: "Fixing date",
+        placeholder: "Select fixing date",
+        tooltip: "Coupon’s fixing date, floating rate coupons only.",
       },
     },
   },
@@ -69,6 +72,9 @@ export default {
     details: {
       title: "Detail",
       paymentDay: "Payment day",
+      startDay: "start day",
+      endDay: "end day",
+      fixingDay: "fixing day",
       balance: "Balance",
       amount: "Amount",
       recordDateReached: "Record Date Reached",
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 4c1c5ad34..b8df749b0 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/CouponsList.tsx
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/CouponsList.tsx
@@ -8,11 +8,7 @@ import { createColumnHelper } from '@tanstack/table-core';
 import { Table, Text } from 'io-bricks-ui';
 import { useTranslation } from 'react-i18next';
 import { DATE_TIME_FORMAT } from '../../../../utils/constants';
-import {
-  formatDate,
-  formatCouponPeriod,
-  formatNumberLocale,
-} from '../../../../utils/format';
+import { formatDate, formatNumberLocale } from '../../../../utils/format';
 
 export const CouponsList = () => {
   const { id } = useParams();
@@ -54,9 +50,19 @@ export const CouponsList = () => {
         `${formatNumberLocale(row.getValue(), row.row.original.rateDecimals ?? 0)}%`,
       enableSorting: false,
     }),
-    columnHelper.accessor('period', {
-      header: t('columns.period'),
-      cell: (row) => formatCouponPeriod(row.getValue()),
+    columnHelper.accessor('startDate', {
+      header: t('columns.startDate'),
+      cell: (row) => formatDate(row.getValue(), DATE_TIME_FORMAT),
+      enableSorting: false,
+    }),
+    columnHelper.accessor('endDate', {
+      header: t('columns.endDate'),
+      cell: (row) => formatDate(row.getValue(), DATE_TIME_FORMAT),
+      enableSorting: false,
+    }),
+    columnHelper.accessor('fixingDate', {
+      header: t('columns.fixingDate'),
+      cell: (row) => formatDate(row.getValue(), DATE_TIME_FORMAT),
       enableSorting: false,
     }),
     columnHelper.accessor('snapshotId', {
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 6c8bb46a5..60831b2d1 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/ProgramCoupon.tsx
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/ProgramCoupon.tsx
@@ -208,7 +208,6 @@ import {
   CalendarInputController,
   InputNumberController,
   PhosphorIcon,
-  SelectController,
   Text,
   Tooltip,
 } from 'io-bricks-ui';
@@ -223,18 +222,17 @@ import {
 import { useParams } from 'react-router-dom';
 import { useCoupons } from '../../../../hooks/queries/useCoupons';
 import { useGetBondDetails } from '../../../../hooks/queries/useGetSecurityDetails';
-import {
-  dateToUnixTimestamp,
-  validateCouponPeriod,
-} from '../../../../utils/format';
-import { DATE_TIME_FORMAT, TIME_PERIODS_S } from '../../../../utils/constants';
+import { dateToUnixTimestamp } from '../../../../utils/format';
+import { DATE_TIME_FORMAT } from '../../../../utils/constants';
 import { isBeforeDate } from '../../../../utils/helpers';
 
 interface ProgramCouponFormValues {
   rate: number;
   recordTimestamp: string;
   executionTimestamp: string;
-  period: string;
+  startTimestamp: string;
+  endTimestamp: string;
+  fixingTimestamp: string;
 }
 
 export const ProgramCoupon = () => {
@@ -249,6 +247,8 @@ export const ProgramCoupon = () => {
   const { t: tGlobal } = useTranslation('globals');
   const { id = '' } = useParams();
   const recordTimestamp = watch('recordTimestamp');
+  const startTimestamp = watch('startTimestamp');
+  const fixingTimestamp = watch('fixingTimestamp');
 
   const { data: bondDetails } = useGetBondDetails(
     new GetBondDetailsRequest({
@@ -262,7 +262,10 @@ export const ProgramCoupon = () => {
       rate: params.rate.toString(),
       recordTimestamp: dateToUnixTimestamp(params.recordTimestamp),
       executionTimestamp: dateToUnixTimestamp(params.executionTimestamp),
-      period: params.period,
+      startTimestamp: dateToUnixTimestamp(params.startTimestamp),
+      endTimestamp: dateToUnixTimestamp(params.endTimestamp),
+      fixingTimestamp: dateToUnixTimestamp(params.fixingTimestamp),
+      rateStatus: 1
     });
 
     createCoupon(request, {
@@ -321,7 +324,9 @@ export const ProgramCoupon = () => {
                 id="executionTimestamp"
                 rules={{
                   required,
-                  validate: isAfterDate(new Date(recordTimestamp)),
+                  validate:
+                    isAfterDate(new Date(recordTimestamp)) &&
+                    isAfterDate(new Date(fixingTimestamp)),
                 }}
                 fromDate={new Date()}
                 toDate={new Date(bondDetails.maturityDate)}
@@ -331,6 +336,77 @@ export const ProgramCoupon = () => {
               />
             )}
           </Stack>
+          <Stack w="full">
+            <HStack justifySelf="flex-start">
+              <Text textStyle="BodyTextRegularSM">
+                {tForm('startDate.label')}*
+              </Text>
+              <Tooltip label={tForm('startDate.tooltip')} placement="right">
+                <PhosphorIcon as={Info} />
+              </Tooltip>
+            </HStack>
+            {bondDetails && (
+              <CalendarInputController
+                control={control}
+                id="startTimestamp"
+                rules={{ required }}
+                fromDate={new Date()}
+                toDate={new Date(bondDetails.maturityDate)}
+                placeholder={tForm('startDate.placeholder')}
+                withTimeInput
+                format={DATE_TIME_FORMAT}
+              />
+            )}
+          </Stack>
+          <Stack w="full">
+            <HStack justifySelf="flex-start">
+              <Text textStyle="BodyTextRegularSM">
+                {tForm('endDate.label')}*
+              </Text>
+              <Tooltip label={tForm('endDate.tooltip')} placement="right">
+                <PhosphorIcon as={Info} />
+              </Tooltip>
+            </HStack>
+            {bondDetails && (
+              <CalendarInputController
+                control={control}
+                id="endTimestamp"
+                rules={{
+                  required,
+                  validate: isAfterDate(new Date(startTimestamp)),
+                }}
+                fromDate={new Date()}
+                toDate={new Date(bondDetails.maturityDate)}
+                placeholder={tForm('endDate.placeholder')}
+                withTimeInput
+                format={DATE_TIME_FORMAT}
+              />
+            )}
+          </Stack>
+          <Stack w="full">
+            <HStack justifySelf="flex-start">
+              <Text textStyle="BodyTextRegularSM">
+                {tForm('fixingDate.label')}*
+              </Text>
+              <Tooltip label={tForm('fixingDate.tooltip')} placement="right">
+                <PhosphorIcon as={Info} />
+              </Tooltip>
+            </HStack>
+            {bondDetails && (
+              <CalendarInputController
+                control={control}
+                id="fixingTimestamp"
+                rules={{
+                  required,
+                }}
+                fromDate={new Date()}
+                toDate={new Date(bondDetails.maturityDate)}
+                placeholder={tForm('fixingDate.placeholder')}
+                withTimeInput
+                format={DATE_TIME_FORMAT}
+              />
+            )}
+          </Stack>
           <Stack w="full">
             <HStack justifySelf="flex-start">
               <Text textStyle="BodyTextRegularSM">{tForm('rate.label')}*</Text>
@@ -351,50 +427,6 @@ 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 eb55bc2c5..46a330be5 100644
--- a/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/SeeCoupon.tsx
+++ b/apps/ats/web/src/views/DigitalSecurityDetails/Components/Coupons/SeeCoupon.tsx
@@ -226,6 +226,24 @@ export const SeeCoupon = () => {
                 canCopy: true,
                 valueToCopy: coupons.executionDate.toDateString(),
               },
+              {
+                title: tDetail("startDay"),
+                description: formatDate(coupons.startDate, DATE_TIME_FORMAT),
+                canCopy: true,
+                valueToCopy: coupons.startDate.toDateString(),
+              },
+              {
+                title: tDetail("endDay"),
+                description: formatDate(coupons.endDate, DATE_TIME_FORMAT),
+                canCopy: true,
+                valueToCopy: coupons.endDate.toDateString(),
+              },
+              {
+                title: tDetail("fixingDay"),
+                description: formatDate(coupons.fixingDate, DATE_TIME_FORMAT),
+                canCopy: true,
+                valueToCopy: coupons.fixingDate.toDateString(),
+              },
               {
                 title: tDetail("balance"),
                 description: formatNumberLocale(couponsFor.tokenBalance, parseFloat(couponsFor.decimals)),
diff --git a/packages/ats/contracts/Configuration.ts b/packages/ats/contracts/Configuration.ts
index 8932ce2d6..90a9dbe21 100644
--- a/packages/ats/contracts/Configuration.ts
+++ b/packages/ats/contracts/Configuration.ts
@@ -297,7 +297,8 @@ export const CONTRACT_NAMES = [
   "BondUSARead", //TODO
   "ScheduledSnapshotsFacet",
   "ScheduledBalanceAdjustmentsFacet",
-  "scheduledCrossOrderedTasksFacet",
+  "ScheduledCrossOrderedTasksFacet",
+  "ScheduledCouponListingFacet",
   "SnapshotsFacet",
   "CorporateActionsFacet",
   "TransferAndLockFacet",
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBondRead.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBondRead.sol
index 35e2ed84f..0f2772d20 100644
--- a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBondRead.sol
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBondRead.sol
@@ -2,6 +2,11 @@
 pragma solidity ^0.8.17;
 
 interface TRexIBondRead {
+    enum RateCalculationStatus {
+        PENDING,
+        SET
+    }
+
     struct BondDetailsData {
         bytes3 currency;
         uint256 nominalValue;
@@ -13,9 +18,12 @@ interface TRexIBondRead {
     struct Coupon {
         uint256 recordDate;
         uint256 executionDate;
+        uint256 startDate;
+        uint256 endDate;
+        uint256 fixingDate;
         uint256 rate;
         uint8 rateDecimals;
-        uint256 period;
+        RateCalculationStatus rateStatus;
     }
 
     struct RegisteredCoupon {
@@ -25,13 +33,9 @@ interface TRexIBondRead {
 
     struct CouponFor {
         uint256 tokenBalance;
-        uint256 rate;
-        uint8 rateDecimals;
-        uint256 recordDate;
-        uint256 executionDate;
-        uint256 period;
         uint8 decimals;
         bool recordDateReached;
+        Coupon coupon;
     }
 
     struct CouponAmountFor {
@@ -93,4 +97,13 @@ interface TRexIBondRead {
      * @dev It is the list of token holders at the snapshot taken at the record date
      */
     function getTotalCouponHolders(uint256 _couponID) external view returns (uint256);
+
+    function getCouponFromOrderedListAt(uint256 _pos) external view returns (uint256 couponID_);
+
+    function getCouponsOrderedList(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (uint256[] memory couponIDs_);
+
+    function getCouponsOrderedListTotal() external view returns (uint256 total_);
 }
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IEquity.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IEquity.sol
index 6d2b89eb7..fb9020679 100644
--- a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IEquity.sol
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IEquity.sol
@@ -78,13 +78,13 @@ interface TRexIEquity {
      * @notice Sets a new dividend
      * @dev Can only be called by an account with the corporate actions role
      */
-    function setDividends(Dividend calldata _newDividend) external returns (bool success_, uint256 dividendID_);
+    function setDividends(Dividend calldata _newDividend) external returns (uint256 dividendID_);
 
     /**
      * @notice Sets a new voting
      * @dev Can only be called by an account with the corporate actions role
      */
-    function setVoting(Voting calldata _newVoting) external returns (bool success_, uint256 voteID_);
+    function setVoting(Voting calldata _newVoting) external returns (uint256 voteID_);
 
     /**
      * @notice Sets a new scheduled balance adjustment
@@ -92,7 +92,7 @@ interface TRexIEquity {
      */
     function setScheduledBalanceAdjustment(
         ScheduledBalanceAdjustment calldata _newBalanceAdjustment
-    ) external returns (bool success_, uint256 balanceAdjustmentID_);
+    ) external returns (uint256 balanceAdjustmentID_);
 
     function getEquityDetails() external view returns (EquityDetailsData memory equityDetailsData_);
 
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IFactory.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IFactory.sol
index 4488fec34..0a172aebb 100644
--- a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IFactory.sol
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IFactory.sol
@@ -7,6 +7,8 @@ import { TRexIERC20 as IERC20 } from "./IERC20.sol";
 import { TRexIBondRead as IBondRead } from "./IBondRead.sol";
 import { TRexIEquity as IEquity } from "./IEquity.sol";
 import { FactoryRegulationData, RegulationData, RegulationType, RegulationSubType } from "./regulation.sol";
+import { TRexIFixedRate as IFixedRate } from "./IFixedRate.sol";
+import { TRexIKpiLinkedRate as IKpiLinkedRate } from "./IKpiLinkedRate.sol";
 
 interface TRexIFactory {
     enum SecurityType {
@@ -52,6 +54,20 @@ interface TRexIFactory {
         bytes[] proceedRecipientsData;
     }
 
+    struct BondKpiLinkedRateData {
+        BondData bondData;
+        FactoryRegulationData factoryRegulationData;
+        IKpiLinkedRate.InterestRate interestRate;
+        IKpiLinkedRate.ImpactData impactData;
+        address kpiOracle;
+    }
+
+    struct BondFixedRateData {
+        BondData bondData;
+        FactoryRegulationData factoryRegulationData;
+        IFixedRate.FixedRateData fixedRateData;
+    }
+
     event EquityDeployed(
         address indexed deployer,
         address equityAddress,
@@ -66,6 +82,14 @@ interface TRexIFactory {
         FactoryRegulationData regulationData
     );
 
+    event BondFixedRateDeployed(address indexed deployer, address bondAddress, BondFixedRateData bondFixedRateData);
+
+    event BondKpiLinkedRateDeployed(
+        address indexed deployer,
+        address bondAddress,
+        BondKpiLinkedRateData bondKpiLinkedRateData
+    );
+
     error EmptyResolver(IBusinessLogicResolver resolver);
     error NoInitialAdmins();
 
@@ -85,6 +109,12 @@ interface TRexIFactory {
         FactoryRegulationData calldata _factoryRegulationData
     ) external returns (address bondAddress_);
 
+    function deployBondFixedRate(BondFixedRateData calldata _bondFixedRateData) external returns (address bondAddress_);
+
+    function deployBondKpiLinkedRate(
+        BondKpiLinkedRateData calldata _bondKpiLinkedRateData
+    ) external returns (address bondAddress_);
+
     function getAppliedRegulationData(
         RegulationType _regulationType,
         RegulationSubType _regulationSubType
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IFixedRate.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IFixedRate.sol
new file mode 100644
index 000000000..a5284cdbf
--- /dev/null
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IFixedRate.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.17;
+
+interface TRexIFixedRate {
+    struct FixedRateData {
+        uint256 rate;
+        uint8 rateDecimals;
+    }
+
+    event RateUpdated(address indexed operator, uint256 newRate, uint8 newRateDecimals);
+
+    // solhint-disable-next-line func-name-mixedcase
+    function initialize_FixedRate(FixedRateData calldata _initData) external;
+
+    function setRate(uint256 _newRate, uint8 _newRateDecimals) external;
+
+    function getRate() external view returns (uint256 rate_, uint8 decimals_);
+}
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IKpi.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IKpi.sol
new file mode 100644
index 000000000..c31f2b45c
--- /dev/null
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IKpi.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.17;
+
+interface TRexIKpi {
+    function setMinValidDate(uint256 _minValidDate) external;
+
+    function getKpiData(
+        uint256 _fromDate,
+        uint256 _toDate
+    ) external view returns (uint256 kpiAggregatedValue_, bool exists_);
+}
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IKpiLinkedRate.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IKpiLinkedRate.sol
new file mode 100644
index 000000000..dc2728c95
--- /dev/null
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IKpiLinkedRate.sol
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.17;
+
+interface TRexIKpiLinkedRate {
+    struct InterestRate {
+        uint256 maxRate;
+        uint256 baseRate;
+        uint256 minRate;
+        uint256 startPeriod;
+        uint256 startRate;
+        uint256 missedPenalty;
+        uint256 reportPeriod;
+        uint8 rateDecimals;
+    }
+    struct ImpactData {
+        uint256 maxDeviationCap;
+        uint256 baseLine;
+        uint256 maxDeviationFloor;
+        uint8 impactDataDecimals;
+        uint256 adjustmentPrecision;
+    }
+
+    event InterestRateUpdated(address indexed operator, InterestRate newInterestRate);
+    event ImpactDataUpdated(address indexed operator, ImpactData newImpactData);
+    event KpiOracleUpdated(address indexed operator, address kpiOracle);
+
+    error WrongInterestRateValues(InterestRate interestRate);
+    error WrongImpactDataValues(ImpactData impactData);
+    error KpiOracleCalledFailed();
+
+    // solhint-disable-next-line func-name-mixedcase
+    function initialize_KpiLinkedRate(
+        InterestRate calldata _interestRate,
+        ImpactData calldata _impactData,
+        address kpiOracle
+    ) external;
+
+    function setInterestRate(InterestRate calldata _newInterestRate) external;
+    function setImpactData(ImpactData calldata _newImpactData) external;
+    function setKpiOracle(address _kpiOracle) external;
+
+    function getInterestRate() external view returns (InterestRate memory interestRate_);
+
+    function getImpactData() external view returns (ImpactData memory impactData_);
+    function getKpiOracle() external view returns (address kpiOracle_);
+}
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IScheduledCouponListing.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IScheduledCouponListing.sol
new file mode 100644
index 000000000..f6c666cc3
--- /dev/null
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IScheduledCouponListing.sol
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.17;
+
+import { ScheduledTask } from "./IScheduledTasksCommon.sol";
+
+interface TRexIScheduledCouponListing {
+    function scheduledCouponListingCount() external view returns (uint256);
+
+    function getScheduledCouponListing(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (ScheduledTask[] memory scheduledCouponListing_);
+}
diff --git a/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IScheduledTasksCommon.sol b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IScheduledTasksCommon.sol
new file mode 100644
index 000000000..622ed64c3
--- /dev/null
+++ b/packages/ats/contracts/contracts/factory/ERC3643/interfaces/IScheduledTasksCommon.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.17;
+
+struct ScheduledTask {
+    uint256 scheduledTimestamp;
+    bytes data;
+}
+
+struct ScheduledTasksDataStorage {
+    mapping(uint256 => ScheduledTask) scheduledTasks;
+    uint256 scheduledTaskCount;
+}
diff --git a/packages/ats/contracts/contracts/factory/Factory.sol b/packages/ats/contracts/contracts/factory/Factory.sol
index 73cd38ec9..97a48934a 100644
--- a/packages/ats/contracts/contracts/factory/Factory.sol
+++ b/packages/ats/contracts/contracts/factory/Factory.sol
@@ -36,8 +36,11 @@ import { IExternalKycListManagement } from "../layer_1/interfaces/externalKycLis
 import { IKyc } from "../layer_1/interfaces/kyc/IKyc.sol";
 import { IERC3643 } from "../layer_1/interfaces/ERC3643/IERC3643.sol";
 import { validateISIN } from "./isinValidator.sol";
+import { IFixedRate } from "../layer_2/interfaces/interestRates/fixedRate/IFixedRate.sol";
+import { IKpiLinkedRate } from "../layer_2/interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol";
+import { Common } from "../layer_0/common/Common.sol";
 
-contract Factory is IFactory, LocalContext {
+contract Factory is IFactory, Common {
     modifier checkResolver(IBusinessLogicResolver resolver) {
         if (address(resolver) == address(0)) {
             revert EmptyResolver(resolver);
@@ -118,6 +121,68 @@ contract Factory is IFactory, LocalContext {
         checkRegulation(_factoryRegulationData.regulationType, _factoryRegulationData.regulationSubType)
         returns (address bondAddress_)
     {
+        bondAddress_ = _deployBond(_bondData, _factoryRegulationData);
+
+        emit BondDeployed(_msgSender(), bondAddress_, _bondData, _factoryRegulationData);
+    }
+
+    function deployBondFixedRate(
+        BondFixedRateData calldata _bondFixedRateData
+    )
+        external
+        checkResolver(_bondFixedRateData.bondData.security.resolver)
+        checkISIN(_bondFixedRateData.bondData.security.erc20MetadataInfo.isin)
+        checkAdmins(_bondFixedRateData.bondData.security.rbacs)
+        checkRegulation(
+            _bondFixedRateData.factoryRegulationData.regulationType,
+            _bondFixedRateData.factoryRegulationData.regulationSubType
+        )
+        returns (address bondAddress_)
+    {
+        bondAddress_ = _deployBond(_bondFixedRateData.bondData, _bondFixedRateData.factoryRegulationData);
+
+        IFixedRate(bondAddress_).initialize_FixedRate(_bondFixedRateData.fixedRateData);
+
+        emit BondFixedRateDeployed(_msgSender(), bondAddress_, _bondFixedRateData);
+    }
+
+    function deployBondKpiLinkedRate(
+        BondKpiLinkedRateData calldata _bondKpiLinkedRateData
+    )
+        external
+        checkResolver(_bondKpiLinkedRateData.bondData.security.resolver)
+        checkISIN(_bondKpiLinkedRateData.bondData.security.erc20MetadataInfo.isin)
+        checkAdmins(_bondKpiLinkedRateData.bondData.security.rbacs)
+        checkRegulation(
+            _bondKpiLinkedRateData.factoryRegulationData.regulationType,
+            _bondKpiLinkedRateData.factoryRegulationData.regulationSubType
+        )
+        checkInterestRate(_bondKpiLinkedRateData.interestRate)
+        checkImpactData(_bondKpiLinkedRateData.impactData)
+        returns (address bondAddress_)
+    {
+        bondAddress_ = _deployBond(_bondKpiLinkedRateData.bondData, _bondKpiLinkedRateData.factoryRegulationData);
+
+        IKpiLinkedRate(bondAddress_).initialize_KpiLinkedRate(
+            _bondKpiLinkedRateData.interestRate,
+            _bondKpiLinkedRateData.impactData,
+            _bondKpiLinkedRateData.kpiOracle
+        );
+
+        emit BondKpiLinkedRateDeployed(_msgSender(), bondAddress_, _bondKpiLinkedRateData);
+    }
+
+    function getAppliedRegulationData(
+        RegulationType _regulationType,
+        RegulationSubType _regulationSubType
+    ) external pure override returns (RegulationData memory regulationData_) {
+        regulationData_ = buildRegulationData(_regulationType, _regulationSubType);
+    }
+
+    function _deployBond(
+        BondData calldata _bondData,
+        FactoryRegulationData calldata _factoryRegulationData
+    ) internal returns (address bondAddress_) {
         bondAddress_ = _deploySecurity(_bondData.security, SecurityType.Bond);
 
         IBondUSA(bondAddress_)._initialize_bondUSA(
@@ -130,15 +195,6 @@ contract Factory is IFactory, LocalContext {
             _bondData.proceedRecipients,
             _bondData.proceedRecipientsData
         );
-
-        emit BondDeployed(_msgSender(), bondAddress_, _bondData, _factoryRegulationData);
-    }
-
-    function getAppliedRegulationData(
-        RegulationType _regulationType,
-        RegulationSubType _regulationSubType
-    ) external pure override returns (RegulationData memory regulationData_) {
-        regulationData_ = buildRegulationData(_regulationType, _regulationSubType);
     }
 
     function _deploySecurity(
diff --git a/packages/ats/contracts/contracts/interfaces/factory/IFactory.sol b/packages/ats/contracts/contracts/interfaces/factory/IFactory.sol
index bf2b0ed1f..ee54fd6b8 100644
--- a/packages/ats/contracts/contracts/interfaces/factory/IFactory.sol
+++ b/packages/ats/contracts/contracts/interfaces/factory/IFactory.sol
@@ -12,6 +12,8 @@ import {
     RegulationType,
     RegulationSubType
 } from "../../layer_3/constants/regulation.sol";
+import { IFixedRate } from "../../layer_2/interfaces/interestRates/fixedRate/IFixedRate.sol";
+import { IKpiLinkedRate } from "../../layer_2/interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol";
 
 interface IFactory {
     enum SecurityType {
@@ -57,6 +59,20 @@ interface IFactory {
         bytes[] proceedRecipientsData;
     }
 
+    struct BondKpiLinkedRateData {
+        BondData bondData;
+        FactoryRegulationData factoryRegulationData;
+        IKpiLinkedRate.InterestRate interestRate;
+        IKpiLinkedRate.ImpactData impactData;
+        address kpiOracle;
+    }
+
+    struct BondFixedRateData {
+        BondData bondData;
+        FactoryRegulationData factoryRegulationData;
+        IFixedRate.FixedRateData fixedRateData;
+    }
+
     event EquityDeployed(
         address indexed deployer,
         address equityAddress,
@@ -71,6 +87,14 @@ interface IFactory {
         FactoryRegulationData regulationData
     );
 
+    event BondFixedRateDeployed(address indexed deployer, address bondAddress, BondFixedRateData bondFixedRateData);
+
+    event BondKpiLinkedRateDeployed(
+        address indexed deployer,
+        address bondAddress,
+        BondKpiLinkedRateData bondKpiLinkedRateData
+    );
+
     error EmptyResolver(IBusinessLogicResolver resolver);
     error NoInitialAdmins();
 
@@ -90,6 +114,12 @@ interface IFactory {
         FactoryRegulationData calldata _factoryRegulationData
     ) external returns (address bondAddress_);
 
+    function deployBondFixedRate(BondFixedRateData calldata _bondFixedRateData) external returns (address bondAddress_);
+
+    function deployBondKpiLinkedRate(
+        BondKpiLinkedRateData calldata _bondKpiLinkedRateData
+    ) external returns (address bondAddress_);
+
     function getAppliedRegulationData(
         RegulationType _regulationType,
         RegulationSubType _regulationSubType
diff --git a/packages/ats/contracts/contracts/layer_0/ERC1400/ERC20Votes/ERC20VotesStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/ERC1400/ERC20Votes/ERC20VotesStorageWrapper.sol
index b8812d5a8..703e7fa54 100644
--- a/packages/ats/contracts/contracts/layer_0/ERC1400/ERC20Votes/ERC20VotesStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/ERC1400/ERC20Votes/ERC20VotesStorageWrapper.sol
@@ -6,17 +6,20 @@ import { ERC1594StorageWrapper } from "../ERC1594/ERC1594StorageWrapper.sol";
 import { IERC20Votes } from "../../../layer_1/interfaces/ERC1400/IERC20Votes.sol";
 import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
+import { CheckpointsLib } from "../../common/libraries/CheckpointsLib.sol";
 
 // solhint-disable custom-errors
 abstract contract ERC20VotesStorageWrapper is ERC1594StorageWrapper {
+    using CheckpointsLib for CheckpointsLib.Checkpoint[];
+
     struct ERC20VotesStorage {
         bool activated;
         string contractName;
         string contractVersion;
         mapping(address => address) delegates;
-        mapping(address => IERC20Votes.Checkpoint[]) checkpoints;
-        IERC20Votes.Checkpoint[] totalSupplyCheckpoints;
-        IERC20Votes.Checkpoint[] abafCheckpoints;
+        mapping(address => CheckpointsLib.Checkpoint[]) checkpoints;
+        CheckpointsLib.Checkpoint[] totalSupplyCheckpoints;
+        CheckpointsLib.Checkpoint[] abafCheckpoints;
         bool initialized;
     }
 
@@ -41,13 +44,13 @@ abstract contract ERC20VotesStorageWrapper is ERC1594StorageWrapper {
         uint256 pos = erc20VotesStorage.abafCheckpoints.length;
 
         if (pos != 0)
-            if (erc20VotesStorage.abafCheckpoints[pos - 1].fromBlock == _clock()) {
-                if (erc20VotesStorage.abafCheckpoints[pos - 1].votes != abaf)
+            if (erc20VotesStorage.abafCheckpoints[pos - 1].from == _clock()) {
+                if (erc20VotesStorage.abafCheckpoints[pos - 1].value != abaf)
                     revert IERC20Votes.AbafChangeForBlockForbidden(_clock());
                 return;
             }
 
-        _erc20VotesStorage().abafCheckpoints.push(IERC20Votes.Checkpoint({ fromBlock: _clock(), votes: abaf }));
+        _erc20VotesStorage().abafCheckpoints.push(CheckpointsLib.Checkpoint({ from: _clock(), value: abaf }));
     }
 
     function _afterTokenTransfer(
@@ -117,41 +120,26 @@ abstract contract ERC20VotesStorageWrapper is ERC1594StorageWrapper {
     }
 
     function _writeCheckpoint(
-        IERC20Votes.Checkpoint[] storage ckpts,
+        CheckpointsLib.Checkpoint[] storage ckpts,
         function(uint256, uint256) view returns (uint256) op,
         uint256 delta
     ) internal returns (uint256 oldWeight, uint256 newWeight) {
         uint256 pos = ckpts.length;
 
         unchecked {
-            IERC20Votes.Checkpoint memory oldCkpt = pos == 0 ? IERC20Votes.Checkpoint(0, 0) : ckpts[pos - 1];
+            CheckpointsLib.Checkpoint memory oldCkpt = pos == 0 ? CheckpointsLib.Checkpoint(0, 0) : ckpts[pos - 1];
 
-            oldWeight = oldCkpt.votes * _calculateFactorBetween(oldCkpt.fromBlock, _clock());
+            oldWeight = oldCkpt.value * _calculateFactorBetween(oldCkpt.from, _clock());
             newWeight = op(oldWeight, delta);
 
-            if (pos > 0 && oldCkpt.fromBlock == _clock()) {
-                ckpts[pos - 1].votes = newWeight;
+            if (pos > 0 && oldCkpt.from == _clock()) {
+                ckpts[pos - 1].value = newWeight;
             } else {
-                ckpts.push(IERC20Votes.Checkpoint({ fromBlock: _clock(), votes: newWeight }));
+                ckpts.push(CheckpointsLib.Checkpoint({ from: _clock(), value: newWeight }));
             }
         }
     }
 
-    /*function _hashTypedDataV4(
-        bytes32 structHash
-    ) internal view virtual returns (bytes32) {
-        return
-            ECDSA.toTypedDataHash(
-                getDomainHash(
-                    _erc20VotesStorage().contractName,
-                    _erc20VotesStorage().contractVersion,
-                    _blockChainid(),
-                    address(this)
-                ),
-                structHash
-            );
-    }*/
-
     function _clock() internal view virtual returns (uint48) {
         return SafeCast.toUint48(_blockNumber());
     }
@@ -163,7 +151,10 @@ abstract contract ERC20VotesStorageWrapper is ERC1594StorageWrapper {
         return "mode=blocknumber&from=default";
     }
 
-    function _checkpoints(address account, uint256 pos) internal view virtual returns (IERC20Votes.Checkpoint memory) {
+    function _checkpoints(
+        address account,
+        uint256 pos
+    ) internal view virtual returns (CheckpointsLib.Checkpoint memory) {
         return _erc20VotesStorage().checkpoints[account][pos];
     }
 
@@ -191,50 +182,16 @@ abstract contract ERC20VotesStorageWrapper is ERC1594StorageWrapper {
 
     function _getVotesAdjusted(
         uint256 timepoint,
-        IERC20Votes.Checkpoint[] storage ckpts
+        CheckpointsLib.Checkpoint[] storage ckpts
     ) internal view returns (uint256) {
-        (uint256 blockNumber, uint256 votes) = _checkpointsLookup(ckpts, timepoint);
+        (uint256 blockNumber, uint256 votes) = ckpts.checkpointsLookup(timepoint);
 
         return votes * _calculateFactorBetween(blockNumber, timepoint);
     }
 
-    function _checkpointsLookup(
-        IERC20Votes.Checkpoint[] storage ckpts,
-        uint256 timepoint
-    ) internal view returns (uint256 block_, uint256 vote_) {
-        uint256 length = ckpts.length;
-
-        uint256 low = 0;
-        uint256 high = length;
-
-        if (length > 5) {
-            uint256 mid = length - Math.sqrt(length);
-            if (ckpts[mid].fromBlock > timepoint) {
-                high = mid;
-            } else {
-                low = mid + 1;
-            }
-        }
-
-        while (low < high) {
-            uint256 mid = Math.average(low, high);
-            if (ckpts[mid].fromBlock > timepoint) {
-                high = mid;
-            } else {
-                low = mid + 1;
-            }
-        }
-
-        if (high == 0) return (0, 0);
-
-        unchecked {
-            return (ckpts[high - 1].fromBlock, ckpts[high - 1].votes);
-        }
-    }
-
     function _calculateFactorBetween(uint256 _fromBlock, uint256 _toBlock) internal view returns (uint256) {
-        (, uint256 abafAtBlockFrom) = _checkpointsLookup(_erc20VotesStorage().abafCheckpoints, _fromBlock);
-        (, uint256 abafAtBlockTo) = _checkpointsLookup(_erc20VotesStorage().abafCheckpoints, _toBlock);
+        (, uint256 abafAtBlockFrom) = _erc20VotesStorage().abafCheckpoints.checkpointsLookup(_fromBlock);
+        (, uint256 abafAtBlockTo) = _erc20VotesStorage().abafCheckpoints.checkpointsLookup(_toBlock);
 
         if (abafAtBlockFrom == 0 || abafAtBlockTo == 0) return 1;
 
diff --git a/packages/ats/contracts/contracts/layer_0/bond/BondStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/bond/BondStorageWrapper.sol
index 728023f95..5b72f55a2 100644
--- a/packages/ats/contracts/contracts/layer_0/bond/BondStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/bond/BondStorageWrapper.sol
@@ -2,15 +2,12 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { _BOND_STORAGE_POSITION } from "../../layer_2/constants/storagePositions.sol";
-import {
-    COUPON_CORPORATE_ACTION_TYPE,
-    SNAPSHOT_RESULT_ID,
-    SNAPSHOT_TASK_TYPE
-} from "../../layer_2/constants/values.sol";
+import { COUPON_CORPORATE_ACTION_TYPE, SNAPSHOT_RESULT_ID, SNAPSHOT_TASK_TYPE } from "../constants/values.sol";
 import { IBondRead } from "../../layer_2/interfaces/bond/IBondRead.sol";
 import { IBondStorageWrapper } from "../../layer_2/interfaces/bond/IBondStorageWrapper.sol";
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import { ERC20PermitStorageWrapper } from "../ERC1400/ERC20Permit/ERC20PermitStorageWrapper.sol";
+import { LibCommon } from "../common/libraries/LibCommon.sol";
 
 abstract contract BondStorageWrapper is IBondStorageWrapper, ERC20PermitStorageWrapper {
     using EnumerableSet for EnumerableSet.Bytes32Set;
@@ -22,6 +19,7 @@ abstract contract BondStorageWrapper is IBondStorageWrapper, ERC20PermitStorageW
         uint256 maturityDate;
         bool initialized;
         uint8 nominalValueDecimals;
+        uint256[] counponsOrderedListByIds;
     }
 
     /**
@@ -35,6 +33,19 @@ abstract contract BondStorageWrapper is IBondStorageWrapper, ERC20PermitStorageW
         _;
     }
 
+    // solhint-disable-next-line func-name-mixedcase
+    function _initialize_bond(
+        IBondRead.BondDetailsData calldata _bondDetailsData
+    )
+        internal
+        validateDates(_bondDetailsData.startingDate, _bondDetailsData.maturityDate)
+        onlyValidTimestamp(_bondDetailsData.startingDate)
+    {
+        BondDataStorage storage bondStorage = _bondStorage();
+        bondStorage.initialized = true;
+        _storeBondDetails(_bondDetailsData);
+    }
+
     function _storeBondDetails(IBondRead.BondDetailsData memory _bondDetails) internal {
         _bondStorage().currency = _bondDetails.currency;
         _bondStorage().nominalValue = _bondDetails.nominalValue;
@@ -45,23 +56,23 @@ abstract contract BondStorageWrapper is IBondStorageWrapper, ERC20PermitStorageW
 
     function _setCoupon(
         IBondRead.Coupon memory _newCoupon
-    ) internal returns (bool success_, bytes32 corporateActionId_, uint256 couponID_) {
+    ) internal virtual returns (bytes32 corporateActionId_, uint256 couponID_) {
         bytes memory data = abi.encode(_newCoupon);
 
-        (success_, corporateActionId_, couponID_) = _addCorporateAction(COUPON_CORPORATE_ACTION_TYPE, data);
+        (corporateActionId_, couponID_) = _addCorporateAction(COUPON_CORPORATE_ACTION_TYPE, data);
 
-        _initCoupon(success_, corporateActionId_, data);
+        _initCoupon(corporateActionId_, _newCoupon);
+
+        emit CouponSet(corporateActionId_, couponID_, _msgSender(), _newCoupon);
     }
 
-    function _initCoupon(bool _success, bytes32 _actionId, bytes memory _data) internal {
-        if (!_success) {
+    function _initCoupon(bytes32 _actionId, IBondRead.Coupon memory _newCoupon) internal virtual {
+        if (_actionId == bytes32(0)) {
             revert IBondStorageWrapper.CouponCreationFailed();
         }
 
-        IBondRead.Coupon memory newCoupon = abi.decode(_data, (IBondRead.Coupon));
-
-        _addScheduledCrossOrderedTask(newCoupon.recordDate, abi.encode(SNAPSHOT_TASK_TYPE));
-        _addScheduledSnapshot(newCoupon.recordDate, abi.encode(_actionId));
+        _addScheduledCrossOrderedTask(_newCoupon.recordDate, abi.encode(SNAPSHOT_TASK_TYPE));
+        _addScheduledSnapshot(_newCoupon.recordDate, abi.encode(_actionId));
     }
 
     /**
@@ -74,6 +85,60 @@ abstract contract BondStorageWrapper is IBondStorageWrapper, ERC20PermitStorageW
         return true;
     }
 
+    function _addToCouponsOrderedList(uint256 _couponID) internal virtual override {
+        _bondStorage().counponsOrderedListByIds.push(_couponID);
+    }
+
+    function _updateCouponRate(
+        uint256 _couponID,
+        IBondRead.Coupon memory _coupon,
+        uint256 _rate,
+        uint8 _rateDecimals
+    ) internal virtual {
+        bytes32 actionId = _getCorporateActionIdByTypeIndex(COUPON_CORPORATE_ACTION_TYPE, _couponID - 1);
+
+        _coupon.rate = _rate;
+        _coupon.rateDecimals = _rateDecimals;
+        _coupon.rateStatus = IBondRead.RateCalculationStatus.SET;
+
+        _updateCorporateActionData(actionId, abi.encode(_coupon));
+    }
+
+    function _getCouponFromOrderedListAt(uint256 _pos) internal view returns (uint256 couponID_) {
+        if (_pos >= _getCouponsOrderedListTotalAdjusted()) return 0;
+
+        uint256 actualOrderedListLengthTotal = _getCouponsOrderedListTotal();
+
+        if (_pos < actualOrderedListLengthTotal) return _bondStorage().counponsOrderedListByIds[_pos];
+
+        uint256 pendingIndexOffset = _pos - actualOrderedListLengthTotal;
+
+        uint256 index = _getScheduledCouponListingCount() - 1 - pendingIndexOffset;
+
+        return _getScheduledCouponListingIdAtIndex(index);
+    }
+
+    function _getCouponsOrderedList(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) internal view returns (uint256[] memory couponIDs_) {
+        (uint256 start, uint256 end) = LibCommon.getStartAndEnd(_pageIndex, _pageLength);
+
+        couponIDs_ = new uint256[](LibCommon.getSize(start, end, _getCouponsOrderedListTotalAdjusted()));
+
+        for (uint256 i = 0; i < couponIDs_.length; i++) {
+            couponIDs_[i] = _getCouponFromOrderedListAt(start + i);
+        }
+    }
+
+    function _getCouponsOrderedListTotalAdjusted() internal view returns (uint256 total_) {
+        return _getCouponsOrderedListTotal() + _getPendingScheduledCouponListingTotalAt(_blockTimestamp());
+    }
+
+    function _getCouponsOrderedListTotal() internal view override returns (uint256 total_) {
+        return _bondStorage().counponsOrderedListByIds.length;
+    }
+
     function _getBondDetails() internal view returns (IBondRead.BondDetailsData memory bondDetails_) {
         bondDetails_ = IBondRead.BondDetailsData({
             currency: _bondStorage().currency,
@@ -88,10 +153,12 @@ abstract contract BondStorageWrapper is IBondStorageWrapper, ERC20PermitStorageW
         return _bondStorage().maturityDate;
     }
 
-    function _getCoupon(uint256 _couponID) internal view returns (IBondRead.RegisteredCoupon memory registeredCoupon_) {
-        bytes32 actionId = _corporateActionsStorage().actionsByType[COUPON_CORPORATE_ACTION_TYPE].at(_couponID - 1);
+    function _getCoupon(
+        uint256 _couponID
+    ) internal view virtual returns (IBondRead.RegisteredCoupon memory registeredCoupon_) {
+        bytes32 actionId = _getCorporateActionIdByTypeIndex(COUPON_CORPORATE_ACTION_TYPE, _couponID - 1);
 
-        (, bytes memory data) = _getCorporateAction(actionId);
+        (, , bytes memory data) = _getCorporateAction(actionId);
 
         if (data.length > 0) {
             (registeredCoupon_.coupon) = abi.decode(data, (IBondRead.Coupon));
@@ -103,14 +170,10 @@ abstract contract BondStorageWrapper is IBondStorageWrapper, ERC20PermitStorageW
     function _getCouponFor(
         uint256 _couponID,
         address _account
-    ) internal view returns (IBondRead.CouponFor memory couponFor_) {
+    ) internal view virtual returns (IBondRead.CouponFor memory couponFor_) {
         IBondRead.RegisteredCoupon memory registeredCoupon = _getCoupon(_couponID);
 
-        couponFor_.rate = registeredCoupon.coupon.rate;
-        couponFor_.rateDecimals = registeredCoupon.coupon.rateDecimals;
-        couponFor_.recordDate = registeredCoupon.coupon.recordDate;
-        couponFor_.executionDate = registeredCoupon.coupon.executionDate;
-        couponFor_.period = registeredCoupon.coupon.period;
+        couponFor_.coupon = registeredCoupon.coupon;
 
         if (registeredCoupon.coupon.recordDate < _blockTimestamp()) {
             couponFor_.recordDateReached = true;
@@ -135,13 +198,11 @@ abstract contract BondStorageWrapper is IBondStorageWrapper, ERC20PermitStorageW
 
         couponAmountFor_.recordDateReached = true;
 
-        couponAmountFor_.numerator =
-            couponFor.tokenBalance *
-            bondDetails.nominalValue *
-            couponFor.rate *
-            couponFor.period;
+        uint256 period = couponFor.coupon.endDate - couponFor.coupon.startDate;
+
+        couponAmountFor_.numerator = couponFor.tokenBalance * bondDetails.nominalValue * couponFor.coupon.rate * period;
         couponAmountFor_.denominator =
-            10 ** (couponFor.decimals + bondDetails.nominalValueDecimals + couponFor.rateDecimals) *
+            10 ** (couponFor.decimals + bondDetails.nominalValueDecimals + couponFor.coupon.rateDecimals) *
             365 days;
     }
 
diff --git a/packages/ats/contracts/contracts/layer_1/common/Common.sol b/packages/ats/contracts/contracts/layer_0/common/Common.sol
similarity index 88%
rename from packages/ats/contracts/contracts/layer_1/common/Common.sol
rename to packages/ats/contracts/contracts/layer_0/common/Common.sol
index 5de7516ee..bea3dab31 100644
--- a/packages/ats/contracts/contracts/layer_1/common/Common.sol
+++ b/packages/ats/contracts/contracts/layer_0/common/Common.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { _WILD_CARD_ROLE } from "../constants/roles.sol";
-import { IClearing } from "../interfaces/clearing/IClearing.sol";
-import { TransferAndLockStorageWrapper } from "../../layer_0/transferAndLock/TransferAndLockStorageWrapper.sol";
+import { IClearing } from "../../layer_1/interfaces/clearing/IClearing.sol";
+import { TransferAndLockStorageWrapper } from "../transferAndLock/TransferAndLockStorageWrapper.sol";
 
 abstract contract Common is TransferAndLockStorageWrapper {
     error AlreadyInitialized();
diff --git a/packages/ats/contracts/contracts/layer_0/common/libraries/CheckpointsLib.sol b/packages/ats/contracts/contracts/layer_0/common/libraries/CheckpointsLib.sol
new file mode 100644
index 000000000..52268d13a
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0/common/libraries/CheckpointsLib.sol
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
+
+library CheckpointsLib {
+    struct Checkpoint {
+        uint256 from;
+        uint256 value;
+    }
+
+    function checkpointsLookup(
+        Checkpoint[] storage self,
+        uint256 timepoint
+    ) internal view returns (uint256 block_, uint256 vote_) {
+        uint256 length = self.length;
+
+        uint256 low = 0;
+        uint256 high = length;
+
+        if (length > 5) {
+            uint256 mid = length - Math.sqrt(length);
+            if (self[mid].from > timepoint) {
+                high = mid;
+            } else {
+                low = mid + 1;
+            }
+        }
+
+        while (low < high) {
+            uint256 mid = Math.average(low, high);
+            if (self[mid].from > timepoint) {
+                high = mid;
+            } else {
+                low = mid + 1;
+            }
+        }
+
+        if (high == 0) return (0, 0);
+
+        unchecked {
+            return (self[high - 1].from, self[high - 1].value);
+        }
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0/common/libraries/DecimalsLib.sol b/packages/ats/contracts/contracts/layer_0/common/libraries/DecimalsLib.sol
new file mode 100644
index 000000000..689108192
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0/common/libraries/DecimalsLib.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+library DecimalsLib {
+    function calculateDecimalsAdjustment(
+        uint256 _amount,
+        uint8 _decimals,
+        uint8 _newDecimals
+    ) internal pure returns (uint256 newAmount_) {
+        if (_decimals == _newDecimals) return _amount;
+
+        if (_decimals > _newDecimals) {
+            return _amount / (10 ** (_decimals - _newDecimals));
+        } else {
+            return _amount * (10 ** (_newDecimals - _decimals));
+        }
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0/constants/storagePositions.sol b/packages/ats/contracts/contracts/layer_0/constants/storagePositions.sol
index 1b239348c..7bfb63204 100644
--- a/packages/ats/contracts/contracts/layer_0/constants/storagePositions.sol
+++ b/packages/ats/contracts/contracts/layer_0/constants/storagePositions.sol
@@ -36,6 +36,9 @@ bytes32 constant _SCHEDULED_SNAPSHOTS_STORAGE_POSITION = 0xe5334ddaa6268d55c7efe
 // keccak256('security.token.standard.scheduledBalanceAdjustments.storage');
 bytes32 constant _SCHEDULED_BALANCE_ADJUSTMENTS_STORAGE_POSITION = 0xaf4aaa3de473ec9b58645d40f5a2fe4e176157e247b2d875db61f1a70935ac68;
 
+// keccak256('security.token.standard.scheduledCouponListing.storage');
+bytes32 constant _SCHEDULED_COUPON_LISTING_STORAGE_POSITION = 0x020cecc946ba57a1f8569220f46e5763939a3e864a1a4064efc2be63a845635a;
+
 // keccak256('security.token.standard.scheduledCrossOrderedTasks.storage');
 bytes32 constant _SCHEDULED_CROSS_ORDERED_TASKS_STORAGE_POSITION = 0x07c301a048b8fa80688acfab6d93f7e94a43ce454031a02cdd132b92ca943a70;
 
@@ -95,3 +98,6 @@ bytes32 constant _PROCEED_RECIPIENTS_STORAGE_POSITION = 0xd76ee368b4f6f14377350e
 
 // keccak256('security.token.standard.proceedRecipients.data.storage');
 bytes32 constant _PROCEED_RECIPIENTS_DATA_STORAGE_POSITION = 0xc7c4e0ff0ace36b5d2de5287c034dccef63aa2fb6c2498a31a48fd5516019f8c;
+
+// keccak256('security.token.standard.kpis.data.storage');
+bytes32 constant _KPIS_STORAGE_POSITION = 0x15e2583fed61d8b30b191451b67403569c6ee36d7d93206cb4a6de2f6f69c0b9;
diff --git a/packages/ats/contracts/contracts/layer_0/constants/values.sol b/packages/ats/contracts/contracts/layer_0/constants/values.sol
index a44cf622b..2442a91a0 100644
--- a/packages/ats/contracts/contracts/layer_0/constants/values.sol
+++ b/packages/ats/contracts/contracts/layer_0/constants/values.sol
@@ -11,6 +11,7 @@ bytes constant EMPTY_BYTES = bytes("");
 // Used as the default partition for ERC1410 token operations when no specific partition is specified
 bytes32 constant _DEFAULT_PARTITION = 0x0000000000000000000000000000000000000000000000000000000000000001;
 uint256 constant SNAPSHOT_RESULT_ID = 0;
+uint256 constant COUPON_LISTING_RESULT_ID = 1;
 
 // keccak256('security.token.standard.dividend.corporateAction');
 bytes32 constant DIVIDEND_CORPORATE_ACTION_TYPE = 0x1c29d09f87f2b0c8192a7719a2acdfdfa320dc2835b5a0398e5bd8dc34c14b0e;
@@ -30,6 +31,9 @@ bytes32 constant BALANCE_ADJUSTMENT_TASK_TYPE = 0x9ce9cffaccaf68fc544ce4df9e5e27
 // keccak256('security.token.standard.snapshot.scheduledTasks');
 bytes32 constant SNAPSHOT_TASK_TYPE = 0x322c4b500b27950e00c27e3a40ca8f9ffacbc81a3b4e3c9516717391fd54234c;
 
+// keccak256('security.token.standard.couponListing.scheduledTasks');
+bytes32 constant COUPON_LISTING_TASK_TYPE = 0xc0025ea024305bcaedb7e0a5d9ef6f0bca23bb36ee261794fdfb21cd810563ce;
+
 bytes32 constant ERC20PERMIT_TYPEHASH = keccak256(
     "Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)"
 );
diff --git a/packages/ats/contracts/contracts/layer_0/corporateActions/CorporateActionsStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/corporateActions/CorporateActionsStorageWrapper.sol
index 1576c9d7e..9247b3add 100644
--- a/packages/ats/contracts/contracts/layer_0/corporateActions/CorporateActionsStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/corporateActions/CorporateActionsStorageWrapper.sol
@@ -1,10 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import {
-    ICorporateActionsStorageWrapper,
-    CorporateActionDataStorage
-} from "../../layer_1/interfaces/corporateActions/ICorporateActionsStorageWrapper.sol";
 import {
     ICorporateActionsStorageWrapper,
     CorporateActionDataStorage
@@ -32,16 +28,27 @@ abstract contract CorporateActionsStorageWrapper is ClearingStorageWrapper1 {
     function _addCorporateAction(
         bytes32 _actionType,
         bytes memory _data
-    ) internal returns (bool success_, bytes32 corporateActionId_, uint256 corporateActionIndexByType_) {
+    ) internal returns (bytes32 corporateActionId_, uint256 corporateActionIdByType_) {
         CorporateActionDataStorage storage corporateActions_ = _corporateActionsStorage();
         corporateActionId_ = bytes32(corporateActions_.actions.length() + 1);
         // TODO: Review when it can return false.
-        success_ =
-            corporateActions_.actions.add(corporateActionId_) &&
-            corporateActions_.actionsByType[_actionType].add(corporateActionId_);
+        bool success = corporateActions_.actions.add(corporateActionId_);
+
+        if (!success) {
+            return (bytes32(0), 0);
+        }
+
+        corporateActions_.actionsByType[_actionType].push(corporateActionId_);
+
+        corporateActionIdByType_ = _getCorporateActionCountByType(_actionType);
+
         corporateActions_.actionsData[corporateActionId_].actionType = _actionType;
         corporateActions_.actionsData[corporateActionId_].data = _data;
-        corporateActionIndexByType_ = _getCorporateActionCountByType(_actionType);
+        corporateActions_.actionsData[corporateActionId_].actionIdByType = corporateActionIdByType_;
+    }
+
+    function _updateCorporateActionData(bytes32 _actionId, bytes memory _newData) internal {
+        _corporateActionsStorage().actionsData[_actionId].data = _newData;
     }
 
     function _updateCorporateActionResult(bytes32 actionId, uint256 resultId, bytes memory newResult) internal {
@@ -62,10 +69,11 @@ abstract contract CorporateActionsStorageWrapper is ClearingStorageWrapper1 {
 
     function _getCorporateAction(
         bytes32 _corporateActionId
-    ) internal view returns (bytes32 actionType_, bytes memory data_) {
+    ) internal view returns (bytes32 actionType_, uint256 actionTypeId_, bytes memory data_) {
         CorporateActionDataStorage storage corporateActions_ = _corporateActionsStorage();
         actionType_ = corporateActions_.actionsData[_corporateActionId].actionType;
         data_ = corporateActions_.actionsData[_corporateActionId].data;
+        actionTypeId_ = corporateActions_.actionsData[_corporateActionId].actionIdByType;
     }
 
     function _getCorporateActionCount() internal view virtual returns (uint256 corporateActionCount_) {
@@ -80,7 +88,14 @@ abstract contract CorporateActionsStorageWrapper is ClearingStorageWrapper1 {
     }
 
     function _getCorporateActionCountByType(bytes32 _actionType) internal view returns (uint256 corporateActionCount_) {
-        return _corporateActionsStorage().actionsByType[_actionType].length();
+        return _corporateActionsStorage().actionsByType[_actionType].length;
+    }
+
+    function _getCorporateActionIdByTypeIndex(
+        bytes32 _actionType,
+        uint256 _typeIndex
+    ) internal view returns (bytes32 corporateActionId_) {
+        return _corporateActionsStorage().actionsByType[_actionType][_typeIndex];
     }
 
     function _getCorporateActionIdsByType(
@@ -88,7 +103,15 @@ abstract contract CorporateActionsStorageWrapper is ClearingStorageWrapper1 {
         uint256 _pageIndex,
         uint256 _pageLength
     ) internal view returns (bytes32[] memory corporateActionIds_) {
-        corporateActionIds_ = _corporateActionsStorage().actionsByType[_actionType].getFromSet(_pageIndex, _pageLength);
+        (uint256 start, uint256 end) = LibCommon.getStartAndEnd(_pageIndex, _pageLength);
+
+        corporateActionIds_ = new bytes32[](LibCommon.getSize(start, end, _getCorporateActionCountByType(_actionType)));
+
+        CorporateActionDataStorage storage corporateActions = _corporateActionsStorage();
+
+        for (uint256 i = 0; i < corporateActionIds_.length; i++) {
+            corporateActionIds_[i] = corporateActions.actionsByType[_actionType][start + i];
+        }
     }
 
     function _getCorporateActionResult(
diff --git a/packages/ats/contracts/contracts/layer_0/equity/EquityStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/equity/EquityStorageWrapper.sol
index 5133cb7f6..9bbce2483 100644
--- a/packages/ats/contracts/contracts/layer_0/equity/EquityStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/equity/EquityStorageWrapper.sol
@@ -49,16 +49,16 @@ abstract contract EquityStorageWrapper is IEquityStorageWrapper, BondStorageWrap
 
     function _setDividends(
         IEquity.Dividend calldata _newDividend
-    ) internal returns (bool success_, bytes32 corporateActionId_, uint256 dividendId_) {
+    ) internal returns (bytes32 corporateActionId_, uint256 dividendId_) {
         bytes memory data = abi.encode(_newDividend);
 
-        (success_, corporateActionId_, dividendId_) = _addCorporateAction(DIVIDEND_CORPORATE_ACTION_TYPE, data);
+        (corporateActionId_, dividendId_) = _addCorporateAction(DIVIDEND_CORPORATE_ACTION_TYPE, data);
 
-        _initDividend(success_, corporateActionId_, data);
+        _initDividend(corporateActionId_, data);
     }
 
-    function _initDividend(bool _success, bytes32 _actionId, bytes memory _data) internal {
-        if (!_success) {
+    function _initDividend(bytes32 _actionId, bytes memory _data) internal {
+        if (_actionId == bytes32(0)) {
             revert IEquityStorageWrapper.DividendCreationFailed();
         }
 
@@ -70,16 +70,16 @@ abstract contract EquityStorageWrapper is IEquityStorageWrapper, BondStorageWrap
 
     function _setVoting(
         IEquity.Voting calldata _newVoting
-    ) internal returns (bool success_, bytes32 corporateActionId_, uint256 voteID_) {
+    ) internal returns (bytes32 corporateActionId_, uint256 voteID_) {
         bytes memory data = abi.encode(_newVoting);
 
-        (success_, corporateActionId_, voteID_) = _addCorporateAction(VOTING_RIGHTS_CORPORATE_ACTION_TYPE, data);
+        (corporateActionId_, voteID_) = _addCorporateAction(VOTING_RIGHTS_CORPORATE_ACTION_TYPE, data);
 
-        _initVotingRights(success_, corporateActionId_, data);
+        _initVotingRights(corporateActionId_, data);
     }
 
-    function _initVotingRights(bool _success, bytes32 _actionId, bytes memory _data) internal {
-        if (!_success) {
+    function _initVotingRights(bytes32 _actionId, bytes memory _data) internal {
+        if (_actionId == bytes32(0)) {
             revert IEquityStorageWrapper.VotingRightsCreationFailed();
         }
 
@@ -91,19 +91,19 @@ abstract contract EquityStorageWrapper is IEquityStorageWrapper, BondStorageWrap
 
     function _setScheduledBalanceAdjustment(
         IEquity.ScheduledBalanceAdjustment calldata _newBalanceAdjustment
-    ) internal returns (bool success_, bytes32 corporateActionId_, uint256 balanceAdjustmentID_) {
+    ) internal returns (bytes32 corporateActionId_, uint256 balanceAdjustmentID_) {
         bytes memory data = abi.encode(_newBalanceAdjustment);
 
-        (success_, corporateActionId_, balanceAdjustmentID_) = _addCorporateAction(
+        (corporateActionId_, balanceAdjustmentID_) = _addCorporateAction(
             BALANCE_ADJUSTMENT_CORPORATE_ACTION_TYPE,
             data
         );
 
-        _initBalanceAdjustment(success_, corporateActionId_, data);
+        _initBalanceAdjustment(corporateActionId_, data);
     }
 
-    function _initBalanceAdjustment(bool _success, bytes32 _actionId, bytes memory _data) internal {
-        if (!_success) {
+    function _initBalanceAdjustment(bytes32 _actionId, bytes memory _data) internal {
+        if (_actionId == bytes32(0)) {
             revert IEquityStorageWrapper.BalanceAdjustmentCreationFailed();
         }
 
@@ -141,9 +141,9 @@ abstract contract EquityStorageWrapper is IEquityStorageWrapper, BondStorageWrap
     function _getDividends(
         uint256 _dividendID
     ) internal view returns (IEquity.RegisteredDividend memory registeredDividend_) {
-        bytes32 actionId = _corporateActionsStorage().actionsByType[DIVIDEND_CORPORATE_ACTION_TYPE].at(_dividendID - 1);
+        bytes32 actionId = _getCorporateActionIdByTypeIndex(DIVIDEND_CORPORATE_ACTION_TYPE, _dividendID - 1);
 
-        (, bytes memory data) = _getCorporateAction(actionId);
+        (, , bytes memory data) = _getCorporateAction(actionId);
 
         if (data.length > 0) {
             (registeredDividend_.dividend) = abi.decode(data, (IEquity.Dividend));
@@ -225,11 +225,9 @@ abstract contract EquityStorageWrapper is IEquityStorageWrapper, BondStorageWrap
     }
 
     function _getVoting(uint256 _voteID) internal view returns (IEquity.RegisteredVoting memory registeredVoting_) {
-        bytes32 actionId = _corporateActionsStorage().actionsByType[VOTING_RIGHTS_CORPORATE_ACTION_TYPE].at(
-            _voteID - 1
-        );
+        bytes32 actionId = _getCorporateActionIdByTypeIndex(VOTING_RIGHTS_CORPORATE_ACTION_TYPE, _voteID - 1);
 
-        (, bytes memory data) = _getCorporateAction(actionId);
+        (, , bytes memory data) = _getCorporateAction(actionId);
 
         if (data.length > 0) {
             (registeredVoting_.voting) = abi.decode(data, (IEquity.Voting));
@@ -297,11 +295,12 @@ abstract contract EquityStorageWrapper is IEquityStorageWrapper, BondStorageWrap
     function _getScheduledBalanceAdjusment(
         uint256 _balanceAdjustmentID
     ) internal view returns (IEquity.ScheduledBalanceAdjustment memory balanceAdjustment_) {
-        bytes32 actionId = _corporateActionsStorage().actionsByType[BALANCE_ADJUSTMENT_CORPORATE_ACTION_TYPE].at(
+        bytes32 actionId = _getCorporateActionIdByTypeIndex(
+            BALANCE_ADJUSTMENT_CORPORATE_ACTION_TYPE,
             _balanceAdjustmentID - 1
         );
 
-        (, bytes memory data) = _getCorporateAction(actionId);
+        (, , bytes memory data) = _getCorporateAction(actionId);
 
         if (data.length > 0) {
             (balanceAdjustment_) = abi.decode(data, (IEquity.ScheduledBalanceAdjustment));
diff --git a/packages/ats/contracts/contracts/layer_0/interestRates/fixedRate/FixedRateStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/interestRates/fixedRate/FixedRateStorageWrapper.sol
new file mode 100644
index 000000000..a66979db7
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0/interestRates/fixedRate/FixedRateStorageWrapper.sol
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { _FIXED_RATE_STORAGE_POSITION } from "../../../layer_2/constants/storagePositions.sol";
+import {
+    SustainabilityPerformanceTargetRateStorageWrapper
+} from "../sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRateStorageWrapper.sol";
+
+abstract contract FixedRateStorageWrapper is SustainabilityPerformanceTargetRateStorageWrapper {
+    struct FixedRateDataStorage {
+        uint256 rate;
+        uint8 decimals;
+        bool initialized;
+    }
+
+    function _setRate(uint256 _newRate, uint8 _newRateDecimals) internal {
+        FixedRateDataStorage storage fixedRateStorage = _fixedRateStorage();
+
+        fixedRateStorage.rate = _newRate;
+        fixedRateStorage.decimals = _newRateDecimals;
+    }
+
+    function _getRate() internal view returns (uint256 rate_, uint8 decimals_) {
+        rate_ = _fixedRateStorage().rate;
+        decimals_ = _fixedRateStorage().decimals;
+    }
+
+    function _fixedRateStorage() internal pure returns (FixedRateDataStorage storage fixedRateDataStorage_) {
+        bytes32 position = _FIXED_RATE_STORAGE_POSITION;
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            fixedRateDataStorage_.slot := position
+        }
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0/interestRates/kpiLinkedRate/KpiLinkedRateStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/interestRates/kpiLinkedRate/KpiLinkedRateStorageWrapper.sol
new file mode 100644
index 000000000..d8d1365cf
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0/interestRates/kpiLinkedRate/KpiLinkedRateStorageWrapper.sol
@@ -0,0 +1,116 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { _KPI_LINKED_RATE_STORAGE_POSITION } from "../../../layer_2/constants/storagePositions.sol";
+import { IKpiLinkedRate } from "../../../layer_2/interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol";
+import { PauseStorageWrapper } from "../../core/pause/PauseStorageWrapper.sol";
+
+abstract contract KpiLinkedRateStorageWrapper is PauseStorageWrapper {
+    struct KpiLinkedRateDataStorage {
+        uint256 maxRate;
+        uint256 baseRate;
+        uint256 minRate;
+        uint256 startPeriod;
+        uint256 startRate;
+        uint256 missedPenalty;
+        uint256 reportPeriod;
+        uint8 rateDecimals;
+        uint256 maxDeviationCap;
+        uint256 baseLine;
+        uint256 maxDeviationFloor;
+        uint256 adjustmentPrecision;
+        uint8 impactDataDecimals;
+        address kpiOracle;
+        bool initialized;
+    }
+
+    modifier checkInterestRate(IKpiLinkedRate.InterestRate calldata _newInterestRate) {
+        if (
+            _newInterestRate.minRate > _newInterestRate.baseRate || _newInterestRate.baseRate > _newInterestRate.maxRate
+        ) {
+            revert IKpiLinkedRate.WrongInterestRateValues(_newInterestRate);
+        }
+        _;
+    }
+
+    modifier checkImpactData(IKpiLinkedRate.ImpactData calldata _newImpactData) {
+        if (
+            _newImpactData.maxDeviationFloor > _newImpactData.baseLine ||
+            _newImpactData.baseLine > _newImpactData.maxDeviationCap
+        ) {
+            revert IKpiLinkedRate.WrongImpactDataValues(_newImpactData);
+        }
+        _;
+    }
+
+    function _setInterestRate(IKpiLinkedRate.InterestRate calldata _newInterestRate) internal {
+        _triggerScheduledCrossOrderedTasks(0);
+
+        KpiLinkedRateDataStorage storage kpiLinkedRateDataStorage = _kpiLinkedRateStorage();
+        kpiLinkedRateDataStorage.maxRate = _newInterestRate.maxRate;
+        kpiLinkedRateDataStorage.baseRate = _newInterestRate.baseRate;
+        kpiLinkedRateDataStorage.minRate = _newInterestRate.minRate;
+        kpiLinkedRateDataStorage.startPeriod = _newInterestRate.startPeriod;
+        kpiLinkedRateDataStorage.startRate = _newInterestRate.startRate;
+        kpiLinkedRateDataStorage.missedPenalty = _newInterestRate.missedPenalty;
+        kpiLinkedRateDataStorage.reportPeriod = _newInterestRate.reportPeriod;
+        kpiLinkedRateDataStorage.rateDecimals = _newInterestRate.rateDecimals;
+    }
+    function _setImpactData(IKpiLinkedRate.ImpactData calldata _newImpactData) internal {
+        _triggerScheduledCrossOrderedTasks(0);
+
+        KpiLinkedRateDataStorage storage kpiLinkedRateDataStorage = _kpiLinkedRateStorage();
+        kpiLinkedRateDataStorage.maxDeviationCap = _newImpactData.maxDeviationCap;
+        kpiLinkedRateDataStorage.baseLine = _newImpactData.baseLine;
+        kpiLinkedRateDataStorage.maxDeviationFloor = _newImpactData.maxDeviationFloor;
+        kpiLinkedRateDataStorage.impactDataDecimals = _newImpactData.impactDataDecimals;
+        kpiLinkedRateDataStorage.adjustmentPrecision = _newImpactData.adjustmentPrecision;
+    }
+
+    function _setKpiOracle(address _kpiOracle) internal {
+        _triggerScheduledCrossOrderedTasks(0);
+
+        _kpiLinkedRateStorage().kpiOracle = _kpiOracle;
+    }
+
+    function _triggerScheduledCrossOrderedTasks(uint256 _max) internal virtual returns (uint256);
+
+    function _getInterestRate() internal view returns (IKpiLinkedRate.InterestRate memory interestRate_) {
+        interestRate_ = IKpiLinkedRate.InterestRate({
+            maxRate: _kpiLinkedRateStorage().maxRate,
+            baseRate: _kpiLinkedRateStorage().baseRate,
+            minRate: _kpiLinkedRateStorage().minRate,
+            startPeriod: _kpiLinkedRateStorage().startPeriod,
+            startRate: _kpiLinkedRateStorage().startRate,
+            missedPenalty: _kpiLinkedRateStorage().missedPenalty,
+            reportPeriod: _kpiLinkedRateStorage().reportPeriod,
+            rateDecimals: _kpiLinkedRateStorage().rateDecimals
+        });
+    }
+
+    function _getImpactData() internal view returns (IKpiLinkedRate.ImpactData memory impactData_) {
+        impactData_ = IKpiLinkedRate.ImpactData({
+            maxDeviationCap: _kpiLinkedRateStorage().maxDeviationCap,
+            baseLine: _kpiLinkedRateStorage().baseLine,
+            maxDeviationFloor: _kpiLinkedRateStorage().maxDeviationFloor,
+            impactDataDecimals: _kpiLinkedRateStorage().impactDataDecimals,
+            adjustmentPrecision: _kpiLinkedRateStorage().adjustmentPrecision
+        });
+    }
+
+    function _getKpiOracle() internal view returns (address kpiOracle_) {
+        kpiOracle_ = _kpiLinkedRateStorage().kpiOracle;
+    }
+
+    function _kpiLinkedRateStorage()
+        internal
+        pure
+        returns (KpiLinkedRateDataStorage storage kpiLinkedRateDataStorage_)
+    {
+        bytes32 position = _KPI_LINKED_RATE_STORAGE_POSITION;
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            kpiLinkedRateDataStorage_.slot := position
+        }
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRateStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRateStorageWrapper.sol
new file mode 100644
index 000000000..95b034400
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRateStorageWrapper.sol
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { PauseStorageWrapper } from "../../core/pause/PauseStorageWrapper.sol";
+import {
+    _SUSTAINABILITY_PERFORMANCE_TARGET_RATE_STORAGE_POSITION
+} from "../../../layer_2/constants/storagePositions.sol";
+import {
+    ISustainabilityPerformanceTargetRate
+} from "../../../layer_2/interfaces/interestRates/sustainabilityPerformanceTargetRate/ISustainabilityPerformanceTargetRate.sol";
+import { KpiLinkedRateStorageWrapper } from "../kpiLinkedRate/KpiLinkedRateStorageWrapper.sol";
+
+abstract contract SustainabilityPerformanceTargetRateStorageWrapper is KpiLinkedRateStorageWrapper {
+    struct SustainabilityPerformanceTargetRateDataStorage {
+        uint256 baseRate;
+        uint256 startPeriod;
+        uint256 startRate;
+        uint8 rateDecimals;
+        mapping(address project => ISustainabilityPerformanceTargetRate.ImpactData impactData) impactDataByProject;
+        bool initialized;
+    }
+
+    function _setSPTInterestRate(ISustainabilityPerformanceTargetRate.InterestRate calldata _newInterestRate) internal {
+        _triggerScheduledCrossOrderedTasks(0);
+        SustainabilityPerformanceTargetRateDataStorage
+            storage sustainabilityPerformanceTargetRateDataStorage = _sustainabilityPerformanceTargetRateStorage();
+        sustainabilityPerformanceTargetRateDataStorage.baseRate = _newInterestRate.baseRate;
+        sustainabilityPerformanceTargetRateDataStorage.startPeriod = _newInterestRate.startPeriod;
+        sustainabilityPerformanceTargetRateDataStorage.startRate = _newInterestRate.startRate;
+        sustainabilityPerformanceTargetRateDataStorage.rateDecimals = _newInterestRate.rateDecimals;
+    }
+    function _setSPTImpactData(
+        ISustainabilityPerformanceTargetRate.ImpactData calldata _newImpactData,
+        address _project
+    ) internal {
+        _triggerScheduledCrossOrderedTasks(0);
+        ISustainabilityPerformanceTargetRate.ImpactData
+            storage impactData = _sustainabilityPerformanceTargetRateStorage().impactDataByProject[_project];
+        impactData.baseLine = _newImpactData.baseLine;
+        impactData.baseLineMode = _newImpactData.baseLineMode;
+        impactData.deltaRate = _newImpactData.deltaRate;
+        impactData.impactDataMode = _newImpactData.impactDataMode;
+    }
+
+    function _getSPTInterestRate()
+        internal
+        view
+        returns (ISustainabilityPerformanceTargetRate.InterestRate memory interestRate_)
+    {
+        SustainabilityPerformanceTargetRateDataStorage
+            storage sustainabilityPerformanceTargetRateDataStorage = _sustainabilityPerformanceTargetRateStorage();
+        interestRate_ = ISustainabilityPerformanceTargetRate.InterestRate({
+            baseRate: sustainabilityPerformanceTargetRateDataStorage.baseRate,
+            startPeriod: sustainabilityPerformanceTargetRateDataStorage.startPeriod,
+            startRate: sustainabilityPerformanceTargetRateDataStorage.startRate,
+            rateDecimals: sustainabilityPerformanceTargetRateDataStorage.rateDecimals
+        });
+    }
+
+    function _getSPTImpactDataFor(
+        address _project
+    ) internal view returns (ISustainabilityPerformanceTargetRate.ImpactData memory impactData_) {
+        return _sustainabilityPerformanceTargetRateStorage().impactDataByProject[_project];
+    }
+
+    function _sustainabilityPerformanceTargetRateStorage()
+        internal
+        pure
+        returns (SustainabilityPerformanceTargetRateDataStorage storage sustainabilityPerformanceTargetRateDataStorage_)
+    {
+        bytes32 position = _SUSTAINABILITY_PERFORMANCE_TARGET_RATE_STORAGE_POSITION;
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            sustainabilityPerformanceTargetRateDataStorage_.slot := position
+        }
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0/proceedRecipients/ProceedRecipientsStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/proceedRecipients/ProceedRecipientsStorageWrapper.sol
index c54fe6eb3..2c579000d 100644
--- a/packages/ats/contracts/contracts/layer_0/proceedRecipients/ProceedRecipientsStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/proceedRecipients/ProceedRecipientsStorageWrapper.sol
@@ -14,14 +14,14 @@ abstract contract ProceedRecipientsStorageWrapper is TotalBalancesStorageWrapper
     }
 
     modifier onlyIfProceedRecipient(address _proceedRecipient) {
-        if (!_isExternalList(_PROCEED_RECIPIENTS_STORAGE_POSITION, _proceedRecipient)) {
+        if (!_isProceedRecipient(_proceedRecipient)) {
             revert IProceedRecipients.ProceedRecipientNotFound(_proceedRecipient);
         }
         _;
     }
 
     modifier onlyIfNotProceedRecipient(address _proceedRecipient) {
-        if (_isExternalList(_PROCEED_RECIPIENTS_STORAGE_POSITION, _proceedRecipient)) {
+        if (_isProceedRecipient(_proceedRecipient)) {
             revert IProceedRecipients.ProceedRecipientAlreadyExists(_proceedRecipient);
         }
         _;
@@ -49,6 +49,14 @@ abstract contract ProceedRecipientsStorageWrapper is TotalBalancesStorageWrapper
         return _proceedRecipientsDataStorage().proceedRecipientData[_proceedRecipient];
     }
 
+    function _isProceedRecipient(address _proceedRecipient) internal view returns (bool) {
+        return _isExternalList(_PROCEED_RECIPIENTS_STORAGE_POSITION, _proceedRecipient);
+    }
+
+    function _getProceedRecipientsCount() internal view returns (uint256) {
+        return _getExternalListsCount(_PROCEED_RECIPIENTS_STORAGE_POSITION);
+    }
+
     function _proceedRecipientsDataStorage()
         internal
         pure
diff --git a/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsStorageWrapper.sol
index de167684f..8b2c06fba 100644
--- a/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsStorageWrapper.sol
@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { ScheduledSnapshotsStorageWrapper } from "../scheduledSnapshots/ScheduledSnapshotsStorageWrapper.sol";
+import {
+    IScheduledBalanceAdjustments
+} from "../../../layer_2/interfaces/scheduledTasks/scheduledBalanceAdjustments/IScheduledBalanceAdjustments.sol";
+import {
+    ScheduledCouponListingStorageWrapper
+} from "../scheduledCouponListing/ScheduledCouponListingStorageWrapper.sol";
 import { ScheduledTasksLib } from "../../../layer_2/scheduledTasks/ScheduledTasksLib.sol";
 import { _SCHEDULED_BALANCE_ADJUSTMENTS_STORAGE_POSITION } from "../../constants/storagePositions.sol";
 import { IEquity } from "../../../layer_2/interfaces/equity/IEquity.sol";
@@ -10,7 +15,7 @@ import {
     ScheduledTasksDataStorage
 } from "../../../layer_2/interfaces/scheduledTasks/scheduledTasksCommon/IScheduledTasksCommon.sol";
 
-abstract contract ScheduledBalanceAdjustmentsStorageWrapper is ScheduledSnapshotsStorageWrapper {
+abstract contract ScheduledBalanceAdjustmentsStorageWrapper is ScheduledCouponListingStorageWrapper {
     function _addScheduledBalanceAdjustment(uint256 _newScheduledTimestamp, bytes memory _newData) internal {
         ScheduledTasksLib.addScheduledTask(_scheduledBalanceAdjustmentStorage(), _newScheduledTimestamp, _newData);
     }
@@ -33,7 +38,7 @@ abstract contract ScheduledBalanceAdjustmentsStorageWrapper is ScheduledSnapshot
         bytes memory data = _scheduledTask.data;
 
         if (data.length == 0) return;
-        (, bytes memory balanceAdjustmentData) = _getCorporateAction(abi.decode(data, (bytes32)));
+        (, , bytes memory balanceAdjustmentData) = _getCorporateAction(abi.decode(data, (bytes32)));
         if (balanceAdjustmentData.length == 0) return;
         IEquity.ScheduledBalanceAdjustment memory balanceAdjustment = abi.decode(
             balanceAdjustmentData,
diff --git a/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledCouponListing/ScheduledCouponListingStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledCouponListing/ScheduledCouponListingStorageWrapper.sol
new file mode 100644
index 000000000..d868a1899
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledCouponListing/ScheduledCouponListingStorageWrapper.sol
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import {
+    IScheduledCouponListing
+} from "../../../layer_2/interfaces/scheduledTasks/scheduledCouponListing/IScheduledCouponListing.sol";
+import { ScheduledSnapshotsStorageWrapper } from "../scheduledSnapshots/ScheduledSnapshotsStorageWrapper.sol";
+import { ScheduledTasksLib } from "../../../layer_2/scheduledTasks/ScheduledTasksLib.sol";
+import { _SCHEDULED_COUPON_LISTING_STORAGE_POSITION } from "../../constants/storagePositions.sol";
+import { IBondRead } from "../../../layer_2/interfaces/bond/IBondRead.sol";
+import {
+    ScheduledTask,
+    ScheduledTasksDataStorage
+} from "../../../layer_2/interfaces/scheduledTasks/scheduledTasksCommon/IScheduledTasksCommon.sol";
+import { COUPON_LISTING_RESULT_ID } from "../../constants/values.sol";
+
+abstract contract ScheduledCouponListingStorageWrapper is ScheduledSnapshotsStorageWrapper {
+    function _addScheduledCouponListing(uint256 _newScheduledTimestamp, bytes memory _newData) internal {
+        ScheduledTasksLib.addScheduledTask(_scheduledCouponListingStorage(), _newScheduledTimestamp, _newData);
+    }
+
+    function _triggerScheduledCouponListing(uint256 _max) internal returns (uint256) {
+        return
+            _triggerScheduledTasks(
+                _scheduledCouponListingStorage(),
+                _onScheduledCouponListingTriggered,
+                _max,
+                _blockTimestamp()
+            );
+    }
+
+    function _onScheduledCouponListingTriggered(
+        uint256 /*_pos*/,
+        uint256 /*_scheduledTasksLength*/,
+        ScheduledTask memory _scheduledTask
+    ) internal {
+        bytes memory data = _scheduledTask.data;
+
+        if (data.length == 0) return;
+
+        bytes32 actionId = abi.decode(data, (bytes32));
+
+        _addToCouponsOrderedList(uint256(actionId));
+        uint256 pos = _getCouponsOrderedListTotal();
+
+        _updateCorporateActionResult(actionId, COUPON_LISTING_RESULT_ID, abi.encodePacked(pos));
+    }
+
+    function _addToCouponsOrderedList(uint256 _couponID) internal virtual;
+    function _getCouponsOrderedListTotal() internal view virtual returns (uint256 total_);
+
+    function _getScheduledCouponListingCount() internal view returns (uint256) {
+        return ScheduledTasksLib.getScheduledTaskCount(_scheduledCouponListingStorage());
+    }
+
+    function _getScheduledCouponListing(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) internal view returns (ScheduledTask[] memory scheduledCouponListing_) {
+        return ScheduledTasksLib.getScheduledTasks(_scheduledCouponListingStorage(), _pageIndex, _pageLength);
+    }
+
+    function _getPendingScheduledCouponListingTotalAt(uint256 _timestamp) internal view returns (uint256 total_) {
+        total_ = 0;
+
+        ScheduledTasksDataStorage storage scheduledCouponListing = _scheduledCouponListingStorage();
+
+        uint256 scheduledTaskCount = ScheduledTasksLib.getScheduledTaskCount(scheduledCouponListing);
+
+        for (uint256 i = 1; i <= scheduledTaskCount; i++) {
+            uint256 pos = scheduledTaskCount - i;
+
+            ScheduledTask memory scheduledTask = ScheduledTasksLib.getScheduledTasksByIndex(
+                scheduledCouponListing,
+                pos
+            );
+
+            if (scheduledTask.scheduledTimestamp < _timestamp) {
+                total_++;
+            } else {
+                break;
+            }
+        }
+    }
+
+    function _getScheduledCouponListingIdAtIndex(uint256 _index) internal view returns (uint256 couponID_) {
+        ScheduledTask memory couponListing = ScheduledTasksLib.getScheduledTasksByIndex(
+            _scheduledCouponListingStorage(),
+            _index
+        );
+
+        bytes32 actionId = abi.decode(couponListing.data, (bytes32));
+
+        (, couponID_, ) = _getCorporateAction(actionId);
+    }
+
+    function _scheduledCouponListingStorage()
+        internal
+        pure
+        returns (ScheduledTasksDataStorage storage scheduledCouponListing_)
+    {
+        bytes32 position = _SCHEDULED_COUPON_LISTING_STORAGE_POSITION;
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            scheduledCouponListing_.slot := position
+        }
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledCrossOrderedTasks/ScheduledCrossOrderedTasksStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledCrossOrderedTasks/ScheduledCrossOrderedTasksStorageWrapper.sol
index 2a959f1b2..7b8f5d844 100644
--- a/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledCrossOrderedTasks/ScheduledCrossOrderedTasksStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/scheduledTasks/scheduledCrossOrderedTasks/ScheduledCrossOrderedTasksStorageWrapper.sol
@@ -9,7 +9,7 @@ import { _SCHEDULED_CROSS_ORDERED_TASKS_STORAGE_POSITION } from "../../constants
 import {
     ScheduledBalanceAdjustmentsStorageWrapper
 } from "../scheduledBalanceAdjustments/ScheduledBalanceAdjustmentsStorageWrapper.sol";
-import { SNAPSHOT_TASK_TYPE } from "../../constants/values.sol";
+import { SNAPSHOT_TASK_TYPE, BALANCE_ADJUSTMENT_TASK_TYPE, COUPON_LISTING_TASK_TYPE } from "../../constants/values.sol";
 import {
     ScheduledTask,
     ScheduledTasksDataStorage
@@ -20,7 +20,7 @@ abstract contract ScheduledCrossOrderedTasksStorageWrapper is ScheduledBalanceAd
         ScheduledTasksLib.addScheduledTask(_scheduledCrossOrderedTaskStorage(), _newScheduledTimestamp, _newData);
     }
 
-    function _triggerScheduledCrossOrderedTasks(uint256 _max) internal returns (uint256) {
+    function _triggerScheduledCrossOrderedTasks(uint256 _max) internal override returns (uint256) {
         return
             _triggerScheduledTasks(
                 _scheduledCrossOrderedTaskStorage(),
@@ -38,11 +38,21 @@ abstract contract ScheduledCrossOrderedTasksStorageWrapper is ScheduledBalanceAd
         bytes memory data = _scheduledTask.data;
 
         if (data.length == 0) return;
-        if (abi.decode(data, (bytes32)) == SNAPSHOT_TASK_TYPE) {
+
+        bytes32 taskType = abi.decode(data, (bytes32));
+
+        if (taskType == SNAPSHOT_TASK_TYPE) {
             _triggerScheduledSnapshots(1);
             return;
         }
-        _triggerScheduledBalanceAdjustments(1);
+        if (taskType == BALANCE_ADJUSTMENT_TASK_TYPE) {
+            _triggerScheduledBalanceAdjustments(1);
+            return;
+        }
+        if (taskType == COUPON_LISTING_TASK_TYPE) {
+            _triggerScheduledCouponListing(1);
+            return;
+        }
     }
 
     function _getScheduledCrossOrderedTaskCount() internal view returns (uint256) {
diff --git a/packages/ats/contracts/contracts/layer_0/totalBalances/TotalBalancesStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0/totalBalances/TotalBalancesStorageWrapper.sol
index bade813f3..9f6e6eede 100644
--- a/packages/ats/contracts/contracts/layer_0/totalBalances/TotalBalancesStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_0/totalBalances/TotalBalancesStorageWrapper.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { PauseStorageWrapper } from "../core/pause/PauseStorageWrapper.sol";
+import { FixedRateStorageWrapper } from "../interestRates/fixedRate/FixedRateStorageWrapper.sol";
 
-abstract contract TotalBalancesStorageWrapper is PauseStorageWrapper {
+abstract contract TotalBalancesStorageWrapper is FixedRateStorageWrapper {
     function _getTotalBalance(address /*_tokenHolder*/) internal view virtual returns (uint256 totalBalance) {
         return 0;
     }
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/BondStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/BondStorageWrapper.sol
new file mode 100644
index 000000000..a1e283b1c
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/BondStorageWrapper.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { Common } from "../../../layer_0/common/Common.sol";
+import { IBondRead } from "../../../layer_2/interfaces/bond/IBondRead.sol";
+
+abstract contract BondStorageWrapperFixedInterestRate is Common {
+    error InterestRateIsFixed();
+
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    ) internal virtual override returns (bytes32 corporateActionId_, uint256 couponID_) {
+        if (
+            _newCoupon.rateStatus != IBondRead.RateCalculationStatus.PENDING ||
+            _newCoupon.rate != 0 ||
+            _newCoupon.rateDecimals != 0
+        ) revert InterestRateIsFixed();
+
+        (_newCoupon.rate, _newCoupon.rateDecimals) = _getRate();
+        _newCoupon.rateStatus = IBondRead.RateCalculationStatus.SET;
+
+        return super._setCoupon(_newCoupon);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/Common.sol b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/Common.sol
new file mode 100644
index 000000000..82884750b
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/Common.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BondStorageWrapperFixedInterestRate } from "./BondStorageWrapper.sol";
+
+// solhint-disable no-empty-blocks
+abstract contract CommonFixedInterestRate is BondStorageWrapperFixedInterestRate {}
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/FACETS.md b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/FACETS.md
new file mode 100644
index 000000000..f5a66926a
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixedInterestRate/FACETS.md
@@ -0,0 +1,3 @@
+# Bond Fixed Interest Rate Custom Facets
+
+- Bond
\ No newline at end of file
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/BondStorageWrapperFixingDateInterestRate.sol b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/BondStorageWrapperFixingDateInterestRate.sol
new file mode 100644
index 000000000..4831d5e1d
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/BondStorageWrapperFixingDateInterestRate.sol
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { Common } from "../../../layer_0/common/Common.sol";
+import { IBondRead } from "../../../layer_2/interfaces/bond/IBondRead.sol";
+import { COUPON_LISTING_TASK_TYPE, COUPON_CORPORATE_ACTION_TYPE } from "../../../layer_0/constants/values.sol";
+import { LowLevelCall } from "../../../layer_0/common/libraries/LowLevelCall.sol";
+import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import { DecimalsLib } from "../../../layer_0/common/libraries/DecimalsLib.sol";
+
+abstract contract BondStorageWrapperFixingDateInterestRate is Common {
+    using LowLevelCall for address;
+    using EnumerableSet for EnumerableSet.Bytes32Set;
+
+    function _checkCoupon(
+        IBondRead.Coupon memory _newCoupon,
+        bytes4 _reasonCode,
+        bytes memory _details
+    ) internal virtual {
+        if (
+            _newCoupon.rateStatus != IBondRead.RateCalculationStatus.PENDING ||
+            _newCoupon.rate != 0 ||
+            _newCoupon.rateDecimals != 0
+        ) LowLevelCall.revertWithData(_reasonCode, _details);
+    }
+
+    function _initCoupon(bytes32 _actionId, IBondRead.Coupon memory _newCoupon) internal virtual override {
+        super._initCoupon(_actionId, _newCoupon);
+
+        _addScheduledCrossOrderedTask(_newCoupon.fixingDate, abi.encode(COUPON_LISTING_TASK_TYPE));
+        _addScheduledCouponListing(_newCoupon.fixingDate, abi.encode(_actionId));
+    }
+
+    function _getCouponAdjusted(
+        uint256 _couponID,
+        function(uint256, IBondRead.Coupon memory) internal view returns (uint256, uint8) _calculateRate
+    ) internal view virtual returns (IBondRead.RegisteredCoupon memory registeredCoupon_) {
+        registeredCoupon_ = super._getCoupon(_couponID);
+
+        if (registeredCoupon_.coupon.rateStatus == IBondRead.RateCalculationStatus.SET) return registeredCoupon_;
+
+        if (registeredCoupon_.coupon.fixingDate > _blockTimestamp()) return registeredCoupon_;
+
+        (registeredCoupon_.coupon.rate, registeredCoupon_.coupon.rateDecimals) = _calculateRate(
+            _couponID,
+            registeredCoupon_.coupon
+        );
+        registeredCoupon_.coupon.rateStatus = IBondRead.RateCalculationStatus.SET;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondStorageWrapper.sol
new file mode 100644
index 000000000..c8c18c37a
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondStorageWrapper.sol
@@ -0,0 +1,136 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { IBondRead } from "../../../../../layer_2/interfaces/bond/IBondRead.sol";
+import { IKpi } from "../../../../../layer_2/interfaces/interestRates/kpiLinkedRate/IKpi.sol";
+import { IKpiLinkedRate } from "../../../../../layer_2/interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol";
+import { LowLevelCall } from "../../../../../layer_0/common/libraries/LowLevelCall.sol";
+import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import { DecimalsLib } from "../../../../../layer_0/common/libraries/DecimalsLib.sol";
+import { BondStorageWrapperFixingDateInterestRate } from "../../BondStorageWrapperFixingDateInterestRate.sol";
+
+abstract contract BondStorageWrapperKpiLinkedInterestRate is BondStorageWrapperFixingDateInterestRate {
+    using LowLevelCall for address;
+    using EnumerableSet for EnumerableSet.Bytes32Set;
+
+    error InterestRateIsKpiLinked();
+
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    ) internal virtual override returns (bytes32 corporateActionId_, uint256 couponID_) {
+        _checkCoupon(_newCoupon, InterestRateIsKpiLinked.selector, "");
+
+        return super._setCoupon(_newCoupon);
+    }
+
+    function _addToCouponsOrderedList(uint256 _couponID) internal virtual override {
+        super._addToCouponsOrderedList(_couponID);
+        _setKpiLinkedInterestRate(_couponID);
+    }
+
+    function _setKpiLinkedInterestRate(uint256 _couponID) internal {
+        IBondRead.Coupon memory coupon = _getCoupon(_couponID).coupon;
+
+        (uint256 rate, uint8 rateDecimals) = _calculateKpiLinkedInterestRate(_couponID, coupon);
+
+        _updateCouponRate(_couponID, coupon, rate, rateDecimals);
+    }
+
+    function _getCoupon(
+        uint256 _couponID
+    ) internal view virtual override returns (IBondRead.RegisteredCoupon memory registeredCoupon_) {
+        return _getCouponAdjusted(_couponID, _calculateKpiLinkedInterestRate);
+    }
+
+    function _calculateKpiLinkedInterestRate(
+        uint256 _couponID,
+        IBondRead.Coupon memory _coupon
+    ) internal view returns (uint256 rate_, uint8 rateDecimals) {
+        KpiLinkedRateDataStorage memory kpiLinkedRateStorage = _kpiLinkedRateStorage();
+
+        if (_coupon.fixingDate < kpiLinkedRateStorage.startPeriod) {
+            return (kpiLinkedRateStorage.startRate, kpiLinkedRateStorage.rateDecimals);
+        }
+
+        if (kpiLinkedRateStorage.kpiOracle == address(0)) {
+            return (kpiLinkedRateStorage.baseRate, kpiLinkedRateStorage.rateDecimals);
+        }
+
+        (uint256 impactData, bool reportFound) = abi.decode(
+            kpiLinkedRateStorage.kpiOracle.functionStaticCall(
+                abi.encodeWithSelector(
+                    IKpi.getKpiData.selector,
+                    _coupon.fixingDate - kpiLinkedRateStorage.reportPeriod,
+                    _coupon.fixingDate
+                ),
+                IKpiLinkedRate.KpiOracleCalledFailed.selector
+            ),
+            (uint256, bool)
+        );
+
+        uint256 rate;
+
+        if (!reportFound) {
+            (uint256 previousRate, uint8 previousRateDecimals) = _previousRate(_couponID);
+
+            previousRate = DecimalsLib.calculateDecimalsAdjustment(
+                previousRate,
+                previousRateDecimals,
+                kpiLinkedRateStorage.rateDecimals
+            );
+
+            rate = previousRate + kpiLinkedRateStorage.missedPenalty;
+
+            if (rate > kpiLinkedRateStorage.maxRate) rate = kpiLinkedRateStorage.maxRate;
+
+            return (rate, kpiLinkedRateStorage.rateDecimals);
+        }
+
+        uint256 impactDeltaRate;
+        uint256 factor = 10 ** kpiLinkedRateStorage.adjustmentPrecision;
+
+        if (kpiLinkedRateStorage.baseLine > impactData) {
+            impactDeltaRate =
+                (factor * (kpiLinkedRateStorage.baseLine - impactData)) /
+                (kpiLinkedRateStorage.baseLine - kpiLinkedRateStorage.maxDeviationFloor);
+            if (impactDeltaRate > factor) impactDeltaRate = factor;
+            rate =
+                kpiLinkedRateStorage.baseRate -
+                (((kpiLinkedRateStorage.baseRate - kpiLinkedRateStorage.minRate) * impactDeltaRate) / factor);
+        } else {
+            impactDeltaRate =
+                (factor * (impactData - kpiLinkedRateStorage.baseLine)) /
+                (kpiLinkedRateStorage.maxDeviationCap - kpiLinkedRateStorage.baseLine);
+            if (impactDeltaRate > factor) impactDeltaRate = factor;
+            rate =
+                kpiLinkedRateStorage.baseRate +
+                (((kpiLinkedRateStorage.maxRate - kpiLinkedRateStorage.baseRate) * impactDeltaRate) / factor);
+        }
+
+        return (rate, kpiLinkedRateStorage.rateDecimals);
+    }
+
+    function _previousRate(uint256 _couponID) internal view returns (uint256 rate_, uint8 rateDecimals_) {
+        uint256 orderedListLength = _getCouponsOrderedListTotalAdjusted();
+
+        if (orderedListLength < 2) return (0, 0);
+
+        if (_getCouponFromOrderedListAt(0) == _couponID) return (0, 0);
+
+        orderedListLength--;
+        uint256 previousCouponId;
+
+        for (uint256 index = 0; index < orderedListLength; index++) {
+            previousCouponId = _getCouponFromOrderedListAt(index);
+            uint256 couponId = _getCouponFromOrderedListAt(index + 1);
+            if (couponId == _couponID) break;
+        }
+
+        IBondRead.Coupon memory previousCoupon = _getCoupon(previousCouponId).coupon;
+
+        if (previousCoupon.rateStatus != IBondRead.RateCalculationStatus.SET) {
+            return _calculateKpiLinkedInterestRate(previousCouponId, previousCoupon);
+        }
+        return (previousCoupon.rate, previousCoupon.rateDecimals);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Common.sol b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Common.sol
new file mode 100644
index 000000000..a0bebf2d0
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Common.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BondStorageWrapperKpiLinkedInterestRate } from "./BondStorageWrapper.sol";
+
+// solhint-disable no-empty-blocks
+abstract contract CommonKpiLinkedInterestRate is BondStorageWrapperKpiLinkedInterestRate {}
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/FACETS.md b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/FACETS.md
new file mode 100644
index 000000000..7237bc341
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/FACETS.md
@@ -0,0 +1,29 @@
+# Bond Kpi Linked Interest Rate Custom Facets
+
+- Bond
+- BondRead
+- Adjust Balances
+- Clearing Actions
+- Clearing Hold Creation
+- Clearing Redeem
+- Clearing Transfer
+- ERC1410 Issuer
+- ERC1410 Management
+- ERC1410 Token Holder
+- ERC1594
+- ERC1644
+- ERC20
+- ERC20 Votes
+- ERC3643 Batch
+- ERC3643 Management
+- ERC3643 Operations
+- Freeze
+- Hold Management
+- Hold Token holder
+- Kpi Linked Rate
+- SPT Linked Rate
+- Kpis
+- Lock
+- Scheduled Cross Ordered Tasks
+- Snapshots
+- Transfer And Lock
\ No newline at end of file
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/BondStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/BondStorageWrapper.sol
new file mode 100644
index 000000000..26e94e8f4
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/BondStorageWrapper.sol
@@ -0,0 +1,151 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { IBondRead } from "../../../../../layer_2/interfaces/bond/IBondRead.sol";
+
+import {
+    ISustainabilityPerformanceTargetRate
+} from "../../../../../layer_2/interfaces/interestRates/sustainabilityPerformanceTargetRate/ISustainabilityPerformanceTargetRate.sol";
+import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import { DecimalsLib } from "../../../../../layer_0/common/libraries/DecimalsLib.sol";
+import {KpisStorageWrapper} from "./kpis/KpisStorageWrapper.sol";
+
+abstract contract BondStorageWrapperSustainabilityPerformanceTargetInterestRate is
+    KpisStorageWrapper
+{
+    using EnumerableSet for EnumerableSet.Bytes32Set;
+
+    error InterestRateIsSustainabilityPerformanceTarget();
+
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    ) internal virtual override returns (bytes32 corporateActionId_, uint256 couponID_) {
+        _checkCoupon(_newCoupon, InterestRateIsSustainabilityPerformanceTarget.selector, "");
+
+        return super._setCoupon(_newCoupon);
+    }
+
+    function _addToCouponsOrderedList(uint256 _couponID) internal virtual override {
+        super._addToCouponsOrderedList(_couponID);
+        _setSustainabilityPerformanceTargetInterestRate(_couponID);
+    }
+
+    function _setSustainabilityPerformanceTargetInterestRate(uint256 _couponID) internal {
+        IBondRead.Coupon memory coupon = _getCoupon(_couponID).coupon;
+
+        (uint256 rate, uint8 rateDecimals) = _calculateSustainabilityPerformanceTargetInterestRate(_couponID, coupon);
+
+        _updateCouponRate(_couponID, coupon, rate, rateDecimals);
+    }
+
+    function _getCoupon(
+        uint256 _couponID
+    ) internal view virtual override returns (IBondRead.RegisteredCoupon memory registeredCoupon_) {
+        return _getCouponAdjusted(_couponID, _calculateSustainabilityPerformanceTargetInterestRate);
+    }
+
+    function _calculateSustainabilityPerformanceTargetInterestRate(
+        uint256 /*_couponID*/,
+        IBondRead.Coupon memory /*_coupon*/
+    ) internal view returns (uint256 rate_, uint8 rateDecimals) {
+        return (0, 0);
+        /*SustainabilityPerformanceTargetRateDataStorage
+            memory sustainabilityPerformanceTargetRateStorage = _sustainabilityPerformanceTargetRateStorage();
+
+        if (_coupon.fixingDate < sustainabilityPerformanceTargetRateStorage.startPeriod) {
+            return (
+                sustainabilityPerformanceTargetRateStorage.startRate,
+                sustainabilityPerformanceTargetRateStorage.rateDecimals
+            );
+        }
+
+        if (sustainabilityPerformanceTargetRateStorage.kpiOracle == address(0)) {
+            return (
+                sustainabilityPerformanceTargetRateStorage.baseRate,
+                sustainabilityPerformanceTargetRateStorage.rateDecimals
+            );
+        }
+
+        (uint256 impactData, bool reportFound) = abi.decode(
+            sustainabilityPerformanceTargetRateStorage.kpiOracle.functionStaticCall(
+                abi.encodeWithSelector(
+                    IKpi.getKpiData.selector,
+                    _coupon.fixingDate - sustainabilityPerformanceTargetRateStorage.reportPeriod,
+                    _coupon.fixingDate
+                ),
+                ISustainabilityPerformanceTargetRate.KpiOracleCalledFailed.selector
+            ),
+            (uint256, bool)
+        );
+
+        uint256 rate;
+
+        if (!reportFound) {
+            (uint256 previousRate, uint8 previousRateDecimals) = _previousRate(_couponID);
+
+            previousRate = DecimalsLib.calculateDecimalsAdjustment(
+                previousRate,
+                previousRateDecimals,
+                sustainabilityPerformanceTargetRateStorage.rateDecimals
+            );
+
+            rate = previousRate + sustainabilityPerformanceTargetRateStorage.missedPenalty;
+
+            if (rate > sustainabilityPerformanceTargetRateStorage.maxRate)
+                rate = sustainabilityPerformanceTargetRateStorage.maxRate;
+
+            return (rate, sustainabilityPerformanceTargetRateStorage.rateDecimals);
+        }
+
+        uint256 impactDeltaRate;
+        uint256 factor = 10 ** sustainabilityPerformanceTargetRateStorage.adjustmentPrecision;
+
+        if (sustainabilityPerformanceTargetRateStorage.baseLine > impactData) {
+            impactDeltaRate =
+                (factor * (sustainabilityPerformanceTargetRateStorage.baseLine - impactData)) /
+                (sustainabilityPerformanceTargetRateStorage.baseLine -
+                    sustainabilityPerformanceTargetRateStorage.maxDeviationFloor);
+            if (impactDeltaRate > factor) impactDeltaRate = factor;
+            rate =
+                sustainabilityPerformanceTargetRateStorage.baseRate -
+                (((sustainabilityPerformanceTargetRateStorage.baseRate -
+                    sustainabilityPerformanceTargetRateStorage.minRate) * impactDeltaRate) / factor);
+        } else {
+            impactDeltaRate =
+                (factor * (impactData - sustainabilityPerformanceTargetRateStorage.baseLine)) /
+                (sustainabilityPerformanceTargetRateStorage.maxDeviationCap -
+                    sustainabilityPerformanceTargetRateStorage.baseLine);
+            if (impactDeltaRate > factor) impactDeltaRate = factor;
+            rate =
+                sustainabilityPerformanceTargetRateStorage.baseRate +
+                (((sustainabilityPerformanceTargetRateStorage.maxRate -
+                    sustainabilityPerformanceTargetRateStorage.baseRate) * impactDeltaRate) / factor);
+        }
+
+        return (rate, sustainabilityPerformanceTargetRateStorage.rateDecimals);*/
+    }
+
+    /*function _previousRate(uint256 _couponID) internal view returns (uint256 rate_, uint8 rateDecimals_) {
+        uint256 orderedListLength = _getCouponsOrderedListTotalAdjusted();
+
+        if (orderedListLength < 2) return (0, 0);
+
+        if (_getCouponFromOrderedListAt(0) == _couponID) return (0, 0);
+
+        orderedListLength--;
+        uint256 previousCouponId;
+
+        for (uint256 index = 0; index < orderedListLength; index++) {
+            previousCouponId = _getCouponFromOrderedListAt(index);
+            uint256 couponId = _getCouponFromOrderedListAt(index + 1);
+            if (couponId == _couponID) break;
+        }
+
+        IBondRead.Coupon memory previousCoupon = _getCoupon(previousCouponId).coupon;
+
+        if (previousCoupon.rateStatus != IBondRead.RateCalculationStatus.SET) {
+            return _calculateSustainabilityPerformanceTargetInterestRate(previousCouponId, previousCoupon);
+        }
+        return (previousCoupon.rate, previousCoupon.rateDecimals);
+    }*/
+}
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Common.sol b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Common.sol
new file mode 100644
index 000000000..608a513b7
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Common.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BondStorageWrapperSustainabilityPerformanceTargetInterestRate } from "./BondStorageWrapper.sol";
+
+// solhint-disable no-empty-blocks
+abstract contract CommonSustainabilityPerformanceTargetInterestRate is
+    BondStorageWrapperSustainabilityPerformanceTargetInterestRate
+{}
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/FACETS.md b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/FACETS.md
new file mode 100644
index 000000000..3543e29b0
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/FACETS.md
@@ -0,0 +1,29 @@
+# Bond Kpi SPT Interest Rate Custom Facets
+
+- Bond
+- BondRead
+- Adjust Balances
+- Clearing Actions
+- Clearing Hold Creation
+- Clearing Redeem
+- Clearing Transfer
+- ERC1410 Issuer
+- ERC1410 Management
+- ERC1410 Token Holder
+- ERC1594
+- ERC1644
+- ERC20
+- ERC20 Votes
+- ERC3643 Batch
+- ERC3643 Management
+- ERC3643 Operations
+- Freeze
+- Hold Management
+- Hold Token holder
+- Kpi Linked Rate
+- SPT Linked Rate
+- Kpis
+- Lock
+- Scheduled Cross Ordered Tasks
+- Snapshots
+- Transfer And Lock
\ No newline at end of file
diff --git a/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/kpis/KpisStorageWrapper.sol b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/kpis/KpisStorageWrapper.sol
new file mode 100644
index 000000000..5f2efb538
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/kpis/KpisStorageWrapper.sol
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { _KPIS_STORAGE_POSITION } from "contracts/layer_0/constants/storagePositions.sol";
+import { IKpis } from "../../../../../../layer_2/interfaces/kpis/kpiLatest/IKpis.sol";
+import { CheckpointsLib } from "contracts/layer_0/common/libraries/CheckpointsLib.sol";
+import { IBondRead } from "../../../../../../layer_2/interfaces/bond/IBondRead.sol";
+import { BondStorageWrapperFixingDateInterestRate } from "../../../BondStorageWrapperFixingDateInterestRate.sol";
+
+abstract contract KpisStorageWrapper is BondStorageWrapperFixingDateInterestRate {
+    using CheckpointsLib for CheckpointsLib.Checkpoint[];
+
+    struct KpisDataStorage {
+        mapping(address => CheckpointsLib.Checkpoint[]) checkpointsByProject;
+        mapping(address => mapping(uint256 => bool)) checkpointsDatesByProject;
+        uint256 minDate;
+    }
+
+    modifier isValidDate(uint256 _date, address _project) {
+        if (_date <= _getMinDateAdjusted() || _date > _blockTimestamp()) {
+            revert IKpis.InvalidDate(_date, _getMinDateAdjusted(), _blockTimestamp());
+        }
+        if (_isCheckpointDate(_date, _project)) {
+            revert IKpis.KpiDataAlreadyExists(_date);
+        }
+        _;
+    }
+
+    function _addKpiData(uint256 _date, uint256 _value, address _project) internal {
+        assert(_isCheckpointDate(_date, _project) == false);
+        _setCheckpointDate(_date, _project);
+
+        CheckpointsLib.Checkpoint[] storage ckpt = _kpisDataStorage().checkpointsByProject[_project];
+        uint256 length = ckpt.length;
+
+        if (length == 0 || ckpt[length - 1].from < _date) {
+            _pushKpiData(ckpt, _date, _value);
+            return;
+        }
+
+        _pushKpiData(ckpt, ckpt[length - 1].from, ckpt[length - 1].value);
+
+        for (uint256 index = length - 1; index >= 0; index--) {
+            if (index == 0) {
+                _overwriteKpiData(ckpt, _date, _value, index);
+                break;
+            }
+
+            assert(ckpt[index - 1].from != _date);
+
+            if (ckpt[index - 1].from < _date) {
+                _overwriteKpiData(ckpt, _date, _value, index);
+                break;
+            }
+            _overwriteKpiData(ckpt, ckpt[index - 1].from, ckpt[index - 1].value, index);
+        }
+
+        emit IKpis.KpiDataAdded(_project, _date, _value);
+    }
+
+    function _pushKpiData(CheckpointsLib.Checkpoint[] storage _ckpt, uint256 _date, uint256 _value) internal {
+        _ckpt.push(CheckpointsLib.Checkpoint({ from: _date, value: _value }));
+    }
+
+    function _overwriteKpiData(
+        CheckpointsLib.Checkpoint[] storage _ckpt,
+        uint256 _date,
+        uint256 _value,
+        uint256 _pos
+    ) internal {
+        _ckpt[_pos].from = _date;
+        _ckpt[_pos].value = _value;
+    }
+
+    function _setMinDate(uint256 _date) internal {
+        _kpisDataStorage().minDate = _date;
+    }
+
+    function _setCheckpointDate(uint256 _date, address _project) internal {
+        _kpisDataStorage().checkpointsDatesByProject[_project][_date] = true;
+    }
+
+    function _addToCouponsOrderedList(uint256 _couponID) internal virtual override {
+        super._addToCouponsOrderedList(_couponID);
+
+        uint256 lastFixingDate = _getCoupon(_couponID).coupon.fixingDate;
+
+        if (lastFixingDate > _kpisDataStorage().minDate) _kpisDataStorage().minDate = lastFixingDate;
+    }
+
+    function _getLatestKpiData(
+        uint256 _from,
+        uint256 _to,
+        address _project
+    ) internal view returns (uint256 value_, bool exists_) {
+        (uint256 from, uint256 value) = _kpisDataStorage().checkpointsByProject[_project].checkpointsLookup(_to);
+        if (from <= _from) return (0, false);
+        return (value, true);
+    }
+
+    function _getMinDateAdjusted() internal view returns (uint256 minDate_) {
+        minDate_ = _kpisDataStorage().minDate;
+
+        uint256 total = _getCouponsOrderedListTotalAdjusted();
+
+        if (total == 0) return minDate_;
+
+        uint256 lastFixingDate = _getCoupon(_getCouponFromOrderedListAt(total - 1)).coupon.fixingDate;
+
+        if (lastFixingDate > minDate_) minDate_ = lastFixingDate;
+    }
+
+    function _isCheckpointDate(uint256 _date, address _project) internal view returns (bool) {
+        return _kpisDataStorage().checkpointsDatesByProject[_project][_date];
+    }
+
+    function _kpisDataStorage() internal pure returns (KpisDataStorage storage kpisDataStorage_) {
+        bytes32 position = _KPIS_STORAGE_POSITION;
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            kpisDataStorage_.slot := position
+        }
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Issuer.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Issuer.sol
index 4ad26e856..d56a01207 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Issuer.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Issuer.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { _AGENT_ROLE, _ISSUER_ROLE } from "../../constants/roles.sol";
 import { IERC1410Issuer } from "../../interfaces/ERC1400/IERC1410Issuer.sol";
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import { IssueData } from "../../../layer_1/interfaces/ERC1400/IERC1410.sol";
 
 abstract contract ERC1410Issuer is IERC1410Issuer, Common {
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Management.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Management.sol
index 442506f2d..640c911fb 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Management.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Management.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 import { _CONTROLLER_ROLE, _AGENT_ROLE, _ISSUER_ROLE } from "../../constants/roles.sol";
 import { BasicTransferInfo, OperatorTransferData } from "../../interfaces/ERC1400/IERC1410.sol";
 import { IERC1410Management } from "../../interfaces/ERC1400/IERC1410Management.sol";
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import { IssueData } from "../../../layer_1/interfaces/ERC1400/IERC1410.sol";
 
 abstract contract ERC1410Management is IERC1410Management, Common {
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Read.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Read.sol
index 1c4400744..dfeb6624d 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Read.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410Read.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IERC1410Read } from "../../interfaces/ERC1400/IERC1410Read.sol";
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 
 /**
  * @title ERC1410Read
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410TokenHolder.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410TokenHolder.sol
index 905b8102c..8d620c085 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410TokenHolder.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1410/ERC1410TokenHolder.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { BasicTransferInfo } from "../../interfaces/ERC1400/IERC1410.sol";
 import { IERC1410TokenHolder } from "../../interfaces/ERC1400/IERC1410TokenHolder.sol";
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 
 /**
  * @title ERC1410TokenHolder
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 819d373fa..47c396fea 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1594/ERC1594.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { _ISSUER_ROLE, _AGENT_ROLE } from "../../constants/roles.sol";
 import { IERC1594 } from "../../interfaces/ERC1400/IERC1594.sol";
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import { _DEFAULT_PARTITION } from "../../../layer_0/constants/values.sol";
 
 abstract contract ERC1594 is IERC1594, Common {
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 9512ce951..89aa6a029 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1643/ERC1643.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 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 { Common } from "../../../layer_0/common/Common.sol";
 
 abstract contract ERC1643 is IERC1643, Common {
     function setDocument(
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 f020bcc82..7bac55ef4 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC1644/ERC1644.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { IERC1644 } from "../../interfaces/ERC1400/IERC1644.sol";
 import { _DEFAULT_ADMIN_ROLE, _CONTROLLER_ROLE, _AGENT_ROLE } from "../../constants/roles.sol";
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 
 abstract contract ERC1644 is IERC1644, Common {
     // solhint-disable-next-line func-name-mixedcase
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 11969ac92..29ea988ac 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20/ERC20.sol
@@ -2,7 +2,7 @@
 // Contract copy-pasted form OZ and extended
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import { IERC20 } from "../../interfaces/ERC1400/IERC20.sol";
 import { _DEFAULT_PARTITION } from "../../../layer_0/constants/values.sol";
 
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 b3891166a..3ad12d8e1 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20Permit.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Permit/ERC20Permit.sol
@@ -2,7 +2,7 @@
 // Contract copy-pasted form OZ and extended
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import { IERC20Permit } from "../../interfaces/ERC1400/IERC20Permit.sol";
 import { _CONTRACT_NAME_ERC20PERMIT, _CONTRACT_VERSION_ERC20PERMIT } from "../../constants/values.sol";
 
diff --git a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Votes/ERC20Votes.sol b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Votes/ERC20Votes.sol
index 798051d1e..c21b411eb 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Votes/ERC20Votes.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC1400/ERC20Votes/ERC20Votes.sol
@@ -2,9 +2,10 @@
 // Contract copy-pasted form OZ and extended
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../../common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import { IERC20Votes } from "../../interfaces/ERC1400/IERC20Votes.sol";
 import { _CONTRACT_NAME_ERC20VOTES, _CONTRACT_VERSION_ERC20VOTES } from "../../constants/values.sol";
+import { CheckpointsLib } from "../../../layer_0/common/libraries/CheckpointsLib.sol";
 
 abstract contract ERC20Votes is IERC20Votes, Common {
     // solhint-disable-next-line func-name-mixedcase
@@ -47,7 +48,10 @@ abstract contract ERC20Votes is IERC20Votes, Common {
         return _delegates(_account);
     }
 
-    function checkpoints(address _account, uint256 _pos) external view override returns (Checkpoint memory) {
+    function checkpoints(
+        address _account,
+        uint256 _pos
+    ) external view override returns (CheckpointsLib.Checkpoint memory) {
         return _checkpoints(_account, _pos);
     }
 
diff --git a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643.sol b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643.sol
index 3b56f0b1d..cf623ff0d 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { _AGENT_ROLE, _TREX_OWNER_ROLE } from "../constants/roles.sol";
 import { IERC3643Management } from "../interfaces/ERC3643/IERC3643Management.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract ERC3643Management is IERC3643Management, Common {
     address private constant _ONCHAIN_ID = address(0);
diff --git a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Batch.sol b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Batch.sol
index ae2ab3370..ffb1d88ad 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Batch.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Batch.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { _CONTROLLER_ROLE, _ISSUER_ROLE, _AGENT_ROLE } from "../constants/roles.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { IERC3643Batch } from "../interfaces/ERC3643/IERC3643Batch.sol";
 
 abstract contract ERC3643Batch is IERC3643Batch, Common {
diff --git a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Management.sol b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Management.sol
index 3b56f0b1d..cf623ff0d 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Management.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Management.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { _AGENT_ROLE, _TREX_OWNER_ROLE } from "../constants/roles.sol";
 import { IERC3643Management } from "../interfaces/ERC3643/IERC3643Management.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract ERC3643Management is IERC3643Management, Common {
     address private constant _ONCHAIN_ID = address(0);
diff --git a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Operations.sol b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Operations.sol
index 78f7512d9..cda17b566 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Operations.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Operations.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { _CONTROLLER_ROLE, _ISSUER_ROLE, _AGENT_ROLE } from "../constants/roles.sol";
 import { IERC3643Operations } from "../interfaces/ERC3643/IERC3643Operations.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract ERC3643Operations is IERC3643Operations, Common {
     function burn(
diff --git a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Read.sol b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Read.sol
index 4c6ec6b1b..1853f81e7 100644
--- a/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Read.sol
+++ b/packages/ats/contracts/contracts/layer_1/ERC3643/ERC3643Read.sol
@@ -5,7 +5,7 @@ import { _AGENT_ROLE } from "../constants/roles.sol";
 import { IERC3643Read } from "../interfaces/ERC3643/IERC3643Read.sol";
 import { ICompliance } from "../interfaces/ERC3643/ICompliance.sol";
 import { IIdentityRegistry } from "../interfaces/ERC3643/IIdentityRegistry.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract ERC3643Read is IERC3643Read, Common {
     function isAgent(address _agent) external view returns (bool) {
diff --git a/packages/ats/contracts/contracts/layer_1/accessControl/AccessControl.sol b/packages/ats/contracts/contracts/layer_1/accessControl/AccessControl.sol
index 43836b7e9..14aec0bde 100644
--- a/packages/ats/contracts/contracts/layer_1/accessControl/AccessControl.sol
+++ b/packages/ats/contracts/contracts/layer_1/accessControl/AccessControl.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IAccessControl } from "../interfaces/accessControl/IAccessControl.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract AccessControl is IAccessControl, Common {
     function grantRole(
diff --git a/packages/ats/contracts/contracts/layer_1/cap/Cap.sol b/packages/ats/contracts/contracts/layer_1/cap/Cap.sol
index e3ff7fa45..ad3c9b7f9 100644
--- a/packages/ats/contracts/contracts/layer_1/cap/Cap.sol
+++ b/packages/ats/contracts/contracts/layer_1/cap/Cap.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { ICap } from "../interfaces/cap/ICap.sol";
 import { _CAP_ROLE } from "../constants/roles.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract Cap is ICap, Common {
     // solhint-disable-next-line func-name-mixedcase
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingActions.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingActions.sol
index 192e635ab..9243a1c85 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingActions.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingActions.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/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";
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreation.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreation.sol
index aa760daf9..c6e21fcc2 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreation.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingHoldCreation.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/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";
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingRead.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRead.sol
index 1cc294761..1dcbacee4 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingRead.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRead.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { IClearingRead } from "../interfaces/clearing/IClearingRead.sol";
 
 abstract contract ClearingRead is IClearingRead, Common {
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeem.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeem.sol
index c54b2d468..b44aa1ca9 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeem.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingRedeem.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { IClearingRedeem } from "../interfaces/clearing/IClearingRedeem.sol";
 import { ThirdPartyType } from "../../layer_0/common/types/ThirdPartyType.sol";
 
diff --git a/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransfer.sol b/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransfer.sol
index f7a3c889a..12b5f7407 100644
--- a/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransfer.sol
+++ b/packages/ats/contracts/contracts/layer_1/clearing/ClearingTransfer.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { IClearingTransfer } from "../interfaces/clearing/IClearingTransfer.sol";
 import { ThirdPartyType } from "../../layer_0/common/types/ThirdPartyType.sol";
 
diff --git a/packages/ats/contracts/contracts/layer_1/controlList/ControlList.sol b/packages/ats/contracts/contracts/layer_1/controlList/ControlList.sol
index 85ba5578d..7b1e90d40 100644
--- a/packages/ats/contracts/contracts/layer_1/controlList/ControlList.sol
+++ b/packages/ats/contracts/contracts/layer_1/controlList/ControlList.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IControlList } from "../interfaces/controlList/IControlList.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _CONTROL_LIST_ROLE } from "../constants/roles.sol";
 
 abstract contract ControlList is IControlList, Common {
diff --git a/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActions.sol b/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActions.sol
index 82b2c44ca..1ec2bc7b2 100644
--- a/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActions.sol
+++ b/packages/ats/contracts/contracts/layer_1/corporateActions/CorporateActions.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { ICorporateActions } from "../interfaces/corporateActions/ICorporateActions.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _CORPORATE_ACTION_ROLE } from "../constants/roles.sol";
 
 abstract contract CorporateActions is ICorporateActions, Common {
@@ -14,20 +14,20 @@ abstract contract CorporateActions is ICorporateActions, Common {
         override
         onlyUnpaused
         onlyRole(_CORPORATE_ACTION_ROLE)
-        returns (bool success_, bytes32 corporateActionId_, uint256 corporateActionIndexByType_)
+        returns (bytes32 corporateActionId_, uint256 corporateActionIdByType_)
     {
-        (success_, corporateActionId_, corporateActionIndexByType_) = _addCorporateAction(_actionType, _data);
+        (corporateActionId_, corporateActionIdByType_) = _addCorporateAction(_actionType, _data);
 
-        if (!success_) {
+        if (corporateActionId_ == bytes32(0)) {
             revert DuplicatedCorporateAction(_actionType, _data);
         }
-        emit CorporateActionAdded(_msgSender(), _actionType, corporateActionId_, corporateActionIndexByType_, _data);
+        emit CorporateActionAdded(_msgSender(), _actionType, corporateActionId_, corporateActionIdByType_, _data);
     }
 
     function getCorporateAction(
         bytes32 _corporateActionId
-    ) external view override returns (bytes32 actionType_, bytes memory data_) {
-        (actionType_, data_) = _getCorporateAction(_corporateActionId);
+    ) external view override returns (bytes32 actionType_, uint256 actionTypeId_, bytes memory data_) {
+        (actionType_, actionTypeId_, data_) = _getCorporateAction(_corporateActionId);
     }
 
     function getCorporateActionCount() external view override returns (uint256 corporateActionCount_) {
diff --git a/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagement.sol b/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagement.sol
index 803a67278..2357f70f7 100644
--- a/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/externalControlLists/ExternalControlListManagement.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IExternalControlListManagement } from "../interfaces/externalControlLists/IExternalControlListManagement.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _CONTROL_LIST_MANAGER_ROLE } from "../constants/roles.sol";
 import { _CONTROL_LIST_MANAGEMENT_STORAGE_POSITION } from "../../layer_0/constants/storagePositions.sol";
 
diff --git a/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagement.sol b/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagement.sol
index fe74d8240..fe17ed7b5 100644
--- a/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/externalKycLists/ExternalKycListManagement.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IExternalKycListManagement } from "../interfaces/externalKycLists/IExternalKycListManagement.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _KYC_MANAGER_ROLE } from "../constants/roles.sol";
 import { _KYC_MANAGEMENT_STORAGE_POSITION } from "../../layer_0/constants/storagePositions.sol";
 import { IKyc } from "../interfaces/kyc/IKyc.sol";
diff --git a/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagement.sol b/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagement.sol
index 986a1408a..ceafc92db 100644
--- a/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/externalPauses/ExternalPauseManagement.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IExternalPauseManagement } from "../interfaces/externalPauses/IExternalPauseManagement.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _PAUSE_MANAGER_ROLE } from "../constants/roles.sol";
 import { _PAUSE_MANAGEMENT_STORAGE_POSITION } from "../../layer_0/constants/storagePositions.sol";
 
diff --git a/packages/ats/contracts/contracts/layer_1/freeze/Freeze.sol b/packages/ats/contracts/contracts/layer_1/freeze/Freeze.sol
index a7dbcfd0c..cf2e8cbaf 100644
--- a/packages/ats/contracts/contracts/layer_1/freeze/Freeze.sol
+++ b/packages/ats/contracts/contracts/layer_1/freeze/Freeze.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { IFreeze } from "../interfaces/freeze/IFreeze.sol";
 
 import { _FREEZE_MANAGER_ROLE, _AGENT_ROLE } from "../constants/roles.sol";
diff --git a/packages/ats/contracts/contracts/layer_1/hold/HoldManagement.sol b/packages/ats/contracts/contracts/layer_1/hold/HoldManagement.sol
index ba042c790..ac15c04cd 100644
--- a/packages/ats/contracts/contracts/layer_1/hold/HoldManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/hold/HoldManagement.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 import { _CONTROLLER_ROLE } from "../constants/roles.sol";
 import { Hold, ProtectedHold } from "../interfaces/hold/IHold.sol";
 import { IHoldManagement } from "../interfaces/hold/IHoldManagement.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { ThirdPartyType } from "../../layer_0/common/types/ThirdPartyType.sol";
 
 abstract contract HoldManagement is IHoldManagement, Common {
diff --git a/packages/ats/contracts/contracts/layer_1/hold/HoldRead.sol b/packages/ats/contracts/contracts/layer_1/hold/HoldRead.sol
index dd1659b00..58e767377 100644
--- a/packages/ats/contracts/contracts/layer_1/hold/HoldRead.sol
+++ b/packages/ats/contracts/contracts/layer_1/hold/HoldRead.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 import { HoldIdentifier } from "../interfaces/hold/IHold.sol";
 import { IHoldRead } from "../interfaces/hold/IHoldRead.sol";
 import { ThirdPartyType } from "../../layer_0/common/types/ThirdPartyType.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract HoldRead is IHoldRead, Common {
     function getHeldAmountFor(address _tokenHolder) external view override returns (uint256 amount_) {
diff --git a/packages/ats/contracts/contracts/layer_1/hold/HoldTokenHolder.sol b/packages/ats/contracts/contracts/layer_1/hold/HoldTokenHolder.sol
index f9d563376..14a7a5566 100644
--- a/packages/ats/contracts/contracts/layer_1/hold/HoldTokenHolder.sol
+++ b/packages/ats/contracts/contracts/layer_1/hold/HoldTokenHolder.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { Hold, HoldIdentifier } from "../interfaces/hold/IHold.sol";
 import { IHoldTokenHolder } from "../interfaces/hold/IHoldTokenHolder.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { ThirdPartyType } from "../../layer_0/common/types/ThirdPartyType.sol";
 
 abstract contract HoldTokenHolder is IHoldTokenHolder, Common {
diff --git a/packages/ats/contracts/contracts/layer_1/interfaces/ERC1400/IERC20Votes.sol b/packages/ats/contracts/contracts/layer_1/interfaces/ERC1400/IERC20Votes.sol
index bca8b4627..aa1c423f6 100644
--- a/packages/ats/contracts/contracts/layer_1/interfaces/ERC1400/IERC20Votes.sol
+++ b/packages/ats/contracts/contracts/layer_1/interfaces/ERC1400/IERC20Votes.sol
@@ -4,13 +4,9 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IERC5805 } from "./IERC5805.sol";
+import { CheckpointsLib } from "../../../layer_0/common/libraries/CheckpointsLib.sol";
 
 interface IERC20Votes is IERC5805 {
-    struct Checkpoint {
-        uint256 fromBlock;
-        uint256 votes;
-    }
-
     error AbafChangeForBlockForbidden(uint256 blockNumber);
 
     // solhint-disable-next-line func-name-mixedcase
@@ -18,7 +14,7 @@ interface IERC20Votes is IERC5805 {
 
     function isActivated() external view returns (bool);
 
-    function checkpoints(address _account, uint256 _pos) external view returns (Checkpoint memory);
+    function checkpoints(address _account, uint256 _pos) external view returns (CheckpointsLib.Checkpoint memory);
 
     function numCheckpoints(address _account) external view returns (uint256);
 }
diff --git a/packages/ats/contracts/contracts/layer_1/interfaces/corporateActions/ICorporateActions.sol b/packages/ats/contracts/contracts/layer_1/interfaces/corporateActions/ICorporateActions.sol
index c07034eb4..28410db2c 100644
--- a/packages/ats/contracts/contracts/layer_1/interfaces/corporateActions/ICorporateActions.sol
+++ b/packages/ats/contracts/contracts/layer_1/interfaces/corporateActions/ICorporateActions.sol
@@ -8,14 +8,14 @@ interface ICorporateActions {
      * @param operator The caller of the function that emitted the event
      * @param actionType The corporate action's action type (used for classification)
      * @param corporateActionId The corporate action's unique Id
-     * @param corporateActionIndexByType The corporate action's index for its action type
+     * @param corporateActionIdByType The corporate action's id for its action type
      * @param data The corporate action's data (defining the corporate aciton itself)
      */
     event CorporateActionAdded(
         address indexed operator,
         bytes32 indexed actionType,
         bytes32 indexed corporateActionId,
-        uint256 corporateActionIndexByType,
+        uint256 corporateActionIdByType,
         bytes data
     );
 
@@ -24,18 +24,19 @@ interface ICorporateActions {
     function addCorporateAction(
         bytes32 _actionType,
         bytes memory _data
-    ) external returns (bool success_, bytes32 corporateActionId_, uint256 corporateActionIndexByType_);
+    ) external returns (bytes32 corporateActionId_, uint256 corporateActionIdByType_);
 
     /**
      * @dev Returns a corporate action info
      *
      * @param _corporateActionId The corporate action unique Id
      * @return actionType_ the corproate action type
+     * @return actionTypeIndex_ the corproate action type index
      * @return data_ the corproate action related data (body and anything else)
      */
     function getCorporateAction(
         bytes32 _corporateActionId
-    ) external view returns (bytes32 actionType_, bytes memory data_);
+    ) external view returns (bytes32 actionType_, uint256 actionTypeIndex_, bytes memory data_);
 
     /**
      * @dev Returns the number of corporate actions the token currently has
diff --git a/packages/ats/contracts/contracts/layer_1/interfaces/corporateActions/ICorporateActionsStorageWrapper.sol b/packages/ats/contracts/contracts/layer_1/interfaces/corporateActions/ICorporateActionsStorageWrapper.sol
index aa689f38d..0b8ebbbf3 100644
--- a/packages/ats/contracts/contracts/layer_1/interfaces/corporateActions/ICorporateActionsStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_1/interfaces/corporateActions/ICorporateActionsStorageWrapper.sol
@@ -7,12 +7,13 @@ struct ActionData {
     bytes32 actionType;
     bytes data;
     bytes[] results;
+    uint256 actionIdByType;
 }
 
 struct CorporateActionDataStorage {
     EnumerableSet.Bytes32Set actions;
     mapping(bytes32 => ActionData) actionsData;
-    mapping(bytes32 => EnumerableSet.Bytes32Set) actionsByType;
+    mapping(bytes32 => bytes32[]) actionsByType;
 }
 
 interface ICorporateActionsStorageWrapper {
diff --git a/packages/ats/contracts/contracts/layer_1/kyc/Kyc.sol b/packages/ats/contracts/contracts/layer_1/kyc/Kyc.sol
index 966d4d063..2014571ec 100644
--- a/packages/ats/contracts/contracts/layer_1/kyc/Kyc.sol
+++ b/packages/ats/contracts/contracts/layer_1/kyc/Kyc.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { _KYC_ROLE, _INTERNAL_KYC_MANAGER_ROLE } from "../constants/roles.sol";
 import { IKyc } from "../interfaces/kyc/IKyc.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract Kyc is IKyc, Common {
     function initializeInternalKyc(bool _internalKycActivated) external onlyUninitialized(_kycStorage().initialized) {
diff --git a/packages/ats/contracts/contracts/layer_1/lock/Lock.sol b/packages/ats/contracts/contracts/layer_1/lock/Lock.sol
index b016bb5b5..8b04e8788 100644
--- a/packages/ats/contracts/contracts/layer_1/lock/Lock.sol
+++ b/packages/ats/contracts/contracts/layer_1/lock/Lock.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 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 { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract Lock is ILock, Common {
     // Functions
diff --git a/packages/ats/contracts/contracts/layer_1/pause/Pause.sol b/packages/ats/contracts/contracts/layer_1/pause/Pause.sol
index d2212a116..2c0966e4d 100644
--- a/packages/ats/contracts/contracts/layer_1/pause/Pause.sol
+++ b/packages/ats/contracts/contracts/layer_1/pause/Pause.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { IPause } from "../interfaces/pause/IPause.sol";
 import { _PAUSER_ROLE } from "../constants/roles.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract Pause is IPause, Common {
     function pause() external override onlyRole(_PAUSER_ROLE) onlyUnpaused returns (bool success_) {
diff --git a/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitions.sol b/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitions.sol
index fa9555dfa..9e402fdcc 100644
--- a/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitions.sol
+++ b/packages/ats/contracts/contracts/layer_1/protectedPartitions/ProtectedPartitions.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { IProtectedPartitions } from "../interfaces/protectedPartitions/IProtectedPartitions.sol";
 import { _CONTRACT_NAME_PROTECTEDPARTITIONS, _CONTRACT_VERSION_PROTECTEDPARTITIONS } from "../constants/values.sol";
 import { _PROTECTED_PARTITIONS_ROLE } from "../constants/roles.sol";
diff --git a/packages/ats/contracts/contracts/layer_1/snapshots/Snapshots.sol b/packages/ats/contracts/contracts/layer_1/snapshots/Snapshots.sol
index ed424ff0c..5b3c7d93d 100644
--- a/packages/ats/contracts/contracts/layer_1/snapshots/Snapshots.sol
+++ b/packages/ats/contracts/contracts/layer_1/snapshots/Snapshots.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { ISnapshots } from "../interfaces/snapshots/ISnapshots.sol";
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _SNAPSHOT_ROLE } from "../constants/roles.sol";
 
 abstract contract Snapshots is ISnapshots, Common {
diff --git a/packages/ats/contracts/contracts/layer_1/ssi/SsiManagement.sol b/packages/ats/contracts/contracts/layer_1/ssi/SsiManagement.sol
index 5e90cd1c4..17156875c 100644
--- a/packages/ats/contracts/contracts/layer_1/ssi/SsiManagement.sol
+++ b/packages/ats/contracts/contracts/layer_1/ssi/SsiManagement.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _SSI_MANAGER_ROLE } from "../constants/roles.sol";
 import { ISsiManagement } from "../interfaces/ssi/ISsiManagement.sol";
 
diff --git a/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalances.sol b/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalances.sol
index 1ed1c5829..ed6078a48 100644
--- a/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalances.sol
+++ b/packages/ats/contracts/contracts/layer_2/adjustBalances/AdjustBalances.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 import { IAdjustBalances } from "../interfaces/adjustBalances/IAdjustBalances.sol";
-import { Common } from "../../layer_1/common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _ADJUSTMENT_BALANCE_ROLE } from "../constants/roles.sol";
 
 abstract contract AdjustBalances is IAdjustBalances, Common {
diff --git a/packages/ats/contracts/contracts/layer_2/bond/Bond.sol b/packages/ats/contracts/contracts/layer_2/bond/Bond.sol
index 18021de95..0f6e2fa4a 100644
--- a/packages/ats/contracts/contracts/layer_2/bond/Bond.sol
+++ b/packages/ats/contracts/contracts/layer_2/bond/Bond.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 import { IBond } from "../interfaces/bond/IBond.sol";
 import { IBondRead } from "../interfaces/bond/IBondRead.sol";
 import { IKyc } from "../../layer_1/interfaces/kyc/IKyc.sol";
-import { Common } from "../../layer_1/common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _CORPORATE_ACTION_ROLE, _BOND_MANAGER_ROLE, _MATURITY_REDEEMER_ROLE } from "../../layer_1/constants/roles.sol";
 
 abstract contract Bond is IBond, Common {
@@ -59,22 +59,15 @@ abstract contract Bond is IBond, Common {
         override
         onlyUnpaused
         onlyRole(_CORPORATE_ACTION_ROLE)
+        validateDates(_newCoupon.startDate, _newCoupon.endDate)
         validateDates(_newCoupon.recordDate, _newCoupon.executionDate)
+        validateDates(_newCoupon.fixingDate, _newCoupon.executionDate)
         onlyValidTimestamp(_newCoupon.recordDate)
-        returns (bool success_, uint256 couponID_)
+        onlyValidTimestamp(_newCoupon.fixingDate)
+        returns (uint256 couponID_)
     {
         bytes32 corporateActionID;
-        (success_, corporateActionID, couponID_) = _setCoupon(_newCoupon);
-        emit CouponSet(
-            corporateActionID,
-            couponID_,
-            _msgSender(),
-            _newCoupon.recordDate,
-            _newCoupon.executionDate,
-            _newCoupon.rate,
-            _newCoupon.rateDecimals,
-            _newCoupon.period
-        );
+        (corporateActionID, couponID_) = _setCoupon(_newCoupon);
     }
 
     function updateMaturityDate(
@@ -91,17 +84,4 @@ abstract contract Bond is IBond, Common {
         success_ = _setMaturityDate(_newMaturityDate);
         return success_;
     }
-
-    // solhint-disable-next-line func-name-mixedcase
-    function _initialize_bond(
-        IBondRead.BondDetailsData calldata _bondDetailsData
-    )
-        internal
-        validateDates(_bondDetailsData.startingDate, _bondDetailsData.maturityDate)
-        onlyValidTimestamp(_bondDetailsData.startingDate)
-    {
-        BondDataStorage storage bondStorage = _bondStorage();
-        bondStorage.initialized = true;
-        _storeBondDetails(_bondDetailsData);
-    }
 }
diff --git a/packages/ats/contracts/contracts/layer_2/bond/BondRead.sol b/packages/ats/contracts/contracts/layer_2/bond/BondRead.sol
index 149c1f7cf..4682fb842 100644
--- a/packages/ats/contracts/contracts/layer_2/bond/BondRead.sol
+++ b/packages/ats/contracts/contracts/layer_2/bond/BondRead.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IBondRead } from "../interfaces/bond/IBondRead.sol";
-import { Common } from "../../layer_1/common/Common.sol";
-import { COUPON_CORPORATE_ACTION_TYPE } from "../constants/values.sol";
+import { Common } from "../../layer_0/common/Common.sol";
+import { COUPON_CORPORATE_ACTION_TYPE } from "../../layer_0/constants/values.sol";
 import { IStaticFunctionSelectors } from "../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol";
 
 abstract contract BondRead is IBondRead, IStaticFunctionSelectors, Common {
@@ -68,4 +68,19 @@ abstract contract BondRead is IBondRead, IStaticFunctionSelectors, Common {
     function getTotalCouponHolders(uint256 _couponID) external view returns (uint256) {
         return _getTotalCouponHolders(_couponID);
     }
+
+    function getCouponFromOrderedListAt(uint256 _pos) external view returns (uint256 couponID_) {
+        return _getCouponFromOrderedListAt(_pos);
+    }
+
+    function getCouponsOrderedList(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (uint256[] memory couponIDs_) {
+        return _getCouponsOrderedList(_pageIndex, _pageLength);
+    }
+
+    function getCouponsOrderedListTotal() external view returns (uint256 total_) {
+        return _getCouponsOrderedListTotalAdjusted();
+    }
 }
diff --git a/packages/ats/contracts/contracts/layer_2/bond/fixedInterestRate/Bond.sol b/packages/ats/contracts/contracts/layer_2/bond/fixedInterestRate/Bond.sol
new file mode 100644
index 000000000..b72d867ff
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/bond/fixedInterestRate/Bond.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { Bond } from "../Bond.sol";
+import { CommonFixedInterestRate } from "../../../layer_0_extensions/bond/fixedInterestRate/Common.sol";
+import { IBondRead } from "../../interfaces/bond/IBondRead.sol";
+import { BondStorageWrapper } from "../../../layer_0/bond/BondStorageWrapper.sol";
+import { BondStorageWrapperFixedInterestRate } from "../../../layer_0_extensions/bond/fixedInterestRate/BondStorageWrapper.sol";
+
+abstract contract BondFixedInterestRate is Bond, CommonFixedInterestRate {
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    )
+        internal
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperFixedInterestRate)
+        returns (bytes32 corporateActionId_, uint256 couponID_)
+    {
+        return BondStorageWrapperFixedInterestRate._setCoupon(_newCoupon);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Bond.sol b/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Bond.sol
new file mode 100644
index 000000000..5ee3bf6b9
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Bond.sol
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { Bond } from "../../../Bond.sol";
+import { CommonKpiLinkedInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Common.sol";
+import { IBondRead } from "../../../../interfaces/bond/IBondRead.sol";
+import { BondStorageWrapper } from "../../../../../layer_0/bond/BondStorageWrapper.sol";
+import { BondStorageWrapperKpiLinkedInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondStorageWrapper.sol";
+import { BondStorageWrapperFixingDateInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/BondStorageWrapperFixingDateInterestRate.sol";
+
+
+abstract contract BondKpiLinkedInterestRate is Bond, CommonKpiLinkedInterestRate {
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    )
+        internal
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperKpiLinkedInterestRate)
+        returns (bytes32 corporateActionId_, uint256 couponID_)
+    {
+        return BondStorageWrapperKpiLinkedInterestRate._setCoupon(_newCoupon);
+    }
+
+    function _initCoupon(
+        bytes32 _actionId,
+        IBondRead.Coupon memory _newCoupon
+    ) internal virtual override(BondStorageWrapper, BondStorageWrapperFixingDateInterestRate) {
+        BondStorageWrapperFixingDateInterestRate._initCoupon(_actionId, _newCoupon);
+    }
+    function _addToCouponsOrderedList(
+        uint256 _couponID
+    ) internal virtual override(BondStorageWrapper, BondStorageWrapperKpiLinkedInterestRate) {
+        BondStorageWrapperKpiLinkedInterestRate._addToCouponsOrderedList(_couponID);
+    }
+
+    function _getCoupon(
+        uint256 _couponID
+    )
+        internal
+        view
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperKpiLinkedInterestRate)
+        returns (IBondRead.RegisteredCoupon memory registeredCoupon_)
+    {
+        return BondStorageWrapperKpiLinkedInterestRate._getCoupon(_couponID);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondRead.sol b/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondRead.sol
new file mode 100644
index 000000000..88e0f3c94
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondRead.sol
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BondRead } from "../../../BondRead.sol";
+import { CommonKpiLinkedInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Common.sol";
+import { IBondRead } from "../../../../interfaces/bond/IBondRead.sol";
+import { BondStorageWrapper } from "../../../../../layer_0/bond/BondStorageWrapper.sol";
+import { BondStorageWrapperKpiLinkedInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondStorageWrapper.sol";
+import { BondStorageWrapperFixingDateInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/BondStorageWrapperFixingDateInterestRate.sol";
+
+abstract contract BondReadKpiLinkedInterestRate is BondRead, CommonKpiLinkedInterestRate {
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    )
+        internal
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperKpiLinkedInterestRate)
+        returns (bytes32 corporateActionId_, uint256 couponID_)
+    {
+        return BondStorageWrapperKpiLinkedInterestRate._setCoupon(_newCoupon);
+    }
+
+    function _initCoupon(
+        bytes32 _actionId,
+        IBondRead.Coupon memory _newCoupon
+    ) internal virtual override(BondStorageWrapper, BondStorageWrapperFixingDateInterestRate) {
+        BondStorageWrapperFixingDateInterestRate._initCoupon(_actionId, _newCoupon);
+    }
+    function _addToCouponsOrderedList(
+        uint256 _couponID
+    ) internal virtual override(BondStorageWrapper, BondStorageWrapperKpiLinkedInterestRate) {
+        BondStorageWrapperKpiLinkedInterestRate._addToCouponsOrderedList(_couponID);
+    }
+
+    function _getCoupon(
+        uint256 _couponID
+    )
+        internal
+        view
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperKpiLinkedInterestRate)
+        returns (IBondRead.RegisteredCoupon memory registeredCoupon_)
+    {
+        return BondStorageWrapperKpiLinkedInterestRate._getCoupon(_couponID);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Bond.sol b/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Bond.sol
new file mode 100644
index 000000000..0e22c1394
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Bond.sol
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { Bond } from "../../../Bond.sol";
+import { CommonSustainabilityPerformanceTargetInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Common.sol";
+import { IBondRead } from "../../../../interfaces/bond/IBondRead.sol";
+import { BondStorageWrapper } from "contracts/layer_0/bond/BondStorageWrapper.sol";
+import {
+    BondStorageWrapperSustainabilityPerformanceTargetInterestRate
+} from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/BondStorageWrapper.sol";
+import { KpisStorageWrapper } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/kpis/KpisStorageWrapper.sol";
+import { BondStorageWrapperFixingDateInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/BondStorageWrapperFixingDateInterestRate.sol";
+
+abstract contract BondSustainabilityPerformanceTargetInterestRate is
+    Bond,
+    CommonSustainabilityPerformanceTargetInterestRate
+{
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    )
+        internal
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperSustainabilityPerformanceTargetInterestRate)
+        returns (bytes32 corporateActionId_, uint256 couponID_)
+    {
+        return BondStorageWrapperSustainabilityPerformanceTargetInterestRate._setCoupon(_newCoupon);
+    }
+
+    function _initCoupon(
+        bytes32 _actionId,
+        IBondRead.Coupon memory _newCoupon
+    ) internal virtual override(BondStorageWrapper, BondStorageWrapperFixingDateInterestRate) {
+        BondStorageWrapperFixingDateInterestRate._initCoupon(_actionId, _newCoupon);
+    }
+    function _addToCouponsOrderedList(
+        uint256 _couponID
+    ) internal virtual override(BondStorageWrapper, BondStorageWrapperSustainabilityPerformanceTargetInterestRate) {
+        BondStorageWrapperSustainabilityPerformanceTargetInterestRate._addToCouponsOrderedList(_couponID);
+    }
+
+    function _getCoupon(
+        uint256 _couponID
+    )
+        internal
+        view
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperSustainabilityPerformanceTargetInterestRate)
+        returns (IBondRead.RegisteredCoupon memory registeredCoupon_)
+    {
+        return BondStorageWrapperSustainabilityPerformanceTargetInterestRate._getCoupon(_couponID);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/BondRead.sol b/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/BondRead.sol
new file mode 100644
index 000000000..daf1c65db
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/BondRead.sol
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BondRead } from "../../../BondRead.sol";
+import { CommonSustainabilityPerformanceTargetInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Common.sol";
+import { IBondRead } from "../../../../interfaces/bond/IBondRead.sol";
+import { BondStorageWrapper } from "../../../../../layer_0/bond/BondStorageWrapper.sol";
+import {
+    BondStorageWrapperSustainabilityPerformanceTargetInterestRate
+} from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/BondStorageWrapper.sol";
+import { BondStorageWrapperFixingDateInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/BondStorageWrapperFixingDateInterestRate.sol";
+import { KpisStorageWrapper } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/kpis/KpisStorageWrapper.sol";
+
+abstract contract BondReadSustainabilityPerformanceTargetInterestRate is
+    BondRead,
+    CommonSustainabilityPerformanceTargetInterestRate
+{
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    )
+        internal
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperSustainabilityPerformanceTargetInterestRate)
+        returns (bytes32 corporateActionId_, uint256 couponID_)
+    {
+        return BondStorageWrapperSustainabilityPerformanceTargetInterestRate._setCoupon(_newCoupon);
+    }
+
+    function _initCoupon(
+        bytes32 _actionId,
+        IBondRead.Coupon memory _newCoupon
+    ) internal virtual override(BondStorageWrapper, BondStorageWrapperFixingDateInterestRate) {
+        BondStorageWrapperFixingDateInterestRate._initCoupon(_actionId, _newCoupon);
+    }
+    function _addToCouponsOrderedList(
+        uint256 _couponID
+    ) internal virtual override(BondStorageWrapper, BondStorageWrapperSustainabilityPerformanceTargetInterestRate) {
+        BondStorageWrapperSustainabilityPerformanceTargetInterestRate._addToCouponsOrderedList(_couponID);
+    }
+
+    function _getCoupon(
+        uint256 _couponID
+    )
+        internal
+        view
+        virtual
+        override(BondStorageWrapper, BondStorageWrapperSustainabilityPerformanceTargetInterestRate)
+        returns (IBondRead.RegisteredCoupon memory registeredCoupon_)
+    {
+        return BondStorageWrapperSustainabilityPerformanceTargetInterestRate._getCoupon(_couponID);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/constants/resolverKeys.sol b/packages/ats/contracts/contracts/layer_2/constants/resolverKeys.sol
index 6a924dacf..2c7ebb4b0 100644
--- a/packages/ats/contracts/contracts/layer_2/constants/resolverKeys.sol
+++ b/packages/ats/contracts/contracts/layer_2/constants/resolverKeys.sol
@@ -6,18 +6,30 @@ pragma solidity >=0.8.0 <0.9.0;
 // keccak256('security.token.standard.equity.resolverKey');
 bytes32 constant _EQUITY_RESOLVER_KEY = 0xfe85fe0513f5a5676011f59495ae16b2b93c981c190e99e61903e5603542c810;
 
-// keccak256('security.token.standard.bond.resolverKey');
-bytes32 constant _BOND_RESOLVER_KEY = 0x09c1d80a160a7250b5fabc46d06a7fa4067e6d7292047c5024584b43f17d55ef;
+// keccak256('security.token.standard.bond.variable.rate.resolverKey');
+bytes32 constant _BOND_VARIABLE_RATE_RESOLVER_KEY = 0xe6594ee8f54f346ab25268fdc7955031a6b06102355e1446353d89ab1d593de3;
+
+// keccak256('security.token.standard.bond.fixed.rate.resolverKey');
+bytes32 constant _BOND_FIXED_RATE_RESOLVER_KEY = 0xd55d8787d23b78e70dada1ade45b8758f5c027e2cddf3556606c07d388ce159a;
+
+// keccak256('security.token.standard.bond.kpilinked.rate.resolverKey');
+bytes32 constant _BOND_KPI_LINKED_RATE_RESOLVER_KEY = 0x99c145ff21354eb7b25cb096873143fa3d3aba98457b96bcd13f1d1f2b9bf28c;
 
 // keccak256('security.token.standard.bond.read.resolverKey');
 bytes32 constant _BOND_READ_RESOLVER_KEY = 0xe7ca0b805514da05524faf33d2d9d9432bf1dfa53096073a7267041cfdfb6d68;
 
+// keccak256('security.token.standard.bond.kpilinked.read.resolverKey');
+bytes32 constant _BOND_KPI_LINKED_READ_RESOLVER_KEY = 0xcced91a2a03bf45bd62730a7f4703ee2d762f8ebccff315c7145258265f73249;
+
 // keccak256('security.token.standard.scheduled.snapshots.resolverKey');
 bytes32 constant _SCHEDULED_SNAPSHOTS_RESOLVER_KEY = 0x100f681e33d02a1124c2c05a537a1229eca89767c5e6e8720066ca74bfb85793;
 
 // keccak256('security.token.standard.scheduled.balanceAdjustments.resolverKey');
 bytes32 constant _SCHEDULED_BALANCE_ADJUSTMENTS_RESOLVER_KEY = 0xc418e67a48260d700e5f85863ad6fa6593206a4385728f8baba1572d631535e0;
 
+// keccak256('security.token.standard.scheduled.couponListing.resolverKey');
+bytes32 constant _SCHEDULED_COUPON_LISTING_RESOLVER_KEY = 0x6cc7645ae5bcd122875ce8bd150bd28dda6374546c4c2421e5ae4fdeedb3ab30;
+
 // keccak256('security.token.standard.scheduled.tasks.resolverKey');
 bytes32 constant _SCHEDULED_TASKS_RESOLVER_KEY = 0xa4934195ab83f1497ce5fc99b68d0f41694716bcfba5f232aa6c8e0d4d504f08;
 
@@ -26,3 +38,15 @@ bytes32 constant _BALANCE_ADJUSTMENTS_RESOLVER_KEY = 0x2bbe9fb018f1e7dd12b444215
 
 // keccak256('security.token.standard.proceedRecipients.resolverKey');
 bytes32 constant _PROCEED_RECIPIENTS_RESOLVER_KEY = 0x87f4b676bf89cd24a01a78fd8e7fb2102c2f6d034be73d16402f7297e0ae625b;
+
+// keccak256('security.token.standard.fixedRate.resolverKey');
+bytes32 constant _FIXED_RATE_RESOLVER_KEY = 0x2871e1c37f7423765d88b16528db7e80ad8e2bae5ab5d55e26659840c1d6b504;
+
+// keccak256('security.token.standard.kpiLinkedRate.resolverKey');
+bytes32 constant _KPI_LINKED_RATE_RESOLVER_KEY = 0x92999bd0329d03e46274ce7743ebe0060df95286df4fa7b354937b7d21757d22;
+
+// keccak256('security.token.standard.sustainabilityPerformanceTargetRate.resolverKey');
+bytes32 constant _SUSTAINABILITY_PERFORMANCE_TARGET_RATE_RESOLVER_KEY = 0xa261a7434029a925924f47ccea7fbe12af1e56efd74e8f1d8ac23bec19a27e49;
+
+// keccak256('security.token.standard.kpis.resolverKey');
+bytes32 constant _KPIS_RESOLVER_KEY = 0xb228c36d89348606afcfbad286f8eddb0d0cdd727eefd0f0fd87f17ea0793051;
diff --git a/packages/ats/contracts/contracts/layer_2/constants/roles.sol b/packages/ats/contracts/contracts/layer_2/constants/roles.sol
index 2cd2c9c57..b95d85c2d 100644
--- a/packages/ats/contracts/contracts/layer_2/constants/roles.sol
+++ b/packages/ats/contracts/contracts/layer_2/constants/roles.sol
@@ -8,3 +8,9 @@ bytes32 constant _ADJUSTMENT_BALANCE_ROLE = 0x6d0d63b623e69df3a6ea8aebd01f360a02
 
 // keccak256('security.token.standard.role.proceedRecipient');
 bytes32 constant _PROCEED_RECIPIENT_MANAGER_ROLE = 0xebc53fe99fea28c7aa9476a714959af5b931f34a8a8734365ec63113198d512f;
+
+// keccak256('security.token.standard.role.interestRateManager');
+bytes32 constant _INTEREST_RATE_MANAGER_ROLE = 0xa174f099c94c902831d8b8a07810700505da86a76ea0bcb7629884ef26cf682e;
+
+// keccak256('security.token.standard.role.kpiManager');
+bytes32 constant _KPI_MANAGER_ROLE = 0x441e549cc2c88d01fa80bd9e7b40412d3106214149223501aa25d4fa23bf306d;
diff --git a/packages/ats/contracts/contracts/layer_2/constants/storagePositions.sol b/packages/ats/contracts/contracts/layer_2/constants/storagePositions.sol
index 984952a90..9faf181aa 100644
--- a/packages/ats/contracts/contracts/layer_2/constants/storagePositions.sol
+++ b/packages/ats/contracts/contracts/layer_2/constants/storagePositions.sol
@@ -23,3 +23,12 @@ bytes32 constant _ERC20_STORAGE_POSITION = 0xd9e01023f6efb8d6fd07b486ce7d576973b
 
 // keccak256('security.token.standard.snapshot.2.storage');
 bytes32 constant _SNAPSHOT_2_STORAGE_POSITION = 0x7fa31c0dfd7893e990d22efcc9d48c475631ab02fa1ab34086c54e7f6d9d9b10;
+
+// keccak256('security.token.standard.fixed.rate.storage');
+bytes32 constant _FIXED_RATE_STORAGE_POSITION = 0x15c219561d57f111c36d547315cfca3a61aa37154b27a2b98e8991c6b8b15a34;
+
+// keccak256('security.token.standard.kpiLinked.rate.storage');
+bytes32 constant _KPI_LINKED_RATE_STORAGE_POSITION = 0x3004b60ac76f4502c30ee18a6db5845c0ce175b00881a07640a1fd25d9506785;
+
+// keccak256('security.token.standard.sustainabilityPerformanceTarget.rate.storage');
+bytes32 constant _SUSTAINABILITY_PERFORMANCE_TARGET_RATE_STORAGE_POSITION = 0x93dfece0e867ca7a953a76c2874bb7238395e73f4592fa6a72639df7d5350c09;
diff --git a/packages/ats/contracts/contracts/layer_2/equity/Equity.sol b/packages/ats/contracts/contracts/layer_2/equity/Equity.sol
index 07d46deb8..5da680660 100644
--- a/packages/ats/contracts/contracts/layer_2/equity/Equity.sol
+++ b/packages/ats/contracts/contracts/layer_2/equity/Equity.sol
@@ -6,9 +6,9 @@ import {
     DIVIDEND_CORPORATE_ACTION_TYPE,
     VOTING_RIGHTS_CORPORATE_ACTION_TYPE,
     BALANCE_ADJUSTMENT_CORPORATE_ACTION_TYPE
-} from "../constants/values.sol";
+} from "../../layer_0/constants/values.sol";
 import { IEquity } from "../interfaces/equity/IEquity.sol";
-import { Common } from "../../layer_1/common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 abstract contract Equity is IEquity, Common {
@@ -23,10 +23,10 @@ abstract contract Equity is IEquity, Common {
         onlyRole(_CORPORATE_ACTION_ROLE)
         validateDates(_newDividend.recordDate, _newDividend.executionDate)
         onlyValidTimestamp(_newDividend.recordDate)
-        returns (bool success_, uint256 dividendID_)
+        returns (uint256 dividendID_)
     {
         bytes32 corporateActionID;
-        (success_, corporateActionID, dividendID_) = _setDividends(_newDividend);
+        (corporateActionID, dividendID_) = _setDividends(_newDividend);
         emit DividendSet(
             corporateActionID,
             dividendID_,
@@ -46,10 +46,10 @@ abstract contract Equity is IEquity, Common {
         onlyUnpaused
         onlyRole(_CORPORATE_ACTION_ROLE)
         onlyValidTimestamp(_newVoting.recordDate)
-        returns (bool success_, uint256 voteID_)
+        returns (uint256 voteID_)
     {
         bytes32 corporateActionID;
-        (success_, corporateActionID, voteID_) = _setVoting(_newVoting);
+        (corporateActionID, voteID_) = _setVoting(_newVoting);
         emit VotingSet(corporateActionID, voteID_, _msgSender(), _newVoting.recordDate, _newVoting.data);
     }
 
@@ -62,10 +62,10 @@ abstract contract Equity is IEquity, Common {
         onlyRole(_CORPORATE_ACTION_ROLE)
         onlyValidTimestamp(_newBalanceAdjustment.executionDate)
         validateFactor(_newBalanceAdjustment.factor)
-        returns (bool success_, uint256 balanceAdjustmentID_)
+        returns (uint256 balanceAdjustmentID_)
     {
         bytes32 corporateActionID;
-        (success_, corporateActionID, balanceAdjustmentID_) = _setScheduledBalanceAdjustment(_newBalanceAdjustment);
+        (corporateActionID, balanceAdjustmentID_) = _setScheduledBalanceAdjustment(_newBalanceAdjustment);
         emit ScheduledBalanceAdjustmentSet(
             corporateActionID,
             balanceAdjustmentID_,
diff --git a/packages/ats/contracts/contracts/layer_2/interestRates/fixedRate/FixedRate.sol b/packages/ats/contracts/contracts/layer_2/interestRates/fixedRate/FixedRate.sol
new file mode 100644
index 000000000..e79b7818a
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interestRates/fixedRate/FixedRate.sol
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { CommonFixedInterestRate } from "../../../layer_0_extensions/bond/fixedInterestRate/Common.sol";
+import { IFixedRate } from "../../interfaces/interestRates/fixedRate/IFixedRate.sol";
+import { _INTEREST_RATE_MANAGER_ROLE } from "../../constants/roles.sol";
+
+contract FixedRate is IFixedRate, CommonFixedInterestRate {
+    // solhint-disable-next-line func-name-mixedcase
+    function initialize_FixedRate(
+        FixedRateData calldata _initData
+    ) external override onlyUninitialized(_fixedRateStorage().initialized) {
+        _setRate(_initData.rate, _initData.rateDecimals);
+        _fixedRateStorage().initialized = true;
+    }
+
+    function setRate(
+        uint256 _newRate,
+        uint8 _newRateDecimals
+    ) external override onlyRole(_INTEREST_RATE_MANAGER_ROLE) onlyUnpaused {
+        _setRate(_newRate, _newRateDecimals);
+        emit RateUpdated(_msgSender(), _newRate, _newRateDecimals);
+    }
+
+    function getRate() external view override returns (uint256 rate_, uint8 decimals_) {
+        return _getRate();
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interestRates/fixedRate/FixedRateFacet.sol b/packages/ats/contracts/contracts/layer_2/interestRates/fixedRate/FixedRateFacet.sol
new file mode 100644
index 000000000..f58510902
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interestRates/fixedRate/FixedRateFacet.sol
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+import { IFixedRate } from "../../interfaces/interestRates/fixedRate/IFixedRate.sol";
+import { _FIXED_RATE_RESOLVER_KEY } from "../../constants/resolverKeys.sol";
+import { IStaticFunctionSelectors } from "../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol";
+import { FixedRate } from "./FixedRate.sol";
+
+contract FixedRateFacet is FixedRate, IStaticFunctionSelectors {
+    function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
+        staticResolverKey_ = _FIXED_RATE_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](3);
+        staticFunctionSelectors_[selectorIndex++] = this.initialize_FixedRate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setRate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getRate.selector;
+    }
+
+    function getStaticInterfaceIds() external pure override returns (bytes4[] memory staticInterfaceIds_) {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IFixedRate).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interestRates/kpiLinkedRate/KpiLinkedRate.sol b/packages/ats/contracts/contracts/layer_2/interestRates/kpiLinkedRate/KpiLinkedRate.sol
new file mode 100644
index 000000000..5ec4b0df1
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interestRates/kpiLinkedRate/KpiLinkedRate.sol
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { CommonKpiLinkedInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Common.sol";
+import { IKpiLinkedRate } from "../../interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol";
+import { _INTEREST_RATE_MANAGER_ROLE } from "../../constants/roles.sol";
+
+contract KpiLinkedRate is IKpiLinkedRate, CommonKpiLinkedInterestRate {
+    // solhint-disable-next-line func-name-mixedcase
+    function initialize_KpiLinkedRate(
+        InterestRate calldata _interestRate,
+        ImpactData calldata _impactData,
+        address kpiOracle
+    ) external override onlyUninitialized(_kpiLinkedRateStorage().initialized) {
+        _setInterestRate(_interestRate);
+        _setImpactData(_impactData);
+        _setKpiOracle(kpiOracle);
+        _kpiLinkedRateStorage().initialized = true;
+    }
+
+    function setInterestRate(
+        InterestRate calldata _newInterestRate
+    ) external onlyRole(_INTEREST_RATE_MANAGER_ROLE) onlyUnpaused checkInterestRate(_newInterestRate) {
+        _setInterestRate(_newInterestRate);
+        emit InterestRateUpdated(_msgSender(), _newInterestRate);
+    }
+
+    function setImpactData(
+        ImpactData calldata _newImpactData
+    ) external onlyRole(_INTEREST_RATE_MANAGER_ROLE) onlyUnpaused checkImpactData(_newImpactData) {
+        _setImpactData(_newImpactData);
+        emit ImpactDataUpdated(_msgSender(), _newImpactData);
+    }
+
+    function setKpiOracle(address _kpiOracle) external onlyRole(_INTEREST_RATE_MANAGER_ROLE) onlyUnpaused {
+        _setKpiOracle(_kpiOracle);
+        emit KpiOracleUpdated(_msgSender(), _kpiOracle);
+    }
+
+    function getInterestRate() external view returns (InterestRate memory interestRate_) {
+        interestRate_ = _getInterestRate();
+    }
+
+    function getImpactData() external view returns (ImpactData memory impactData_) {
+        impactData_ = _getImpactData();
+    }
+
+    function getKpiOracle() external view returns (address kpiOracle_) {
+        return _getKpiOracle();
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interestRates/kpiLinkedRate/KpiLinkedRateFacet.sol b/packages/ats/contracts/contracts/layer_2/interestRates/kpiLinkedRate/KpiLinkedRateFacet.sol
new file mode 100644
index 000000000..9af9433e9
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interestRates/kpiLinkedRate/KpiLinkedRateFacet.sol
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+import { IKpiLinkedRate } from "../../interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol";
+import { _KPI_LINKED_RATE_RESOLVER_KEY } from "../../constants/resolverKeys.sol";
+import { IStaticFunctionSelectors } from "../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol";
+import { KpiLinkedRate } from "./KpiLinkedRate.sol";
+
+contract KpiLinkedRateFacet is KpiLinkedRate, IStaticFunctionSelectors {
+    function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
+        staticResolverKey_ = _KPI_LINKED_RATE_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](7);
+        staticFunctionSelectors_[selectorIndex++] = this.initialize_KpiLinkedRate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setInterestRate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setImpactData.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setKpiOracle.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getInterestRate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getImpactData.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getKpiOracle.selector;
+    }
+
+    function getStaticInterfaceIds() external pure override returns (bytes4[] memory staticInterfaceIds_) {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IKpiLinkedRate).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRate.sol b/packages/ats/contracts/contracts/layer_2/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRate.sol
new file mode 100644
index 000000000..9ba596968
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRate.sol
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { CommonSustainabilityPerformanceTargetInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Common.sol";
+import {
+    ISustainabilityPerformanceTargetRate
+} from "../../interfaces/interestRates/sustainabilityPerformanceTargetRate/ISustainabilityPerformanceTargetRate.sol";
+import { _INTEREST_RATE_MANAGER_ROLE } from "../../constants/roles.sol";
+
+contract SustainabilityPerformanceTargetRate is
+    ISustainabilityPerformanceTargetRate,
+    CommonSustainabilityPerformanceTargetInterestRate
+{
+    // solhint-disable-next-line func-name-mixedcase
+    function initialize_SustainabilityPerformanceTargetRate(
+        InterestRate calldata _interestRate,
+        ImpactData[] calldata _impactData,
+        address[] calldata _projects
+    ) external override onlyUninitialized(_sustainabilityPerformanceTargetRateStorage().initialized) {
+        _setSPTInterestRate(_interestRate);
+        for (uint256 index = 0; index < _impactData.length; index++) {
+            if (!_isProceedRecipient(_projects[index])) revert NotExistingProject(_projects[index]);
+            _setSPTImpactData(_impactData[index], _projects[index]);
+        }
+
+        _sustainabilityPerformanceTargetRateStorage().initialized = true;
+    }
+
+    function setInterestRate(
+        InterestRate calldata _newInterestRate
+    ) external onlyRole(_INTEREST_RATE_MANAGER_ROLE) onlyUnpaused {
+        _setSPTInterestRate(_newInterestRate);
+        emit InterestRateUpdated(_msgSender(), _newInterestRate);
+    }
+
+    function setImpactData(
+        ImpactData[] calldata _newImpactData,
+        address[] calldata _projects
+    ) external onlyRole(_INTEREST_RATE_MANAGER_ROLE) onlyUnpaused {
+        for (uint256 index = 0; index < _newImpactData.length; index++) {
+            if (!_isProceedRecipient(_projects[index])) revert NotExistingProject(_projects[index]);
+            _setSPTImpactData(_newImpactData[index], _projects[index]);
+        }
+
+        emit ImpactDataUpdated(_msgSender(), _newImpactData, _projects);
+    }
+
+    function getInterestRate() external view returns (InterestRate memory interestRate_) {
+        interestRate_ = _getSPTInterestRate();
+    }
+
+    function getImpactDataFor(address _project) external view returns (ImpactData memory impactData_) {
+        impactData_ = _getSPTImpactDataFor(_project);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRateFacet.sol b/packages/ats/contracts/contracts/layer_2/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRateFacet.sol
new file mode 100644
index 000000000..e99b28dd3
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRateFacet.sol
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+import {
+    ISustainabilityPerformanceTargetRate
+} from "../../interfaces/interestRates/sustainabilityPerformanceTargetRate/ISustainabilityPerformanceTargetRate.sol";
+import { _SUSTAINABILITY_PERFORMANCE_TARGET_RATE_RESOLVER_KEY } from "../../constants/resolverKeys.sol";
+import { IStaticFunctionSelectors } from "../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol";
+import { SustainabilityPerformanceTargetRate } from "./SustainabilityPerformanceTargetRate.sol";
+
+contract SustainabilityPerformanceTargetRateFacet is SustainabilityPerformanceTargetRate, IStaticFunctionSelectors {
+    function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
+        staticResolverKey_ = _SUSTAINABILITY_PERFORMANCE_TARGET_RATE_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](5);
+        staticFunctionSelectors_[selectorIndex++] = this.initialize_SustainabilityPerformanceTargetRate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setInterestRate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setImpactData.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getInterestRate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getImpactDataFor.selector;
+    }
+
+    function getStaticInterfaceIds() external pure override returns (bytes4[] memory staticInterfaceIds_) {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(ISustainabilityPerformanceTargetRate).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBond.sol b/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBond.sol
index 3ab7879d1..e14ed13d9 100644
--- a/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBond.sol
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBond.sol
@@ -21,7 +21,7 @@ interface IBond {
      * @notice Sets a new coupon for the bond
      * @param _newCoupon The new coupon to be set
      */
-    function setCoupon(IBondRead.Coupon calldata _newCoupon) external returns (bool success_, uint256 couponID_);
+    function setCoupon(IBondRead.Coupon calldata _newCoupon) external returns (uint256 couponID_);
 
     /**
      * @notice Updates the maturity date of the bond.
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 02696c388..2ca1fa79c 100644
--- a/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondRead.sol
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondRead.sol
@@ -2,6 +2,11 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 interface IBondRead {
+    enum RateCalculationStatus {
+        PENDING,
+        SET
+    }
+
     struct BondDetailsData {
         bytes3 currency;
         uint256 nominalValue;
@@ -13,9 +18,12 @@ interface IBondRead {
     struct Coupon {
         uint256 recordDate;
         uint256 executionDate;
+        uint256 startDate;
+        uint256 endDate;
+        uint256 fixingDate;
         uint256 rate;
         uint8 rateDecimals;
-        uint256 period;
+        RateCalculationStatus rateStatus;
     }
 
     struct RegisteredCoupon {
@@ -25,13 +33,9 @@ interface IBondRead {
 
     struct CouponFor {
         uint256 tokenBalance;
-        uint256 rate;
-        uint8 rateDecimals;
-        uint256 recordDate;
-        uint256 executionDate;
-        uint256 period;
         uint8 decimals;
         bool recordDateReached;
+        Coupon coupon;
     }
 
     struct CouponAmountFor {
@@ -93,4 +97,13 @@ interface IBondRead {
      * @dev It is the list of token holders at the snapshot taken at the record date
      */
     function getTotalCouponHolders(uint256 _couponID) external view returns (uint256);
+
+    function getCouponFromOrderedListAt(uint256 _pos) external view returns (uint256 couponID_);
+
+    function getCouponsOrderedList(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (uint256[] memory couponIDs_);
+
+    function getCouponsOrderedListTotal() external view returns (uint256 total_);
 }
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 fca1e11fe..3da775b6b 100644
--- a/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondStorageWrapper.sol
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/bond/IBondStorageWrapper.sol
@@ -1,27 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
+import { IBondRead } from "./IBondRead.sol";
+
 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.
+     * @param coupon Coupon struct containing recordDate, executionDate, rate, and period.
      */
-    event CouponSet(
-        bytes32 corporateActionId,
-        uint256 couponId,
-        address indexed operator,
-        uint256 indexed recordDate,
-        uint256 indexed executionDate,
-        uint256 rate,
-        uint256 rateDecimals,
-        uint256 period
-    );
+    event CouponSet(bytes32 corporateActionId, uint256 couponId, address indexed operator, IBondRead.Coupon coupon);
 
     /**
      * @notice Emitted when a bond's maturity date is modified.
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/equity/IEquity.sol b/packages/ats/contracts/contracts/layer_2/interfaces/equity/IEquity.sol
index 21ece076d..e8a2b220d 100644
--- a/packages/ats/contracts/contracts/layer_2/interfaces/equity/IEquity.sol
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/equity/IEquity.sol
@@ -78,13 +78,13 @@ interface IEquity {
      * @notice Sets a new dividend
      * @dev Can only be called by an account with the corporate actions role
      */
-    function setDividends(Dividend calldata _newDividend) external returns (bool success_, uint256 dividendID_);
+    function setDividends(Dividend calldata _newDividend) external returns (uint256 dividendID_);
 
     /**
      * @notice Sets a new voting
      * @dev Can only be called by an account with the corporate actions role
      */
-    function setVoting(Voting calldata _newVoting) external returns (bool success_, uint256 voteID_);
+    function setVoting(Voting calldata _newVoting) external returns (uint256 voteID_);
 
     /**
      * @notice Sets a new scheduled balance adjustment
@@ -92,7 +92,7 @@ interface IEquity {
      */
     function setScheduledBalanceAdjustment(
         ScheduledBalanceAdjustment calldata _newBalanceAdjustment
-    ) external returns (bool success_, uint256 balanceAdjustmentID_);
+    ) external returns (uint256 balanceAdjustmentID_);
 
     function getEquityDetails() external view returns (EquityDetailsData memory equityDetailsData_);
 
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/fixedRate/IFixedRate.sol b/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/fixedRate/IFixedRate.sol
new file mode 100644
index 000000000..1ae845829
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/fixedRate/IFixedRate.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+interface IFixedRate {
+    struct FixedRateData {
+        uint256 rate;
+        uint8 rateDecimals;
+    }
+
+    event RateUpdated(address indexed operator, uint256 newRate, uint8 newRateDecimals);
+
+    // solhint-disable-next-line func-name-mixedcase
+    function initialize_FixedRate(FixedRateData calldata _initData) external;
+
+    function setRate(uint256 _newRate, uint8 _newRateDecimals) external;
+
+    function getRate() external view returns (uint256 rate_, uint8 decimals_);
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/kpiLinkedRate/IKpi.sol b/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/kpiLinkedRate/IKpi.sol
new file mode 100644
index 000000000..bf131b3e0
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/kpiLinkedRate/IKpi.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+interface IKpi {
+    function setMinValidDate(uint256 _minValidDate) external;
+
+    function getKpiData(
+        uint256 _fromDate,
+        uint256 _toDate
+    ) external view returns (uint256 kpiAggregatedValue_, bool exists_);
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol b/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol
new file mode 100644
index 000000000..2e2bb5a56
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/kpiLinkedRate/IKpiLinkedRate.sol
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+interface IKpiLinkedRate {
+    struct InterestRate {
+        uint256 maxRate;
+        uint256 baseRate;
+        uint256 minRate;
+        uint256 startPeriod;
+        uint256 startRate;
+        uint256 missedPenalty;
+        uint256 reportPeriod;
+        uint8 rateDecimals;
+    }
+    struct ImpactData {
+        uint256 maxDeviationCap;
+        uint256 baseLine;
+        uint256 maxDeviationFloor;
+        uint8 impactDataDecimals;
+        uint256 adjustmentPrecision;
+    }
+
+    event InterestRateUpdated(address indexed operator, InterestRate newInterestRate);
+    event ImpactDataUpdated(address indexed operator, ImpactData newImpactData);
+    event KpiOracleUpdated(address indexed operator, address kpiOracle);
+
+    error WrongInterestRateValues(InterestRate interestRate);
+    error WrongImpactDataValues(ImpactData impactData);
+    error KpiOracleCalledFailed();
+
+    // solhint-disable-next-line func-name-mixedcase
+    function initialize_KpiLinkedRate(
+        InterestRate calldata _interestRate,
+        ImpactData calldata _impactData,
+        address kpiOracle
+    ) external;
+
+    function setInterestRate(InterestRate calldata _newInterestRate) external;
+    function setImpactData(ImpactData calldata _newImpactData) external;
+    function setKpiOracle(address _kpiOracle) external;
+
+    function getInterestRate() external view returns (InterestRate memory interestRate_);
+
+    function getImpactData() external view returns (ImpactData memory impactData_);
+    function getKpiOracle() external view returns (address kpiOracle_);
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/sustainabilityPerformanceTargetRate/ISustainabilityPerformanceTargetRate.sol b/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/sustainabilityPerformanceTargetRate/ISustainabilityPerformanceTargetRate.sol
new file mode 100644
index 000000000..f3f035310
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/interestRates/sustainabilityPerformanceTargetRate/ISustainabilityPerformanceTargetRate.sol
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+interface ISustainabilityPerformanceTargetRate {
+    struct InterestRate {
+        uint256 baseRate;
+        uint256 startPeriod;
+        uint256 startRate;
+        uint8 rateDecimals;
+    }
+
+    enum BaseLineMode {
+        MINIMUM,
+        MAXIMUM
+    }
+
+    enum ImpactDataMode {
+        PENALTY,
+        BONUS
+    }
+
+    struct ImpactData {
+        uint256 baseLine;
+        BaseLineMode baseLineMode;
+        uint256 deltaRate;
+        ImpactDataMode impactDataMode;
+    }
+
+    event InterestRateUpdated(address indexed operator, InterestRate newInterestRate);
+    event ImpactDataUpdated(address indexed operator, ImpactData[] newImpactData, address[] projects);
+
+    error NotExistingProject(address);
+
+    // solhint-disable-next-line func-name-mixedcase
+    function initialize_SustainabilityPerformanceTargetRate(
+        InterestRate calldata _interestRate,
+        ImpactData[] calldata _impactData,
+        address[] calldata _projects
+    ) external;
+
+    function setInterestRate(InterestRate calldata _newInterestRate) external;
+    function setImpactData(ImpactData[] calldata _newImpactData, address[] calldata projects) external;
+
+    function getInterestRate() external view returns (InterestRate memory interestRate_);
+    function getImpactDataFor(address _project) external view returns (ImpactData memory impactData_);
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/kpis/kpiLatest/IKpis.sol b/packages/ats/contracts/contracts/layer_2/interfaces/kpis/kpiLatest/IKpis.sol
new file mode 100644
index 000000000..0cf2a9f86
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/kpis/kpiLatest/IKpis.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+interface IKpis {
+    event KpiDataAdded(address indexed project, uint256 date, uint256 value);
+
+    error InvalidDate(uint256 providedDate, uint256 minDate, uint256 maxDate);
+
+    error KpiDataAlreadyExists(uint256 date);
+
+    error InvalidDateRange(uint256 fromDate, uint256 toDate);
+
+    function addKpiData(uint256 _date, uint256 _value, address _project) external;
+
+    function getLatestKpiData(
+        uint256 _from,
+        uint256 _to,
+        address _project
+    ) external view returns (uint256 value_, bool exists_);
+
+    function getMinDate() external view returns (uint256 minDate_);
+
+    function isCheckPointDate(uint256 _date, address _project) external view returns (bool exists_);
+}
diff --git a/packages/ats/contracts/contracts/layer_2/interfaces/scheduledTasks/scheduledCouponListing/IScheduledCouponListing.sol b/packages/ats/contracts/contracts/layer_2/interfaces/scheduledTasks/scheduledCouponListing/IScheduledCouponListing.sol
new file mode 100644
index 000000000..a3113f9a4
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/interfaces/scheduledTasks/scheduledCouponListing/IScheduledCouponListing.sol
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { ScheduledTask } from "../scheduledTasksCommon/IScheduledTasksCommon.sol";
+
+interface IScheduledCouponListing {
+    function scheduledCouponListingCount() external view returns (uint256);
+
+    function getScheduledCouponListing(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view returns (ScheduledTask[] memory scheduledCouponListing_);
+}
diff --git a/packages/ats/contracts/contracts/layer_2/kpis/kpiLatest/Kpis.sol b/packages/ats/contracts/contracts/layer_2/kpis/kpiLatest/Kpis.sol
new file mode 100644
index 000000000..23d9a8b3e
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/kpis/kpiLatest/Kpis.sol
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { IKpis } from "../../interfaces/kpis/kpiLatest/IKpis.sol";
+import { _KPI_MANAGER_ROLE } from "../../constants/roles.sol";
+import { _KPIS_STORAGE_POSITION } from "../../../layer_0/constants/storagePositions.sol";
+import { CommonSustainabilityPerformanceTargetInterestRate } from "contracts/layer_0_extensions/bond/fixingDateInterestRate/kpiInterestRate/sustainabilityPerformanceTargetInterestRate/Common.sol";
+
+contract Kpis is IKpis, CommonSustainabilityPerformanceTargetInterestRate {
+    function addKpiData(
+        uint256 _date,
+        uint256 _value,
+        address _project
+    ) external onlyRole(_KPI_MANAGER_ROLE) onlyUnpaused isValidDate(_date, _project) {
+        _addKpiData(_date, _value, _project);
+    }
+
+    function getLatestKpiData(
+        uint256 _from,
+        uint256 _to,
+        address _project
+    ) external view returns (uint256 value_, bool exists_) {
+        return _getLatestKpiData(_from, _to, _project);
+    }
+
+    function getMinDate() external view returns (uint256 minDate_) {
+        return _getMinDateAdjusted();
+    }
+
+    function isCheckPointDate(uint256 _date, address _project) external view returns (bool exists_) {
+        return _isCheckpointDate(_date, _project);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/kpis/kpiLatest/KpisFacet.sol b/packages/ats/contracts/contracts/layer_2/kpis/kpiLatest/KpisFacet.sol
new file mode 100644
index 000000000..244847985
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/kpis/kpiLatest/KpisFacet.sol
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { IStaticFunctionSelectors } from "../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol";
+import { Kpis } from "./Kpis.sol";
+import { IKpis } from "../../interfaces/kpis/kpiLatest/IKpis.sol";
+import { _KPIS_RESOLVER_KEY } from "../../constants/resolverKeys.sol";
+
+contract KpisFacet is Kpis, IStaticFunctionSelectors {
+    function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
+        staticResolverKey_ = _KPIS_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](3);
+        staticFunctionSelectors_[selectorIndex++] = this.addKpiData.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getLatestKpiData.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getMinDate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.isCheckPointDate.selector;
+    }
+
+    function getStaticInterfaceIds() external pure override returns (bytes4[] memory staticInterfaceIds_) {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IKpis).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/proceedRecipients/ProceedRecipients.sol b/packages/ats/contracts/contracts/layer_2/proceedRecipients/ProceedRecipients.sol
index 7d18446d3..4c4755a7d 100644
--- a/packages/ats/contracts/contracts/layer_2/proceedRecipients/ProceedRecipients.sol
+++ b/packages/ats/contracts/contracts/layer_2/proceedRecipients/ProceedRecipients.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IProceedRecipients } from "../interfaces/proceedRecipients/IProceedRecipients.sol";
-import { Common } from "../../layer_1/common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 import { _PROCEED_RECIPIENT_MANAGER_ROLE } from "../constants/roles.sol";
 import { _PROCEED_RECIPIENTS_STORAGE_POSITION } from "../../layer_0/constants/storagePositions.sol";
 
@@ -66,7 +66,7 @@ contract ProceedRecipients is IProceedRecipients, Common {
     }
 
     function isProceedRecipient(address _proceedRecipient) external view override returns (bool) {
-        return _isExternalList(_PROCEED_RECIPIENTS_STORAGE_POSITION, _proceedRecipient);
+        return _isProceedRecipient(_proceedRecipient);
     }
 
     function getProceedRecipientData(address _proceedRecipient) external view override returns (bytes memory) {
@@ -74,7 +74,7 @@ contract ProceedRecipients is IProceedRecipients, Common {
     }
 
     function getProceedRecipientsCount() external view override returns (uint256) {
-        return _getExternalListsCount(_PROCEED_RECIPIENTS_STORAGE_POSITION);
+        return _getProceedRecipientsCount();
     }
 
     function getProceedRecipients(
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 d32d758df..78abb82d5 100644
--- a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustments.sol
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledBalanceAdjustments/ScheduledBalanceAdjustments.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../../../layer_1/common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import {
     IScheduledBalanceAdjustments
 } from "../../interfaces/scheduledTasks/scheduledBalanceAdjustments/IScheduledBalanceAdjustments.sol";
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCouponListing/ScheduledCouponListing.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCouponListing/ScheduledCouponListing.sol
new file mode 100644
index 000000000..258f77e9a
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCouponListing/ScheduledCouponListing.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { Common } from "../../../layer_0/common/Common.sol";
+import {
+    IScheduledCouponListing
+} from "../../interfaces/scheduledTasks/scheduledCouponListing/IScheduledCouponListing.sol";
+import { ScheduledTask } from "../../interfaces/scheduledTasks/scheduledTasksCommon/IScheduledTasksCommon.sol";
+import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+
+abstract contract ScheduledCouponListing is IScheduledCouponListing, Common {
+    using EnumerableSet for EnumerableSet.Bytes32Set;
+
+    function scheduledCouponListingCount() external view override returns (uint256) {
+        return _getScheduledCouponListingCount();
+    }
+
+    function getScheduledCouponListing(
+        uint256 _pageIndex,
+        uint256 _pageLength
+    ) external view override returns (ScheduledTask[] memory scheduledCouponListing_) {
+        scheduledCouponListing_ = _getScheduledCouponListing(_pageIndex, _pageLength);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCouponListing/ScheduledCouponListingFacet.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCouponListing/ScheduledCouponListingFacet.sol
new file mode 100644
index 000000000..a44634d89
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCouponListing/ScheduledCouponListingFacet.sol
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { IStaticFunctionSelectors } from "../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol";
+import { _SCHEDULED_COUPON_LISTING_RESOLVER_KEY } from "../../constants/resolverKeys.sol";
+import {
+    IScheduledCouponListing
+} from "../../interfaces/scheduledTasks/scheduledCouponListing/IScheduledCouponListing.sol";
+import { ScheduledCouponListing } from "./ScheduledCouponListing.sol";
+
+contract ScheduledCouponListingFacet is ScheduledCouponListing, IStaticFunctionSelectors {
+    function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
+        staticResolverKey_ = _SCHEDULED_COUPON_LISTING_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](2);
+        staticFunctionSelectors_[selectorIndex++] = this.scheduledCouponListingCount.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getScheduledCouponListing.selector;
+    }
+
+    function getStaticInterfaceIds() external pure override returns (bytes4[] memory staticInterfaceIds_) {
+        staticInterfaceIds_ = new bytes4[](1);
+        uint256 selectorsIndex;
+        staticInterfaceIds_[selectorsIndex++] = type(IScheduledCouponListing).interfaceId;
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCrossOrderedTasks/ScheduledCrossOrderedTasks.sol b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCrossOrderedTasks/ScheduledCrossOrderedTasks.sol
index 7de5c3487..b30717cba 100644
--- a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCrossOrderedTasks/ScheduledCrossOrderedTasks.sol
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledCrossOrderedTasks/ScheduledCrossOrderedTasks.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../../../layer_1/common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import {
     IScheduledCrossOrderedTasks
 } from "../../interfaces/scheduledTasks/scheduledCrossOrderedTasks/IScheduledCrossOrderedTasks.sol";
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 e116b5eae..fc920e078 100644
--- a/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshots.sol
+++ b/packages/ats/contracts/contracts/layer_2/scheduledTasks/scheduledSnapshots/ScheduledSnapshots.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import { Common } from "../../../layer_1/common/Common.sol";
+import { Common } from "../../../layer_0/common/Common.sol";
 import { IScheduledSnapshots } from "../../interfaces/scheduledTasks/scheduledSnapshots/IScheduledSnapshots.sol";
 import { ScheduledTask } from "../../interfaces/scheduledTasks/scheduledTasksCommon/IScheduledTasksCommon.sol";
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
diff --git a/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAFacet.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAFacet.sol
index d628dc9bb..bcb1f7b20 100644
--- a/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAFacet.sol
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAFacet.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { IBondUSA } from "../interfaces/IBondUSA.sol";
-import { _BOND_RESOLVER_KEY } from "../../layer_2/constants/resolverKeys.sol";
+import { _BOND_VARIABLE_RATE_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";
@@ -10,7 +10,7 @@ import { BondUSA } from "./BondUSA.sol";
 
 contract BondUSAFacet is BondUSA, IStaticFunctionSelectors {
     function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
-        staticResolverKey_ = _BOND_RESOLVER_KEY;
+        staticResolverKey_ = _BOND_VARIABLE_RATE_RESOLVER_KEY;
     }
 
     function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
diff --git a/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAReadFacet.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAReadFacet.sol
index 8679ccc5a..e030f8a82 100644
--- a/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAReadFacet.sol
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/BondUSAReadFacet.sol
@@ -8,13 +8,13 @@ import { IBondRead } from "../../layer_2/interfaces/bond/IBondRead.sol";
 import { ISecurity } from "../interfaces/ISecurity.sol";
 
 contract BondUSAReadFacet is BondRead, Security {
-    function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
+    function getStaticResolverKey() external pure virtual override returns (bytes32 staticResolverKey_) {
         staticResolverKey_ = _BOND_READ_RESOLVER_KEY;
     }
 
     function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
         uint256 selectorIndex;
-        staticFunctionSelectors_ = new bytes4[](11);
+        staticFunctionSelectors_ = new bytes4[](14);
         staticFunctionSelectors_[selectorIndex++] = this.getBondDetails.selector;
         staticFunctionSelectors_[selectorIndex++] = this.getCoupon.selector;
         staticFunctionSelectors_[selectorIndex++] = this.getCouponFor.selector;
@@ -26,6 +26,9 @@ contract BondUSAReadFacet is BondRead, Security {
         staticFunctionSelectors_[selectorIndex++] = this.getSecurityRegulationData.selector;
         staticFunctionSelectors_[selectorIndex++] = this.getSecurityHolders.selector;
         staticFunctionSelectors_[selectorIndex++] = this.getTotalSecurityHolders.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getCouponFromOrderedListAt.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getCouponsOrderedList.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.getCouponsOrderedListTotal.selector;
     }
 
     function getStaticInterfaceIds() external pure override returns (bytes4[] memory staticInterfaceIds_) {
diff --git a/packages/ats/contracts/contracts/layer_3/bondUSA/fixedInterestRate/BondUSAFixedRate.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/fixedInterestRate/BondUSAFixedRate.sol
new file mode 100644
index 000000000..d269f12e9
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/fixedInterestRate/BondUSAFixedRate.sol
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BondFixedInterestRate } from "../../../layer_2/bond/fixedInterestRate/Bond.sol";
+import { IBondRead } from "../../../layer_2/interfaces/bond/IBondRead.sol";
+import { IBondUSA } from "../../interfaces/IBondUSA.sol";
+import { RegulationData, AdditionalSecurityData } from "../../constants/regulation.sol";
+
+abstract contract BondUSAFixedRate is IBondUSA, BondFixedInterestRate {
+    // solhint-disable func-name-mixedcase
+    // solhint-disable-next-line private-vars-leading-underscore
+    function _initialize_bondUSA(
+        IBondRead.BondDetailsData calldata _bondDetailsData,
+        RegulationData memory _regulationData,
+        AdditionalSecurityData calldata _additionalSecurityData
+    ) external override onlyUninitialized(_bondStorage().initialized) {
+        _initialize_bond(_bondDetailsData);
+        _initializeSecurity(_regulationData, _additionalSecurityData);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_3/bondUSA/fixedInterestRate/BondUSAFixedRateFacet.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/fixedInterestRate/BondUSAFixedRateFacet.sol
new file mode 100644
index 000000000..7b03357a8
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/fixedInterestRate/BondUSAFixedRateFacet.sol
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { IBondUSA } from "../../interfaces/IBondUSA.sol";
+import { _BOND_FIXED_RATE_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 { BondUSAFixedRate } from "./BondUSAFixedRate.sol";
+
+contract BondUSAFixedRateFacet is BondUSAFixedRate, IStaticFunctionSelectors {
+    function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
+        staticResolverKey_ = _BOND_FIXED_RATE_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](5);
+        staticFunctionSelectors_[selectorIndex++] = this._initialize_bondUSA.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setCoupon.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.updateMaturityDate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.redeemAtMaturityByPartition.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.fullRedeemAtMaturity.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/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedRate.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedRate.sol
new file mode 100644
index 000000000..6f4861019
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedRate.sol
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import {
+    BondKpiLinkedInterestRate
+} from "../../../layer_2/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/Bond.sol";
+import { IBondRead } from "../../../layer_2/interfaces/bond/IBondRead.sol";
+import { IBondUSA } from "../../interfaces/IBondUSA.sol";
+import { RegulationData, AdditionalSecurityData } from "../../constants/regulation.sol";
+
+abstract contract BondUSAKpiLinkedRate is IBondUSA, BondKpiLinkedInterestRate {
+    // solhint-disable func-name-mixedcase
+    // solhint-disable-next-line private-vars-leading-underscore
+    function _initialize_bondUSA(
+        IBondRead.BondDetailsData calldata _bondDetailsData,
+        RegulationData memory _regulationData,
+        AdditionalSecurityData calldata _additionalSecurityData
+    ) external override onlyUninitialized(_bondStorage().initialized) {
+        _initialize_bond(_bondDetailsData);
+        _initializeSecurity(_regulationData, _additionalSecurityData);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedRateFacet.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedRateFacet.sol
new file mode 100644
index 000000000..e485c0d07
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedRateFacet.sol
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { IBondUSA } from "../../interfaces/IBondUSA.sol";
+import { _BOND_KPI_LINKED_RATE_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 { BondUSAKpiLinkedRate } from "./BondUSAKpiLinkedRate.sol";
+
+contract BondUSAKpiLinkedRateFacet is BondUSAKpiLinkedRate, IStaticFunctionSelectors {
+    function getStaticResolverKey() external pure override returns (bytes32 staticResolverKey_) {
+        staticResolverKey_ = _BOND_KPI_LINKED_RATE_RESOLVER_KEY;
+    }
+
+    function getStaticFunctionSelectors() external pure override returns (bytes4[] memory staticFunctionSelectors_) {
+        uint256 selectorIndex;
+        staticFunctionSelectors_ = new bytes4[](5);
+        staticFunctionSelectors_[selectorIndex++] = this._initialize_bondUSA.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.setCoupon.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.updateMaturityDate.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.redeemAtMaturityByPartition.selector;
+        staticFunctionSelectors_[selectorIndex++] = this.fullRedeemAtMaturity.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/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedReadFacet.sol b/packages/ats/contracts/contracts/layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedReadFacet.sol
new file mode 100644
index 000000000..519f1eb89
--- /dev/null
+++ b/packages/ats/contracts/contracts/layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedReadFacet.sol
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import {
+    BondReadKpiLinkedInterestRate
+} from "../../../layer_2/bond/fixingDateInterestRate/kpiInterestRate/kpiLinkedInterestRate/BondRead.sol";
+import { BondUSAReadFacet } from "../BondUSAReadFacet.sol";
+import { _BOND_KPI_LINKED_READ_RESOLVER_KEY } from "../../../layer_2/constants/resolverKeys.sol";
+import { IBondRead } from "../../../layer_2/interfaces/bond/IBondRead.sol";
+import { ISecurity } from "../../interfaces/ISecurity.sol";
+import { IStaticFunctionSelectors } from "../../../interfaces/resolver/resolverProxy/IStaticFunctionSelectors.sol";
+import { BondStorageWrapper } from "../../../layer_0/bond/BondStorageWrapper.sol";
+
+contract BondUSAKpiLinkedReadFacet is BondReadKpiLinkedInterestRate, BondUSAReadFacet {
+    function getStaticResolverKey()
+        external
+        pure
+        override(BondUSAReadFacet, IStaticFunctionSelectors)
+        returns (bytes32 staticResolverKey_)
+    {
+        staticResolverKey_ = _BOND_KPI_LINKED_READ_RESOLVER_KEY;
+    }
+
+    function _setCoupon(
+        IBondRead.Coupon memory _newCoupon
+    )
+        internal
+        virtual
+        override(BondStorageWrapper, BondReadKpiLinkedInterestRate)
+        returns (bytes32 corporateActionId_, uint256 couponID_)
+    {
+        return BondReadKpiLinkedInterestRate._setCoupon(_newCoupon);
+    }
+
+    function _initCoupon(
+        bytes32 _actionId,
+        IBondRead.Coupon memory _newCoupon
+    ) internal virtual override(BondStorageWrapper, BondReadKpiLinkedInterestRate) {
+        BondReadKpiLinkedInterestRate._initCoupon(_actionId, _newCoupon);
+    }
+    function _addToCouponsOrderedList(
+        uint256 _couponID
+    ) internal virtual override(BondStorageWrapper, BondReadKpiLinkedInterestRate) {
+        BondReadKpiLinkedInterestRate._addToCouponsOrderedList(_couponID);
+    }
+
+    function _getCoupon(
+        uint256 _couponID
+    )
+        internal
+        view
+        virtual
+        override(BondStorageWrapper, BondReadKpiLinkedInterestRate)
+        returns (IBondRead.RegisteredCoupon memory registeredCoupon_)
+    {
+        return BondReadKpiLinkedInterestRate._getCoupon(_couponID);
+    }
+}
diff --git a/packages/ats/contracts/contracts/layer_3/security/Security.sol b/packages/ats/contracts/contracts/layer_3/security/Security.sol
index d8254010b..4ecaaf6ef 100644
--- a/packages/ats/contracts/contracts/layer_3/security/Security.sol
+++ b/packages/ats/contracts/contracts/layer_3/security/Security.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { ISecurity } from "../interfaces/ISecurity.sol";
-import { Common } from "../../layer_1/common/Common.sol";
+import { Common } from "../../layer_0/common/Common.sol";
 
 abstract contract Security is ISecurity, Common {
     function getSecurityHolders(
diff --git a/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLock.sol b/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLock.sol
index 0a89de303..1621d5a5b 100644
--- a/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLock.sol
+++ b/packages/ats/contracts/contracts/layer_3/transferAndLock/TransferAndLock.sol
@@ -5,7 +5,7 @@ import { _DEFAULT_PARTITION } from "../../layer_0/constants/values.sol";
 import { _LOCKER_ROLE } from "../../layer_1/constants/roles.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 { Common } from "../../layer_0/common/Common.sol";
 import { ITransferAndLock } from "../interfaces/ITransferAndLock.sol";
 
 abstract contract TransferAndLock is ITransferAndLock, Common {
diff --git a/packages/ats/contracts/contracts/mocks/MockedKpiOracle.sol b/packages/ats/contracts/contracts/mocks/MockedKpiOracle.sol
new file mode 100644
index 000000000..01868754f
--- /dev/null
+++ b/packages/ats/contracts/contracts/mocks/MockedKpiOracle.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0 <0.9.0;
+
+contract MockedKpiOracle {
+    uint256 private _kpiValue;
+    uint256 private _minValidDate;
+    bool private _exists;
+
+    function setKpiValue(uint256 kpiValue) external {
+        _kpiValue = kpiValue;
+    }
+
+    function setExists(bool exists) external {
+        _exists = exists;
+    }
+
+    function setMinValidDate(uint256 minValidDate) external {
+        _minValidDate = minValidDate;
+    }
+
+    function getKpiData(uint256, uint256) external view returns (uint256, bool) {
+        return (_kpiValue, _exists);
+    }
+}
diff --git a/packages/ats/contracts/contracts/test/dumb/MakeMeExplode.sol b/packages/ats/contracts/contracts/test/dumb/MakeMeExplode.sol
new file mode 100644
index 000000000..0388dc4b1
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/dumb/MakeMeExplode.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+function makeMeExplode() pure {
+    uint256 x;
+        x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;
+        x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;
+        x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;
+        x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;
+        x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;
+        x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;x += 1;
+}
\ No newline at end of file
diff --git a/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAFixedRateFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAFixedRateFacetTimeTravel.sol
new file mode 100644
index 000000000..c4cd4695e
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAFixedRateFacetTimeTravel.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BondUSAFixedRateFacet } from "../../../layer_3/bondUSA/fixedInterestRate/BondUSAFixedRateFacet.sol";
+import { TimeTravelStorageWrapper } from "../timeTravel/TimeTravelStorageWrapper.sol";
+import { LocalContext } from "../../../layer_0/context/LocalContext.sol";
+
+contract BondUSAFixedRateFacetTimeTravel is BondUSAFixedRateFacet, 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/BondUSAKpiLinkedRateFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAKpiLinkedRateFacetTimeTravel.sol
new file mode 100644
index 000000000..affe3308e
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAKpiLinkedRateFacetTimeTravel.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import {
+    BondUSAKpiLinkedRateFacet
+} from "../../../layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedRateFacet.sol";
+import { TimeTravelStorageWrapper } from "../timeTravel/TimeTravelStorageWrapper.sol";
+import { LocalContext } from "../../../layer_0/context/LocalContext.sol";
+
+contract BondUSAKpiLinkedRateFacetTimeTravel is BondUSAKpiLinkedRateFacet, 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/BondUSAKpiLinkedReadFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAKpiLinkedReadFacetTimeTravel.sol
new file mode 100644
index 000000000..c1657414b
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/BondUSAKpiLinkedReadFacetTimeTravel.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import {
+    BondUSAKpiLinkedReadFacet
+} from "../../../layer_3/bondUSA/kpiLinkedInterestRate/BondUSAKpiLinkedReadFacet.sol";
+import { TimeTravelStorageWrapper } from "../timeTravel/TimeTravelStorageWrapper.sol";
+import { LocalContext } from "../../../layer_0/context/LocalContext.sol";
+
+contract BondUSAKpiLinkedReadFacetTimeTravel is BondUSAKpiLinkedReadFacet, 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/FixedRateFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/FixedRateFacetTimeTravel.sol
new file mode 100644
index 000000000..01ea75ce9
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/FixedRateFacetTimeTravel.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { FixedRateFacet } from "../../../layer_2/interestRates/fixedRate/FixedRateFacet.sol";
+import { TimeTravelStorageWrapper } from "../timeTravel/TimeTravelStorageWrapper.sol";
+import { LocalContext } from "../../../layer_0/context/LocalContext.sol";
+
+contract FixedRateFacetTimeTravel is FixedRateFacet, 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/KpiLinkedRateFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KpiLinkedRateFacetTimeTravel.sol
new file mode 100644
index 000000000..a0d39a175
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KpiLinkedRateFacetTimeTravel.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { KpiLinkedRateFacet } from "../../../layer_2/interestRates/kpiLinkedRate/KpiLinkedRateFacet.sol";
+import { TimeTravelStorageWrapper } from "../timeTravel/TimeTravelStorageWrapper.sol";
+import { LocalContext } from "../../../layer_0/context/LocalContext.sol";
+
+contract KpiLinkedRateFacetTimeTravel is KpiLinkedRateFacet, 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/KpisFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KpisFacetTimeTravel.sol
new file mode 100644
index 000000000..4d95503ff
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/KpisFacetTimeTravel.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { KpisFacet } from "../../../layer_2/kpis/kpiLatest/KpisFacet.sol";
+import { TimeTravelStorageWrapper } from "../timeTravel/TimeTravelStorageWrapper.sol";
+import { LocalContext } from "../../../layer_0/context/LocalContext.sol";
+
+contract KpisFacetTimeTravel is KpisFacet, 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/ScheduledCouponListingFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledCouponListingFacetTimeTravel.sol
new file mode 100644
index 000000000..3959d10fa
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/ScheduledCouponListingFacetTimeTravel.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import {
+    ScheduledCouponListingFacet
+} from "../../../layer_2/scheduledTasks/scheduledCouponListing/ScheduledCouponListingFacet.sol";
+import { TimeTravelStorageWrapper } from "../timeTravel/TimeTravelStorageWrapper.sol";
+import { LocalContext } from "../../../layer_0/context/LocalContext.sol";
+
+contract ScheduledCouponListingFacetTimeTravel is ScheduledCouponListingFacet, 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/SustainabilityPerformanceTargetRateFacetTimeTravel.sol b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SustainabilityPerformanceTargetRateFacetTimeTravel.sol
new file mode 100644
index 000000000..306a22a1c
--- /dev/null
+++ b/packages/ats/contracts/contracts/test/testTimeTravel/facetsTimeTravel/SustainabilityPerformanceTargetRateFacetTimeTravel.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import {
+    SustainabilityPerformanceTargetRateFacet
+} from "../../../layer_2/interestRates/sustainabilityPerformanceTargetRate/SustainabilityPerformanceTargetRateFacet.sol";
+import { TimeTravelStorageWrapper } from "../timeTravel/TimeTravelStorageWrapper.sol";
+import { LocalContext } from "../../../layer_0/context/LocalContext.sol";
+
+contract SustainabilityPerformanceTargetRateFacetTimeTravel is
+    SustainabilityPerformanceTargetRateFacet,
+    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/scripts/DEVELOPER_GUIDE.md b/packages/ats/contracts/scripts/DEVELOPER_GUIDE.md
index 57d65c868..38b56fbc8 100644
--- a/packages/ats/contracts/scripts/DEVELOPER_GUIDE.md
+++ b/packages/ats/contracts/scripts/DEVELOPER_GUIDE.md
@@ -481,11 +481,40 @@ Add exports to [domain/index.ts](domain/index.ts):
 
 ```typescript
 // Fund configuration
+export * from "./factory/deployFundToken";
 export { createFundConfiguration } from "./fund/createConfiguration";
 export { FUND_CONFIG_ID } from "./constants";
 ```
 
-### Step 4: Deploy Custom Facets (if any)
+### Step 4: Add factory
+
+Add 'deployFundToken.ts' factory to [domain/factory](domain/factory/deployFundToken.ts):
+
+### Step 5: Add to workflows scripts
+
+Add new asset to
+
+- [domain/workflows/deploySystemWithExistingBlr](domain/factory/workflows/deploySystemWithExistingBlr.ts):
+- [domain/workflows/deploySystemWithNewBlr](domain/factory/workflows/deploySystemWithNewBlr.ts):
+
+### Step 6: Add to checkpoint scripts
+
+Add new asset to
+
+- [infrastructure/checkpoint/utils](infrastructure/checkpoint/utils.ts):
+- [infrastructure/types/checkpoint](infrastructure/types/checkpoint.ts):
+
+### Step 7: (Only for Testing) Add token fixture
+
+Add new fixture to
+
+- [test/fixture/tokens](test/fixture/tokens/fund.fixture.ts):
+
+Add fixture to index
+
+- [test/fixture/index](test/fixture/index.ts):
+
+### Step 8: Deploy Custom Facets (if any)
 
 If you have fund-specific facets, deploy them:
 
@@ -507,7 +536,7 @@ console.log("Fund facets deployed:", {
 });
 ```
 
-### Step 5: Register All Facets
+### Step 9: Register All Facets
 
 Register both common facets and fund-specific facets:
 
@@ -538,7 +567,7 @@ const result = await registerFacets(blr, {
 
 **Note**: Registering an already-registered facet is safe and will update to the new address.
 
-### Step 6: Create Initial Configuration
+### Step 10: Create Initial Configuration
 
 Create the first version of your fund configuration:
 
@@ -573,7 +602,7 @@ if (result.success) {
 }
 ```
 
-### Step 7: Update Workflows (Optional)
+### Step 11: Update Workflows (Optional)
 
 If you want to include your new asset in complete deployment workflows, update [workflows/deployCompleteSystem.ts](workflows/deployCompleteSystem.ts):
 
@@ -595,7 +624,7 @@ output.configurations.fund = {
 };
 ```
 
-### Step 8: Verify
+### Step 12: Verify
 
 Verify your new asset configuration:
 
@@ -620,6 +649,13 @@ When creating a new asset, touch these files:
 - [ ] `domain/constants.ts` - Add `FUND_CONFIG_ID`
 - [ ] `domain/fund/createConfiguration.ts` - Create module with `FUND_FACETS` array
 - [ ] `domain/index.ts` - Export `createFundConfiguration` and `FUND_CONFIG_ID`
+- [ ] `domain/factory/deployFund.ts`
+- [ ] `infrastructure/checkpoint/utils.ts`
+- [ ] `infrastructure/types/checkpoint.ts`
+- [ ] `workflows/deploySystemWithExistingBlr.ts` - Add to deployment workflow
+- [ ] `workflows/deploySystemWithNewBlr.ts` - Add to deployment workflow
+- [ ] `tests/fixtures/tokens/fund.fixture.ts`
+- [ ] `tests/fixtures/index.ts`
 - [ ] `contracts/layer_3/jurisdiction/usa/FundUSAFacet.sol` - Implement custom facets (if needed)
 - [ ] `workflows/deployCompleteSystem.ts` - Add to deployment workflow (optional)
 
diff --git a/packages/ats/contracts/scripts/domain/atsRegistry.data.ts b/packages/ats/contracts/scripts/domain/atsRegistry.data.ts
index 1950ff2f6..5ee8d6c64 100644
--- a/packages/ats/contracts/scripts/domain/atsRegistry.data.ts
+++ b/packages/ats/contracts/scripts/domain/atsRegistry.data.ts
@@ -10,8 +10,8 @@
  *
  * Import from '@scripts/domain' instead of this file directly.
  *
- * Generated: 2025-12-01T14:53:46.712Z
- * Facets: 49
+ * Generated: 2025-12-10T14:42:41.252Z
+ * Facets: 57
  * Infrastructure: 2
  *
  * @module domain/atsRegistry.data
@@ -25,6 +25,12 @@ import {
   AdjustBalancesFacetTimeTravel__factory,
   BondUSAFacet__factory,
   BondUSAFacetTimeTravel__factory,
+  BondUSAFixedRateFacet__factory,
+  BondUSAFixedRateFacetTimeTravel__factory,
+  BondUSAKpiLinkedRateFacet__factory,
+  BondUSAKpiLinkedRateFacetTimeTravel__factory,
+  BondUSAKpiLinkedReadFacet__factory,
+  BondUSAKpiLinkedReadFacetTimeTravel__factory,
   BondUSAReadFacet__factory,
   BondUSAReadFacetTimeTravel__factory,
   CapFacet__factory,
@@ -85,6 +91,8 @@ import {
   ExternalKycListManagementFacetTimeTravel__factory,
   ExternalPauseManagementFacet__factory,
   ExternalPauseManagementFacetTimeTravel__factory,
+  FixedRateFacet__factory,
+  FixedRateFacetTimeTravel__factory,
   FreezeFacet__factory,
   FreezeFacetTimeTravel__factory,
   HoldManagementFacet__factory,
@@ -93,6 +101,10 @@ import {
   HoldReadFacetTimeTravel__factory,
   HoldTokenHolderFacet__factory,
   HoldTokenHolderFacetTimeTravel__factory,
+  KpiLinkedRateFacet__factory,
+  KpiLinkedRateFacetTimeTravel__factory,
+  KpisFacet__factory,
+  KpisFacetTimeTravel__factory,
   KycFacet__factory,
   KycFacetTimeTravel__factory,
   LockFacet__factory,
@@ -105,6 +117,8 @@ import {
   ProtectedPartitionsFacetTimeTravel__factory,
   ScheduledBalanceAdjustmentsFacet__factory,
   ScheduledBalanceAdjustmentsFacetTimeTravel__factory,
+  ScheduledCouponListingFacet__factory,
+  ScheduledCouponListingFacetTimeTravel__factory,
   ScheduledCrossOrderedTasksFacet__factory,
   ScheduledCrossOrderedTasksFacetTimeTravel__factory,
   ScheduledSnapshotsFacet__factory,
@@ -113,6 +127,8 @@ import {
   SnapshotsFacetTimeTravel__factory,
   SsiManagementFacet__factory,
   SsiManagementFacetTimeTravel__factory,
+  SustainabilityPerformanceTargetRateFacet__factory,
+  SustainabilityPerformanceTargetRateFacetTimeTravel__factory,
   TimeTravelFacet__factory,
   TransferAndLockFacet__factory,
   TransferAndLockFacetTimeTravel__factory,
@@ -190,8 +206,8 @@ export const FACET_REGISTRY: Record<string, FacetDefinition> = {
   BondUSAFacet: {
     name: "BondUSAFacet",
     resolverKey: {
-      name: "_BOND_RESOLVER_KEY",
-      value: "0x09c1d80a160a7250b5fabc46d06a7fa4067e6d7292047c5024584b43f17d55ef",
+      name: "_BOND_VARIABLE_RATE_RESOLVER_KEY",
+      value: "0xe6594ee8f54f346ab25268fdc7955031a6b06102355e1446353d89ab1d593de3",
     },
     inheritance: ["BondUSA", "IStaticFunctionSelectors"],
     methods: [
@@ -213,6 +229,92 @@ export const FACET_REGISTRY: Record<string, FacetDefinition> = {
       useTimeTravel ? new BondUSAFacetTimeTravel__factory(signer) : new BondUSAFacet__factory(signer),
   },
 
+  BondUSAFixedRateFacet: {
+    name: "BondUSAFixedRateFacet",
+    resolverKey: {
+      name: "_BOND_FIXED_RATE_RESOLVER_KEY",
+      value: "0xd55d8787d23b78e70dada1ade45b8758f5c027e2cddf3556606c07d388ce159a",
+    },
+    inheritance: ["BondUSAFixedRate", "IStaticFunctionSelectors"],
+    methods: [
+      {
+        name: "_initialize_bondUSA",
+        signature: "_initialize_bondUSA(IBondRead.BondDetailsData,RegulationData,AdditionalSecurityData)",
+        selector: "0x653458ea",
+      },
+      { name: "fullRedeemAtMaturity", signature: "fullRedeemAtMaturity(address)", selector: "0xd0db5fb2" },
+      {
+        name: "redeemAtMaturityByPartition",
+        signature: "redeemAtMaturityByPartition(address,bytes32,uint256)",
+        selector: "0x8a647211",
+      },
+      { name: "setCoupon", signature: "setCoupon(IBondRead.Coupon)", selector: "0x94218ed1" },
+      { name: "updateMaturityDate", signature: "updateMaturityDate(uint256)", selector: "0xc7a6ca35" },
+    ],
+    errors: [{ name: "InterestRateIsFixed", signature: "InterestRateIsFixed()", selector: "0x849d4eb8" }],
+    factory: (signer, useTimeTravel = false) =>
+      useTimeTravel ? new BondUSAFixedRateFacetTimeTravel__factory(signer) : new BondUSAFixedRateFacet__factory(signer),
+  },
+
+  BondUSAKpiLinkedRateFacet: {
+    name: "BondUSAKpiLinkedRateFacet",
+    resolverKey: {
+      name: "_BOND_KPI_LINKED_RATE_RESOLVER_KEY",
+      value: "0x99c145ff21354eb7b25cb096873143fa3d3aba98457b96bcd13f1d1f2b9bf28c",
+    },
+    inheritance: ["BondUSAKpiLinkedRate", "IStaticFunctionSelectors"],
+    methods: [
+      {
+        name: "_initialize_bondUSA",
+        signature: "_initialize_bondUSA(IBondRead.BondDetailsData,RegulationData,AdditionalSecurityData)",
+        selector: "0x653458ea",
+      },
+      { name: "fullRedeemAtMaturity", signature: "fullRedeemAtMaturity(address)", selector: "0xd0db5fb2" },
+      {
+        name: "redeemAtMaturityByPartition",
+        signature: "redeemAtMaturityByPartition(address,bytes32,uint256)",
+        selector: "0x8a647211",
+      },
+      { name: "setCoupon", signature: "setCoupon(IBondRead.Coupon)", selector: "0x94218ed1" },
+      { name: "updateMaturityDate", signature: "updateMaturityDate(uint256)", selector: "0xc7a6ca35" },
+    ],
+    errors: [{ name: "InterestRateIsKpiLinked", signature: "InterestRateIsKpiLinked()", selector: "0x68eba14f" }],
+    factory: (signer, useTimeTravel = false) =>
+      useTimeTravel
+        ? new BondUSAKpiLinkedRateFacetTimeTravel__factory(signer)
+        : new BondUSAKpiLinkedRateFacet__factory(signer),
+  },
+
+  BondUSAKpiLinkedReadFacet: {
+    name: "BondUSAKpiLinkedReadFacet",
+    resolverKey: {
+      name: "_BOND_KPI_LINKED_READ_RESOLVER_KEY",
+      value: "0xcced91a2a03bf45bd62730a7f4703ee2d762f8ebccff315c7145258265f73249",
+    },
+    inheritance: ["BondReadKpiLinkedInterestRate", "BondUSAReadFacet"],
+    methods: [
+      { name: "getBondDetails", signature: "getBondDetails()", selector: "0x4ce02414" },
+      { name: "getCoupon", signature: "getCoupon(uint256)", selector: "0x936e3169" },
+      { name: "getCouponAmountFor", signature: "getCouponAmountFor(uint256,address)", selector: "0x439efc2e" },
+      { name: "getCouponCount", signature: "getCouponCount()", selector: "0x468bb240" },
+      { name: "getCouponFor", signature: "getCouponFor(uint256,address)", selector: "0xbba7b56d" },
+      { name: "getCouponFromOrderedListAt", signature: "getCouponFromOrderedListAt(uint256)", selector: "0x65a88a2c" },
+      { name: "getCouponHolders", signature: "getCouponHolders(uint256,uint256,uint256)", selector: "0xa92e8371" },
+      { name: "getCouponsOrderedList", signature: "getCouponsOrderedList(uint256,uint256)", selector: "0xd7133de1" },
+      { name: "getCouponsOrderedListTotal", signature: "getCouponsOrderedListTotal()", selector: "0xee1d26eb" },
+      { name: "getPrincipalFor", signature: "getPrincipalFor(address)", selector: "0x6f131c78" },
+      { name: "getSecurityHolders", signature: "getSecurityHolders(uint256,uint256)", selector: "0x81438d2f" },
+      { name: "getSecurityRegulationData", signature: "getSecurityRegulationData()", selector: "0x8fda5afe" },
+      { name: "getTotalCouponHolders", signature: "getTotalCouponHolders(uint256)", selector: "0xec116ae3" },
+      { name: "getTotalSecurityHolders", signature: "getTotalSecurityHolders()", selector: "0xbd007c8f" },
+    ],
+    errors: [{ name: "InterestRateIsKpiLinked", signature: "InterestRateIsKpiLinked()", selector: "0x68eba14f" }],
+    factory: (signer, useTimeTravel = false) =>
+      useTimeTravel
+        ? new BondUSAKpiLinkedReadFacetTimeTravel__factory(signer)
+        : new BondUSAKpiLinkedReadFacet__factory(signer),
+  },
+
   BondUSAReadFacet: {
     name: "BondUSAReadFacet",
     resolverKey: {
@@ -226,7 +328,10 @@ export const FACET_REGISTRY: Record<string, FacetDefinition> = {
       { name: "getCouponAmountFor", signature: "getCouponAmountFor(uint256,address)", selector: "0x439efc2e" },
       { name: "getCouponCount", signature: "getCouponCount()", selector: "0x468bb240" },
       { name: "getCouponFor", signature: "getCouponFor(uint256,address)", selector: "0xbba7b56d" },
+      { name: "getCouponFromOrderedListAt", signature: "getCouponFromOrderedListAt(uint256)", selector: "0x65a88a2c" },
       { name: "getCouponHolders", signature: "getCouponHolders(uint256,uint256,uint256)", selector: "0xa92e8371" },
+      { name: "getCouponsOrderedList", signature: "getCouponsOrderedList(uint256,uint256)", selector: "0xd7133de1" },
+      { name: "getCouponsOrderedListTotal", signature: "getCouponsOrderedListTotal()", selector: "0xee1d26eb" },
       { name: "getPrincipalFor", signature: "getPrincipalFor(address)", selector: "0x6f131c78" },
       { name: "getSecurityHolders", signature: "getSecurityHolders(uint256,uint256)", selector: "0x81438d2f" },
       { name: "getSecurityRegulationData", signature: "getSecurityRegulationData()", selector: "0x8fda5afe" },
@@ -1501,6 +1606,30 @@ export const FACET_REGISTRY: Record<string, FacetDefinition> = {
         : new ExternalPauseManagementFacet__factory(signer),
   },
 
+  FixedRateFacet: {
+    name: "FixedRateFacet",
+    resolverKey: {
+      name: "_FIXED_RATE_RESOLVER_KEY",
+      value: "0x2871e1c37f7423765d88b16528db7e80ad8e2bae5ab5d55e26659840c1d6b504",
+    },
+    inheritance: ["FixedRate", "IStaticFunctionSelectors"],
+    methods: [
+      { name: "getRate", signature: "getRate()", selector: "0x679aefce" },
+      { name: "initialize_FixedRate", signature: "initialize_FixedRate(FixedRateData)", selector: "0xc6acf7e3" },
+      { name: "setRate", signature: "setRate(uint256,uint8)", selector: "0xd1923502" },
+    ],
+    events: [
+      {
+        name: "RateUpdated",
+        signature: "RateUpdated(address,uint256,uint8)",
+        topic0: "0xa7fd66e9450da5029fb2dfd59586274386eb4c169bfc873e265aa29d3df59424",
+      },
+    ],
+    errors: [{ name: "InterestRateIsFixed", signature: "InterestRateIsFixed()", selector: "0x849d4eb8" }],
+    factory: (signer, useTimeTravel = false) =>
+      useTimeTravel ? new FixedRateFacetTimeTravel__factory(signer) : new FixedRateFacet__factory(signer),
+  },
+
   FreezeFacet: {
     name: "FreezeFacet",
     resolverKey: {
@@ -1679,6 +1808,87 @@ export const FACET_REGISTRY: Record<string, FacetDefinition> = {
       useTimeTravel ? new HoldTokenHolderFacetTimeTravel__factory(signer) : new HoldTokenHolderFacet__factory(signer),
   },
 
+  KpiLinkedRateFacet: {
+    name: "KpiLinkedRateFacet",
+    resolverKey: {
+      name: "_KPI_LINKED_RATE_RESOLVER_KEY",
+      value: "0x92999bd0329d03e46274ce7743ebe0060df95286df4fa7b354937b7d21757d22",
+    },
+    inheritance: ["KpiLinkedRate", "IStaticFunctionSelectors"],
+    methods: [
+      { name: "getImpactData", signature: "getImpactData()", selector: "0x24bffca8" },
+      { name: "getInterestRate", signature: "getInterestRate()", selector: "0x5257b566" },
+      { name: "getKpiOracle", signature: "getKpiOracle()", selector: "0x507ff519" },
+      {
+        name: "initialize_KpiLinkedRate",
+        signature: "initialize_KpiLinkedRate(InterestRate,ImpactData,address)",
+        selector: "0xe5d591cb",
+      },
+      { name: "setImpactData", signature: "setImpactData(ImpactData)", selector: "0xd58c48f4" },
+      { name: "setInterestRate", signature: "setInterestRate(InterestRate)", selector: "0xf1f2d5d4" },
+      { name: "setKpiOracle", signature: "setKpiOracle(address)", selector: "0xa6a7e233" },
+    ],
+    events: [
+      {
+        name: "ImpactDataUpdated",
+        signature: "ImpactDataUpdated(address,ImpactData)",
+        topic0: "0x1332416d8a331208a5df15d5aca3cfdb455372a2258e35f219261cf3a2f50cdb",
+      },
+      {
+        name: "InterestRateUpdated",
+        signature: "InterestRateUpdated(address,InterestRate)",
+        topic0: "0xed3c060bc037e2b9f05c9d552119ccb2cf7499562ac630370d20178beb1583e7",
+      },
+      {
+        name: "KpiOracleUpdated",
+        signature: "KpiOracleUpdated(address,address)",
+        topic0: "0xb1508b1e352d7d662c2797f56b267cd7f96db139d0ba747ffa2d007bf8a8e823",
+      },
+    ],
+    errors: [
+      { name: "InterestRateIsKpiLinked", signature: "InterestRateIsKpiLinked()", selector: "0x68eba14f" },
+      { name: "KpiOracleCalledFailed", signature: "KpiOracleCalledFailed()", selector: "0x75d7804c" },
+      { name: "WrongImpactDataValues", signature: "WrongImpactDataValues(ImpactData)", selector: "0xb90540b6" },
+      { name: "WrongInterestRateValues", signature: "WrongInterestRateValues(InterestRate)", selector: "0xf2973d16" },
+    ],
+    factory: (signer, useTimeTravel = false) =>
+      useTimeTravel ? new KpiLinkedRateFacetTimeTravel__factory(signer) : new KpiLinkedRateFacet__factory(signer),
+  },
+
+  KpisFacet: {
+    name: "KpisFacet",
+    resolverKey: {
+      name: "_KPIS_RESOLVER_KEY",
+      value: "0xb228c36d89348606afcfbad286f8eddb0d0cdd727eefd0f0fd87f17ea0793051",
+    },
+    inheritance: ["Kpis", "IStaticFunctionSelectors"],
+    methods: [
+      { name: "addKpiData", signature: "addKpiData(uint256,uint256,address)", selector: "0x0de2be70" },
+      { name: "getLatestKpiData", signature: "getLatestKpiData(uint256,uint256,address)", selector: "0xfc7f5cb3" },
+      { name: "getMinDate", signature: "getMinDate()", selector: "0x48de6fa7" },
+      { name: "isCheckPointDate", signature: "isCheckPointDate(uint256,address)", selector: "0x8078ccd5" },
+    ],
+    events: [
+      {
+        name: "KpiDataAdded",
+        signature: "KpiDataAdded(address,uint256,uint256)",
+        topic0: "0xb14d0e5a6665e6c690dc5c7ffc777323768a449038bc6bfed9986ecd52547303",
+      },
+    ],
+    errors: [
+      {
+        name: "InterestRateIsSustainabilityPerformanceTarget",
+        signature: "InterestRateIsSustainabilityPerformanceTarget()",
+        selector: "0x15a15b0a",
+      },
+      { name: "InvalidDate", signature: "InvalidDate(uint256,uint256,uint256)", selector: "0x1addb674" },
+      { name: "InvalidDateRange", signature: "InvalidDateRange(uint256,uint256)", selector: "0x8914d40b" },
+      { name: "KpiDataAlreadyExists", signature: "KpiDataAlreadyExists(uint256)", selector: "0x74efd82c" },
+    ],
+    factory: (signer, useTimeTravel = false) =>
+      useTimeTravel ? new KpisFacetTimeTravel__factory(signer) : new KpisFacet__factory(signer),
+  },
+
   KycFacet: {
     name: "KycFacet",
     resolverKey: {
@@ -1908,6 +2118,27 @@ export const FACET_REGISTRY: Record<string, FacetDefinition> = {
         : new ScheduledBalanceAdjustmentsFacet__factory(signer),
   },
 
+  ScheduledCouponListingFacet: {
+    name: "ScheduledCouponListingFacet",
+    resolverKey: {
+      name: "_SCHEDULED_COUPON_LISTING_RESOLVER_KEY",
+      value: "0x6cc7645ae5bcd122875ce8bd150bd28dda6374546c4c2421e5ae4fdeedb3ab30",
+    },
+    inheritance: ["ScheduledCouponListing", "IStaticFunctionSelectors"],
+    methods: [
+      {
+        name: "getScheduledCouponListing",
+        signature: "getScheduledCouponListing(uint256,uint256)",
+        selector: "0x2fcfe49c",
+      },
+      { name: "scheduledCouponListingCount", signature: "scheduledCouponListingCount()", selector: "0x80a84271" },
+    ],
+    factory: (signer, useTimeTravel = false) =>
+      useTimeTravel
+        ? new ScheduledCouponListingFacetTimeTravel__factory(signer)
+        : new ScheduledCouponListingFacet__factory(signer),
+  },
+
   ScheduledCrossOrderedTasksFacet: {
     name: "ScheduledCrossOrderedTasksFacet",
     resolverKey: {
@@ -2080,6 +2311,50 @@ export const FACET_REGISTRY: Record<string, FacetDefinition> = {
       useTimeTravel ? new SsiManagementFacetTimeTravel__factory(signer) : new SsiManagementFacet__factory(signer),
   },
 
+  SustainabilityPerformanceTargetRateFacet: {
+    name: "SustainabilityPerformanceTargetRateFacet",
+    resolverKey: {
+      name: "_SUSTAINABILITY_PERFORMANCE_TARGET_RATE_RESOLVER_KEY",
+      value: "0xa261a7434029a925924f47ccea7fbe12af1e56efd74e8f1d8ac23bec19a27e49",
+    },
+    inheritance: ["SustainabilityPerformanceTargetRate", "IStaticFunctionSelectors"],
+    methods: [
+      { name: "getImpactDataFor", signature: "getImpactDataFor(address)", selector: "0xb8cf9d2a" },
+      { name: "getInterestRate", signature: "getInterestRate()", selector: "0x5257b566" },
+      {
+        name: "initialize_SustainabilityPerformanceTargetRate",
+        signature: "initialize_SustainabilityPerformanceTargetRate(InterestRate,ImpactData[],address[])",
+        selector: "0xcccfaa36",
+      },
+      { name: "setImpactData", signature: "setImpactData(ImpactData[],address[])", selector: "0x9278f4db" },
+      { name: "setInterestRate", signature: "setInterestRate(InterestRate)", selector: "0xf1f2d5d4" },
+    ],
+    events: [
+      {
+        name: "ImpactDataUpdated",
+        signature: "ImpactDataUpdated(address,ImpactData[],address[])",
+        topic0: "0x8ac5147acc7918904f238d103d9306aaa3208ad0a679f15a37f43e6767a8aa03",
+      },
+      {
+        name: "InterestRateUpdated",
+        signature: "InterestRateUpdated(address,InterestRate)",
+        topic0: "0xed3c060bc037e2b9f05c9d552119ccb2cf7499562ac630370d20178beb1583e7",
+      },
+    ],
+    errors: [
+      {
+        name: "InterestRateIsSustainabilityPerformanceTarget",
+        signature: "InterestRateIsSustainabilityPerformanceTarget()",
+        selector: "0x15a15b0a",
+      },
+      { name: "NotExistingProject", signature: "NotExistingProject(address)", selector: "0x2f850995" },
+    ],
+    factory: (signer, useTimeTravel = false) =>
+      useTimeTravel
+        ? new SustainabilityPerformanceTargetRateFacetTimeTravel__factory(signer)
+        : new SustainabilityPerformanceTargetRateFacet__factory(signer),
+  },
+
   TimeTravelFacet: {
     name: "TimeTravelFacet",
     resolverKey: {
@@ -2159,7 +2434,7 @@ export const FACET_REGISTRY: Record<string, FacetDefinition> = {
 /**
  * Total number of facets in the registry.
  */
-export const TOTAL_FACETS = 49 as const;
+export const TOTAL_FACETS = 57 as const;
 
 /**
  * Registry of non-facet infrastructure contracts (BusinessLogicResolver, Factory, etc.).
@@ -2211,9 +2486,15 @@ export const INFRASTRUCTURE_CONTRACTS: Record<string, ContractDefinition> = {
 
   Factory: {
     name: "Factory",
-    inheritance: ["IFactory", "LocalContext"],
+    inheritance: ["IFactory", "Common"],
     methods: [
       { name: "deployBond", signature: "deployBond(BondData,FactoryRegulationData)", selector: "0x5010503b" },
+      { name: "deployBondFixedRate", signature: "deployBondFixedRate(BondFixedRateData)", selector: "0xfa4cb8bd" },
+      {
+        name: "deployBondKpiLinkedRate",
+        signature: "deployBondKpiLinkedRate(BondKpiLinkedRateData)",
+        selector: "0x39293807",
+      },
       { name: "deployEquity", signature: "deployEquity(EquityData,FactoryRegulationData)", selector: "0x7c03575b" },
       {
         name: "getAppliedRegulationData",
@@ -2268,6 +2549,7 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
     name: "BondStorageWrapper",
     inheritance: ["IBondStorageWrapper", "ERC20PermitStorageWrapper"],
     methods: [
+      { name: "_addToCouponsOrderedList", signature: "_addToCouponsOrderedList(uint256)", selector: "0x17a345a0" },
       { name: "_bondStorage", signature: "_bondStorage()", selector: "0x64ccfd52" },
       { name: "_checkMaturityDate", signature: "_checkMaturityDate(uint256)", selector: "0xb9a83231" },
       { name: "_getBondDetails", signature: "_getBondDetails()", selector: "0xdfa65894" },
@@ -2275,14 +2557,59 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
       { name: "_getCouponAmountFor", signature: "_getCouponAmountFor(uint256,address)", selector: "0xe744f18d" },
       { name: "_getCouponCount", signature: "_getCouponCount()", selector: "0x293fbc5a" },
       { name: "_getCouponFor", signature: "_getCouponFor(uint256,address)", selector: "0x2abd54cf" },
+      {
+        name: "_getCouponFromOrderedListAt",
+        signature: "_getCouponFromOrderedListAt(uint256)",
+        selector: "0xfc543649",
+      },
       { name: "_getCouponHolders", signature: "_getCouponHolders(uint256,uint256,uint256)", selector: "0xb2962e11" },
+      { name: "_getCouponsOrderedList", signature: "_getCouponsOrderedList(uint256,uint256)", selector: "0x5b924344" },
+      { name: "_getCouponsOrderedListTotal", signature: "_getCouponsOrderedListTotal()", selector: "0xe92862c4" },
+      {
+        name: "_getCouponsOrderedListTotalAdjusted",
+        signature: "_getCouponsOrderedListTotalAdjusted()",
+        selector: "0x8aec23a9",
+      },
       { name: "_getMaturityDate", signature: "_getMaturityDate()", selector: "0xa1522f44" },
       { name: "_getPrincipalFor", signature: "_getPrincipalFor(address)", selector: "0xc8e42efe" },
       { name: "_getTotalCouponHolders", signature: "_getTotalCouponHolders(uint256)", selector: "0xfba7a1ab" },
-      { name: "_initCoupon", signature: "_initCoupon(bool,bytes32,bytes)", selector: "0x744faa4f" },
+      { name: "_initCoupon", signature: "_initCoupon(bytes32,IBondRead.Coupon)", selector: "0x9b230d29" },
+      { name: "_initialize_bond", signature: "_initialize_bond(IBondRead.BondDetailsData)", selector: "0x158876c6" },
       { name: "_setCoupon", signature: "_setCoupon(IBondRead.Coupon)", selector: "0xf9d474a4" },
       { name: "_setMaturityDate", signature: "_setMaturityDate(uint256)", selector: "0x1c73e162" },
       { name: "_storeBondDetails", signature: "_storeBondDetails(IBondRead.BondDetailsData)", selector: "0x9b11f1cd" },
+      {
+        name: "_updateCouponRate",
+        signature: "_updateCouponRate(uint256,IBondRead.Coupon,uint256,uint8)",
+        selector: "0xc1e90d33",
+      },
+    ],
+  },
+
+  BondStorageWrapperFixedInterestRate: {
+    name: "BondStorageWrapperFixedInterestRate",
+    inheritance: ["Common"],
+    methods: [],
+    errors: [{ name: "InterestRateIsFixed", signature: "InterestRateIsFixed()", selector: "0x849d4eb8" }],
+  },
+
+  BondStorageWrapperKpiLinkedInterestRate: {
+    name: "BondStorageWrapperKpiLinkedInterestRate",
+    inheritance: ["BondStorageWrapperFixingDateInterestRate"],
+    methods: [],
+    errors: [{ name: "InterestRateIsKpiLinked", signature: "InterestRateIsKpiLinked()", selector: "0x68eba14f" }],
+  },
+
+  BondStorageWrapperSustainabilityPerformanceTargetInterestRate: {
+    name: "BondStorageWrapperSustainabilityPerformanceTargetInterestRate",
+    inheritance: ["KpisStorageWrapper"],
+    methods: [],
+    errors: [
+      {
+        name: "InterestRateIsSustainabilityPerformanceTarget",
+        signature: "InterestRateIsSustainabilityPerformanceTarget()",
+        selector: "0x15a15b0a",
+      },
     ],
   },
 
@@ -2322,6 +2649,11 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
         selector: "0xcdef9970",
       },
       { name: "_getCorporateActionData", signature: "_getCorporateActionData(bytes32)", selector: "0x1b957d68" },
+      {
+        name: "_getCorporateActionIdByTypeIndex",
+        signature: "_getCorporateActionIdByTypeIndex(bytes32,uint256)",
+        selector: "0xe7268f50",
+      },
       { name: "_getCorporateActionIds", signature: "_getCorporateActionIds(uint256,uint256)", selector: "0x27b71643" },
       {
         name: "_getCorporateActionIdsByType",
@@ -2339,6 +2671,11 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
         selector: "0x136c8ba2",
       },
       { name: "_getUintResultAt", signature: "_getUintResultAt(bytes32,uint256)", selector: "0xcef779ad" },
+      {
+        name: "_updateCorporateActionData",
+        signature: "_updateCorporateActionData(bytes32,bytes)",
+        selector: "0x56c29fb9",
+      },
       {
         name: "_updateCorporateActionResult",
         signature: "_updateCorporateActionResult(bytes32,uint256,bytes)",
@@ -2383,13 +2720,9 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
       { name: "_getVotingCount", signature: "_getVotingCount()", selector: "0x76255491" },
       { name: "_getVotingFor", signature: "_getVotingFor(uint256,address)", selector: "0xe43142ce" },
       { name: "_getVotingHolders", signature: "_getVotingHolders(uint256,uint256,uint256)", selector: "0x60b33e03" },
-      {
-        name: "_initBalanceAdjustment",
-        signature: "_initBalanceAdjustment(bool,bytes32,bytes)",
-        selector: "0x4910464f",
-      },
-      { name: "_initDividend", signature: "_initDividend(bool,bytes32,bytes)", selector: "0x89c22cef" },
-      { name: "_initVotingRights", signature: "_initVotingRights(bool,bytes32,bytes)", selector: "0xdd9c8705" },
+      { name: "_initBalanceAdjustment", signature: "_initBalanceAdjustment(bytes32,bytes)", selector: "0x1e2ad860" },
+      { name: "_initDividend", signature: "_initDividend(bytes32,bytes)", selector: "0xe3abd55c" },
+      { name: "_initVotingRights", signature: "_initVotingRights(bytes32,bytes)", selector: "0xdac55178" },
       { name: "_setDividends", signature: "_setDividends(IEquity.Dividend)", selector: "0x1433fb7c" },
       {
         name: "_setScheduledBalanceAdjustment",
@@ -2657,11 +2990,6 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
         selector: "0x0a26c25f",
       },
       { name: "_checkpoints", signature: "_checkpoints(address,uint256)", selector: "0x9d654e74" },
-      {
-        name: "_checkpointsLookup",
-        signature: "_checkpointsLookup(IERC20Votes.Checkpoint[],uint256)",
-        selector: "0x86a272a4",
-      },
       { name: "_clock", signature: "_clock()", selector: "0x32bdbe3f" },
       { name: "_CLOCK_MODE", signature: "_CLOCK_MODE()", selector: "0xc980d5f5" },
       { name: "_delegate", signature: "_delegate(address)", selector: "0xf13101e9" },
@@ -2672,10 +3000,9 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
       { name: "_getVotes", signature: "_getVotes(address)", selector: "0xc6c66a0a" },
       {
         name: "_getVotesAdjusted",
-        signature: "_getVotesAdjusted(uint256,IERC20Votes.Checkpoint[])",
-        selector: "0x7ee325f3",
+        signature: "_getVotesAdjusted(uint256,CheckpointsLib.Checkpoint[])",
+        selector: "0x7b3bfd1d",
       },
-      { name: "_hashTypedDataV4", signature: "_hashTypedDataV4(bytes32)", selector: "0xc8f1ecd8" },
       { name: "_isActivated", signature: "_isActivated()", selector: "0x717cc228" },
       { name: "_moveVotingPower", signature: "_moveVotingPower(address,address,uint256)", selector: "0x82851b84" },
       { name: "_numCheckpoints", signature: "_numCheckpoints(address)", selector: "0x51bc76cc" },
@@ -2684,8 +3011,8 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
       { name: "_takeAbafCheckpoint", signature: "_takeAbafCheckpoint()", selector: "0x3910625e" },
       {
         name: "_writeCheckpoint",
-        signature: "_writeCheckpoint(IERC20Votes.Checkpoint[],function(uint256,uint256)",
-        selector: "0xade2877a",
+        signature: "_writeCheckpoint(CheckpointsLib.Checkpoint[],function(uint256,uint256)",
+        selector: "0x419810fc",
       },
     ],
     events: [
@@ -2750,6 +3077,60 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
     methods: [{ name: "_isExternallyPaused", signature: "_isExternallyPaused()", selector: "0xb654e4bc" }],
   },
 
+  FixedRateStorageWrapper: {
+    name: "FixedRateStorageWrapper",
+    inheritance: ["SustainabilityPerformanceTargetRateStorageWrapper"],
+    methods: [
+      { name: "_fixedRateStorage", signature: "_fixedRateStorage()", selector: "0x7fb74df4" },
+      { name: "_getRate", signature: "_getRate()", selector: "0x94e10784" },
+      { name: "_setRate", signature: "_setRate(uint256,uint8)", selector: "0xece231ea" },
+    ],
+  },
+
+  KpiLinkedRateStorageWrapper: {
+    name: "KpiLinkedRateStorageWrapper",
+    inheritance: ["PauseStorageWrapper"],
+    methods: [
+      { name: "_getImpactData", signature: "_getImpactData()", selector: "0x3d12ba2c" },
+      { name: "_getInterestRate", signature: "_getInterestRate()", selector: "0x88366f9a" },
+      { name: "_getKpiOracle", signature: "_getKpiOracle()", selector: "0xd5877b0c" },
+      { name: "_kpiLinkedRateStorage", signature: "_kpiLinkedRateStorage()", selector: "0x16761626" },
+      { name: "_setImpactData", signature: "_setImpactData(IKpiLinkedRate.ImpactData)", selector: "0xf073c118" },
+      { name: "_setInterestRate", signature: "_setInterestRate(IKpiLinkedRate.InterestRate)", selector: "0x13b3a045" },
+      { name: "_setKpiOracle", signature: "_setKpiOracle(address)", selector: "0xe9f6e413" },
+      {
+        name: "_triggerScheduledCrossOrderedTasks",
+        signature: "_triggerScheduledCrossOrderedTasks(uint256)",
+        selector: "0xa3608e20",
+      },
+    ],
+  },
+
+  KpisStorageWrapper: {
+    name: "KpisStorageWrapper",
+    inheritance: ["BondStorageWrapperFixingDateInterestRate"],
+    methods: [
+      { name: "_addKpiData", signature: "_addKpiData(uint256,uint256,address)", selector: "0xb645ae9f" },
+      { name: "_addToCouponsOrderedList", signature: "_addToCouponsOrderedList(uint256)", selector: "0x17a345a0" },
+      { name: "_getLatestKpiData", signature: "_getLatestKpiData(uint256,uint256,address)", selector: "0x37f6c9cd" },
+      { name: "_getMinDateAdjusted", signature: "_getMinDateAdjusted()", selector: "0x88652963" },
+      { name: "_isCheckpointDate", signature: "_isCheckpointDate(uint256,address)", selector: "0x6b1af257" },
+      { name: "_kpisDataStorage", signature: "_kpisDataStorage()", selector: "0x6be9c949" },
+      {
+        name: "_overwriteKpiData",
+        signature: "_overwriteKpiData(CheckpointsLib.Checkpoint[],uint256,uint256,uint256)",
+        selector: "0xe67b61c2",
+      },
+      {
+        name: "_pushKpiData",
+        signature: "_pushKpiData(CheckpointsLib.Checkpoint[],uint256,uint256)",
+        selector: "0xb0a489a0",
+      },
+      { name: "_setCheckpointDate", signature: "_setCheckpointDate(uint256,address)", selector: "0xdc837d51" },
+      { name: "_setMinDate", signature: "_setMinDate(uint256)", selector: "0x93d61f50" },
+    ],
+  },
+
   KycStorageWrapper: {
     name: "KycStorageWrapper",
     inheritance: ["ExternalKycListManagementStorageWrapper"],
@@ -2795,6 +3176,8 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
     methods: [
       { name: "_addProceedRecipient", signature: "_addProceedRecipient(address,bytes)", selector: "0x9fd61d20" },
       { name: "_getProceedRecipientData", signature: "_getProceedRecipientData(address)", selector: "0x36ec9fbe" },
+      { name: "_getProceedRecipientsCount", signature: "_getProceedRecipientsCount()", selector: "0x29b5ccc8" },
+      { name: "_isProceedRecipient", signature: "_isProceedRecipient(address)", selector: "0x1d905e31" },
       { name: "_proceedRecipientsDataStorage", signature: "_proceedRecipientsDataStorage()", selector: "0xd6abf4ee" },
       { name: "_removeProceedRecipient", signature: "_removeProceedRecipient(address)", selector: "0x8761abcc" },
       {
@@ -2889,7 +3272,7 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
 
   ScheduledBalanceAdjustmentsStorageWrapper: {
     name: "ScheduledBalanceAdjustmentsStorageWrapper",
-    inheritance: ["ScheduledSnapshotsStorageWrapper"],
+    inheritance: ["ScheduledCouponListingStorageWrapper"],
     methods: [
       {
         name: "_addScheduledBalanceAdjustment",
@@ -2930,6 +3313,51 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
     ],
   },
 
+  ScheduledCouponListingStorageWrapper: {
+    name: "ScheduledCouponListingStorageWrapper",
+    inheritance: ["ScheduledSnapshotsStorageWrapper"],
+    methods: [
+      {
+        name: "_addScheduledCouponListing",
+        signature: "_addScheduledCouponListing(uint256,bytes)",
+        selector: "0x38b080c0",
+      },
+      { name: "_addToCouponsOrderedList", signature: "_addToCouponsOrderedList(uint256)", selector: "0x17a345a0" },
+      { name: "_getCouponsOrderedListTotal", signature: "_getCouponsOrderedListTotal()", selector: "0xe92862c4" },
+      {
+        name: "_getPendingScheduledCouponListingTotalAt",
+        signature: "_getPendingScheduledCouponListingTotalAt(uint256)",
+        selector: "0x9c71b9c8",
+      },
+      {
+        name: "_getScheduledCouponListing",
+        signature: "_getScheduledCouponListing(uint256,uint256)",
+        selector: "0x540bf600",
+      },
+      {
+        name: "_getScheduledCouponListingCount",
+        signature: "_getScheduledCouponListingCount()",
+        selector: "0x96a18819",
+      },
+      {
+        name: "_getScheduledCouponListingIdAtIndex",
+        signature: "_getScheduledCouponListingIdAtIndex(uint256)",
+        selector: "0xc543c282",
+      },
+      {
+        name: "_onScheduledCouponListingTriggered",
+        signature: "_onScheduledCouponListingTriggered(uint256,uint256,ScheduledTask)",
+        selector: "0xb3282a32",
+      },
+      { name: "_scheduledCouponListingStorage", signature: "_scheduledCouponListingStorage()", selector: "0x1fb7ab0b" },
+      {
+        name: "_triggerScheduledCouponListing",
+        signature: "_triggerScheduledCouponListing(uint256)",
+        selector: "0x9fd6c988",
+      },
+    ],
+  },
+
   ScheduledCrossOrderedTasksStorageWrapper: {
     name: "ScheduledCrossOrderedTasksStorageWrapper",
     inheritance: ["ScheduledBalanceAdjustmentsStorageWrapper"],
@@ -3023,6 +3451,30 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
     ],
   },
 
+  SustainabilityPerformanceTargetRateStorageWrapper: {
+    name: "SustainabilityPerformanceTargetRateStorageWrapper",
+    inheritance: ["KpiLinkedRateStorageWrapper"],
+    methods: [
+      { name: "_getSPTImpactDataFor", signature: "_getSPTImpactDataFor(address)", selector: "0xdd4f254a" },
+      { name: "_getSPTInterestRate", signature: "_getSPTInterestRate()", selector: "0x839cfe94" },
+      {
+        name: "_setSPTImpactData",
+        signature: "_setSPTImpactData(ISustainabilityPerformanceTargetRate.ImpactData,address)",
+        selector: "0xd2b995c6",
+      },
+      {
+        name: "_setSPTInterestRate",
+        signature: "_setSPTInterestRate(ISustainabilityPerformanceTargetRate.InterestRate)",
+        selector: "0x0e30e08a",
+      },
+      {
+        name: "_sustainabilityPerformanceTargetRateStorage",
+        signature: "_sustainabilityPerformanceTargetRateStorage()",
+        selector: "0x51bdde97",
+      },
+    ],
+  },
+
   TimeTravelStorageWrapper: {
     name: "TimeTravelStorageWrapper",
     inheritance: ["ITimeTravelStorageWrapper", "LocalContext"],
@@ -3039,7 +3491,7 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
 
   TotalBalancesStorageWrapper: {
     name: "TotalBalancesStorageWrapper",
-    inheritance: ["PauseStorageWrapper"],
+    inheritance: ["FixedRateStorageWrapper"],
     methods: [
       { name: "_getTotalBalance", signature: "_getTotalBalance(address)", selector: "0xc5930def" },
       {
@@ -3109,7 +3561,7 @@ export const STORAGE_WRAPPER_REGISTRY: Record<string, StorageWrapperDefinition>
 /**
  * Total number of storage wrapper contracts in the registry.
  */
-export const TOTAL_STORAGE_WRAPPERS = 29 as const;
+export const TOTAL_STORAGE_WRAPPERS = 37 as const;
 
 /**
  * All role identifiers extracted from contracts.
@@ -3128,8 +3580,10 @@ export const ROLES = {
   _DEFAULT_ADMIN_ROLE: "0x0000000000000000000000000000000000000000000000000000000000000000",
   _DOCUMENTER_ROLE: "0x83ace103a76d3729b4ba1350ad27522bbcda9a1a589d1e5091f443e76abccf41",
   _FREEZE_MANAGER_ROLE: "0xd0e5294c1fc630933e135c5b668c5d577576754d33964d700bbbcdbfd7e1361b",
+  _INTEREST_RATE_MANAGER_ROLE: "0xa174f099c94c902831d8b8a07810700505da86a76ea0bcb7629884ef26cf682e",
   _INTERNAL_KYC_MANAGER_ROLE: "0x3916c5c9e68488134c2ee70660332559707c133d0a295a25971da4085441522e",
   _ISSUER_ROLE: "0x4be32e8849414d19186807008dabd451c1d87dae5f8e22f32f5ce94d486da842",
+  _KPI_MANAGER_ROLE: "0x441e549cc2c88d01fa80bd9e7b40412d3106214149223501aa25d4fa23bf306d",
   _KYC_MANAGER_ROLE: "0x8ebae577938c1afa7fb3dc7b06459c79c86ffd2ac9805b6da92ee4cbbf080449",
   _KYC_ROLE: "0x6fbd421e041603fa367357d79ffc3b2f9fd37a6fc4eec661aa5537a9ae75f93d",
   _LOCKER_ROLE: "0xd8aa8c6f92fe8ac3f3c0f88216e25f7c08b3a6c374b4452a04d200c29786ce88",
@@ -3148,4 +3602,4 @@ export const ROLES = {
 /**
  * Total number of unique roles in the registry.
  */
-export const TOTAL_ROLES = 28 as const;
+export const TOTAL_ROLES = 30 as const;
diff --git a/packages/ats/contracts/scripts/domain/bond/createConfiguration.ts b/packages/ats/contracts/scripts/domain/bond/createConfiguration.ts
index 4443fadc9..14466fe9d 100644
--- a/packages/ats/contracts/scripts/domain/bond/createConfiguration.ts
+++ b/packages/ats/contracts/scripts/domain/bond/createConfiguration.ts
@@ -83,6 +83,7 @@ const BOND_FACETS = [
   "ProtectedPartitionsFacet",
   "ScheduledBalanceAdjustmentsFacet",
   "ScheduledCrossOrderedTasksFacet",
+  "ScheduledCouponListingFacet",
   "ScheduledSnapshotsFacet",
   "SsiManagementFacet",
   "TransferAndLockFacet",
diff --git a/packages/ats/contracts/scripts/domain/bondFixedRate/createConfiguration.ts b/packages/ats/contracts/scripts/domain/bondFixedRate/createConfiguration.ts
new file mode 100644
index 000000000..7754ac9a5
--- /dev/null
+++ b/packages/ats/contracts/scripts/domain/bondFixedRate/createConfiguration.ts
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Bond token configuration module.
+ *
+ * Creates bond token configuration in BusinessLogicResolver by calling
+ * the generic infrastructure operation with bond-specific facet list and config ID.
+ *
+ * This is a thin wrapper around the generic createConfiguration() operation,
+ * providing bond-specific facet list and configuration ID.
+ *
+ * @module domain/bondFixedRate/createConfiguration
+ */
+
+import { Contract } from "ethers";
+import {
+  ConfigurationData,
+  ConfigurationError,
+  createBatchConfiguration,
+  OperationResult,
+  DEFAULT_BATCH_SIZE,
+} from "@scripts/infrastructure";
+import { BOND_FIXED_RATE_CONFIG_ID, atsRegistry } from "@scripts/domain";
+
+/**
+ * Bond-specific facets list (41 facets total).
+ *
+ * This is an explicit positive list of all facets required for bond tokens.
+ * Includes all common facets plus BondUSAFacet (NOT EquityUSAFacet).
+ *
+ * Note: DiamondFacet combines DiamondCutFacet + DiamondLoupeFacet functionality,
+ * so we only include DiamondFacet to avoid selector collisions.
+ *
+ * Updated to match origin/develop feature parity (all facets registered).
+ */
+const BOND_FIXED_RATE_FACETS = [
+  // Core Functionality (10 - DiamondFacet combines DiamondCutFacet + DiamondLoupeFacet)
+  "AccessControlFacet",
+  "CapFacet",
+  "ControlListFacet",
+  "CorporateActionsFacet",
+  "DiamondFacet", // Combined: includes DiamondCutFacet + DiamondLoupeFacet functionality
+  "ERC20Facet",
+  "FreezeFacet",
+  "KycFacet",
+  "PauseFacet",
+  "SnapshotsFacet",
+
+  // ERC Standards
+  "ERC1410IssuerFacet",
+  "ERC1410ManagementFacet",
+  "ERC1410ReadFacet",
+  "ERC1410TokenHolderFacet",
+  "ERC1594Facet",
+  "ERC1643Facet",
+  "ERC1644Facet",
+  "ERC20PermitFacet",
+  "ERC20VotesFacet",
+  "ERC3643BatchFacet",
+  "ERC3643ManagementFacet",
+  "ERC3643OperationsFacet",
+  "ERC3643ReadFacet",
+
+  // Clearing & Settlement
+  "ClearingActionsFacet",
+  "ClearingHoldCreationFacet",
+  "ClearingReadFacet",
+  "ClearingRedeemFacet",
+  "ClearingTransferFacet",
+  "HoldManagementFacet",
+  "HoldReadFacet",
+  "HoldTokenHolderFacet",
+
+  // External Management
+  "ExternalControlListManagementFacet",
+  "ExternalKycListManagementFacet",
+  "ExternalPauseManagementFacet",
+
+  // Advanced Features
+  "AdjustBalancesFacet",
+  "LockFacet",
+  "ProceedRecipientsFacet",
+  "ProtectedPartitionsFacet",
+  "ScheduledBalanceAdjustmentsFacet",
+  "ScheduledCrossOrderedTasksFacet",
+  "ScheduledCouponListingFacet",
+  "ScheduledSnapshotsFacet",
+  "SsiManagementFacet",
+  "TransferAndLockFacet",
+
+  //Interest Rate
+  "FixedRateFacet",
+
+  // Jurisdiction-Specific
+  "BondUSAFixedRateFacet",
+  "BondUSAReadFacet",
+] as const;
+
+/**
+ * Create bond token configuration in BusinessLogicResolver.
+ *
+ * Thin wrapper that calls the generic core operation with bond-specific data:
+ * - Configuration ID: BOND_CONFIG_ID
+ * - Facet list: BOND_FACETS (43 facets)
+ *
+ * All implementation logic is handled by the generic createConfiguration()
+ * operation in core/operations/blrConfigurations.ts.
+ *
+ * @param blrContract - BusinessLogicResolver contract instance
+ * @param facetAddresses - Map of facet names to their deployed addresses
+ * @param useTimeTravel - Whether to use TimeTravel variants (default: false)
+ * @param partialBatchDeploy - Whether this is a partial batch deployment (default: false)
+ * @param batchSize - Number of facets per batch (default: DEFAULT_BATCH_SIZE)
+ * @param confirmations - Number of confirmations to wait for (default: 0 for test environments)
+ * @returns Promise resolving to operation result
+ *
+ * @example
+ * ```typescript
+ * import { BusinessLogicResolver__factory } from '@contract-types'
+ *
+ * // Get BLR contract instance
+ * const blr = BusinessLogicResolver__factory.connect('0x1234...', signer)
+ *
+ * // Create bond configuration
+ * const result = await createBondConfiguration(
+ *     blr,
+ *     {
+ *         'AccessControlFacet': '0xabc...',
+ *         'BondUSAFacet': '0xdef...',
+ *         // ... more facets
+ *     },
+ *     false,
+ *     false,
+ *     15,
+ *     0
+ * )
+ *
+ * if (result.success) {
+ *   console.log(`Bond config version: ${result.data.version}`)
+ *   console.log(`Registered ${result.data.facetKeys.length} facets`)
+ * } else {
+ *   console.error(`Failed: ${result.error} - ${result.message}`)
+ * }
+ * ```
+ */
+export async function createBondFixedRateConfiguration(
+  blrContract: Contract,
+  facetAddresses: Record<string, string>,
+  useTimeTravel: boolean = false,
+  partialBatchDeploy: boolean = false,
+  batchSize: number = DEFAULT_BATCH_SIZE,
+  confirmations: number = 0,
+): Promise<OperationResult<ConfigurationData, ConfigurationError>> {
+  // Get facet names based on time travel mode
+  // Include TimeTravelFacet when useTimeTravel=true to provide time manipulation functions
+  const baseFacets = useTimeTravel ? [...BOND_FIXED_RATE_FACETS, "TimeTravelFacet"] : BOND_FIXED_RATE_FACETS;
+
+  const facetNames = useTimeTravel
+    ? baseFacets.map((name) => (name === "TimeTravelFacet" || name.endsWith("TimeTravel") ? name : `${name}TimeTravel`))
+    : baseFacets;
+
+  // Build facet data with resolver keys from registry
+  const facets = facetNames.map((name) => {
+    // Strip "TimeTravel" suffix to get base name for registry lookup
+    const baseName = name.replace(/TimeTravel$/, "");
+
+    const facetDef = atsRegistry.getFacetDefinition(baseName);
+    if (!facetDef?.resolverKey?.value) {
+      throw new Error(`No resolver key found for facet: ${baseName}`);
+    }
+    return {
+      facetName: name,
+      resolverKey: facetDef.resolverKey.value,
+      address: facetAddresses[name],
+    };
+  });
+
+  return createBatchConfiguration(blrContract, {
+    configurationId: BOND_FIXED_RATE_CONFIG_ID,
+    facets,
+    partialBatchDeploy,
+    batchSize,
+    confirmations,
+  });
+}
diff --git a/packages/ats/contracts/scripts/domain/bondKpiLinkedRate/createConfiguration.ts b/packages/ats/contracts/scripts/domain/bondKpiLinkedRate/createConfiguration.ts
new file mode 100644
index 000000000..e6e78171d
--- /dev/null
+++ b/packages/ats/contracts/scripts/domain/bondKpiLinkedRate/createConfiguration.ts
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Bond token configuration module.
+ *
+ * Creates bond token configuration in BusinessLogicResolver by calling
+ * the generic infrastructure operation with bond-specific facet list and config ID.
+ *
+ * This is a thin wrapper around the generic createConfiguration() operation,
+ * providing bond-specific facet list and configuration ID.
+ *
+ * @module domain/bondKpiLinkedRate/createConfiguration
+ */
+
+import { Contract } from "ethers";
+import {
+  ConfigurationData,
+  ConfigurationError,
+  createBatchConfiguration,
+  OperationResult,
+  DEFAULT_BATCH_SIZE,
+} from "@scripts/infrastructure";
+import { BOND_KPI_LINKED_RATE_CONFIG_ID, atsRegistry } from "@scripts/domain";
+
+/**
+ * Bond-specific facets list (41 facets total).
+ *
+ * This is an explicit positive list of all facets required for bond tokens.
+ * Includes all common facets plus BondUSAFacet (NOT EquityUSAFacet).
+ *
+ * Note: DiamondFacet combines DiamondCutFacet + DiamondLoupeFacet functionality,
+ * so we only include DiamondFacet to avoid selector collisions.
+ *
+ * Updated to match origin/develop feature parity (all facets registered).
+ */
+const BOND_KPI_LINKED_RATE_FACETS = [
+  // Core Functionality (10 - DiamondFacet combines DiamondCutFacet + DiamondLoupeFacet)
+  "AccessControlFacet",
+  "CapFacet",
+  "ControlListFacet",
+  "CorporateActionsFacet",
+  "DiamondFacet", // Combined: includes DiamondCutFacet + DiamondLoupeFacet functionality
+  "ERC20Facet",
+  "FreezeFacet",
+  "KycFacet",
+  "PauseFacet",
+  "SnapshotsFacet",
+
+  // ERC Standards
+  "ERC1410IssuerFacet",
+  "ERC1410ManagementFacet",
+  "ERC1410ReadFacet",
+  "ERC1410TokenHolderFacet",
+  "ERC1594Facet",
+  "ERC1643Facet",
+  "ERC1644Facet",
+  "ERC20PermitFacet",
+  "ERC20VotesFacet",
+  "ERC3643BatchFacet",
+  "ERC3643ManagementFacet",
+  "ERC3643OperationsFacet",
+  "ERC3643ReadFacet",
+
+  // Clearing & Settlement
+  "ClearingActionsFacet",
+  "ClearingHoldCreationFacet",
+  "ClearingReadFacet",
+  "ClearingRedeemFacet",
+  "ClearingTransferFacet",
+  "HoldManagementFacet",
+  "HoldReadFacet",
+  "HoldTokenHolderFacet",
+
+  // External Management
+  "ExternalControlListManagementFacet",
+  "ExternalKycListManagementFacet",
+  "ExternalPauseManagementFacet",
+
+  // Advanced Features
+  "AdjustBalancesFacet",
+  "LockFacet",
+  "ProceedRecipientsFacet",
+  "ProtectedPartitionsFacet",
+  "ScheduledBalanceAdjustmentsFacet",
+  "ScheduledCrossOrderedTasksFacet",
+  "ScheduledCouponListingFacet",
+  "ScheduledSnapshotsFacet",
+  "SsiManagementFacet",
+  "TransferAndLockFacet",
+
+  //Interest Rate
+  "KpiLinkedRateFacet",
+
+  // Jurisdiction-Specific
+  "BondUSAKpiLinkedRateFacet",
+  "BondUSAKpiLinkedReadFacet",
+] as const;
+
+/**
+ * Create bond token configuration in BusinessLogicResolver.
+ *
+ * Thin wrapper that calls the generic core operation with bond-specific data:
+ * - Configuration ID: BOND_CONFIG_ID
+ * - Facet list: BOND_FACETS (43 facets)
+ *
+ * All implementation logic is handled by the generic createConfiguration()
+ * operation in core/operations/blrConfigurations.ts.
+ *
+ * @param blrContract - BusinessLogicResolver contract instance
+ * @param facetAddresses - Map of facet names to their deployed addresses
+ * @param useTimeTravel - Whether to use TimeTravel variants (default: false)
+ * @param partialBatchDeploy - Whether this is a partial batch deployment (default: false)
+ * @param batchSize - Number of facets per batch (default: DEFAULT_BATCH_SIZE)
+ * @param confirmations - Number of confirmations to wait for (default: 0 for test environments)
+ * @returns Promise resolving to operation result
+ *
+ * @example
+ * ```typescript
+ * import { BusinessLogicResolver__factory } from '@contract-types'
+ *
+ * // Get BLR contract instance
+ * const blr = BusinessLogicResolver__factory.connect('0x1234...', signer)
+ *
+ * // Create bond configuration
+ * const result = await createBondConfiguration(
+ *     blr,
+ *     {
+ *         'AccessControlFacet': '0xabc...',
+ *         'BondUSAFacet': '0xdef...',
+ *         // ... more facets
+ *     },
+ *     false,
+ *     false,
+ *     15,
+ *     0
+ * )
+ *
+ * if (result.success) {
+ *   console.log(`Bond config version: ${result.data.version}`)
+ *   console.log(`Registered ${result.data.facetKeys.length} facets`)
+ * } else {
+ *   console.error(`Failed: ${result.error} - ${result.message}`)
+ * }
+ * ```
+ */
+export async function createBondKpiLinkedRateConfiguration(
+  blrContract: Contract,
+  facetAddresses: Record<string, string>,
+  useTimeTravel: boolean = false,
+  partialBatchDeploy: boolean = false,
+  batchSize: number = DEFAULT_BATCH_SIZE,
+  confirmations: number = 0,
+): Promise<OperationResult<ConfigurationData, ConfigurationError>> {
+  // Get facet names based on time travel mode
+  // Include TimeTravelFacet when useTimeTravel=true to provide time manipulation functions
+  const baseFacets = useTimeTravel ? [...BOND_KPI_LINKED_RATE_FACETS, "TimeTravelFacet"] : BOND_KPI_LINKED_RATE_FACETS;
+
+  const facetNames = useTimeTravel
+    ? baseFacets.map((name) => (name === "TimeTravelFacet" || name.endsWith("TimeTravel") ? name : `${name}TimeTravel`))
+    : baseFacets;
+
+  // Build facet data with resolver keys from registry
+  const facets = facetNames.map((name) => {
+    // Strip "TimeTravel" suffix to get base name for registry lookup
+    const baseName = name.replace(/TimeTravel$/, "");
+
+    const facetDef = atsRegistry.getFacetDefinition(baseName);
+    if (!facetDef?.resolverKey?.value) {
+      throw new Error(`No resolver key found for facet: ${baseName}`);
+    }
+    return {
+      facetName: name,
+      resolverKey: facetDef.resolverKey.value,
+      address: facetAddresses[name],
+    };
+  });
+
+  return createBatchConfiguration(blrContract, {
+    configurationId: BOND_KPI_LINKED_RATE_CONFIG_ID,
+    facets,
+    partialBatchDeploy,
+    batchSize,
+    confirmations,
+  });
+}
diff --git a/packages/ats/contracts/scripts/domain/constants.ts b/packages/ats/contracts/scripts/domain/constants.ts
index d2b382da8..9d765bb4d 100644
--- a/packages/ats/contracts/scripts/domain/constants.ts
+++ b/packages/ats/contracts/scripts/domain/constants.ts
@@ -25,13 +25,29 @@
 export const EQUITY_CONFIG_ID = "0x0000000000000000000000000000000000000000000000000000000000000001";
 
 /**
- * Bond configuration ID.
+ * Bond Variable Rate configuration ID.
  *
  * bytes32(uint256(2)) = 0x00...02
- * Used by BusinessLogicResolver to identify bond facet configuration.
+ * Used by BusinessLogicResolver to identify bond variable rate facet configuration.
  */
 export const BOND_CONFIG_ID = "0x0000000000000000000000000000000000000000000000000000000000000002";
 
+/**
+ * Bond Fixed Rate configuration ID.
+ *
+ * bytes32(uint256(3)) = 0x00...03
+ * Used by BusinessLogicResolver to identify bond fixed rate facet configuration.
+ */
+export const BOND_FIXED_RATE_CONFIG_ID = "0x0000000000000000000000000000000000000000000000000000000000000003";
+
+/**
+ * Bond Kpi Linked Rate configuration ID.
+ *
+ * bytes32(uint256(3)) = 0x00...04
+ * Used by BusinessLogicResolver to identify bond kpi linked rate facet configuration.
+ */
+export const BOND_KPI_LINKED_RATE_CONFIG_ID = "0x0000000000000000000000000000000000000000000000000000000000000004";
+
 // ============================================================================
 // ATS-Specific Contract Names
 // ============================================================================
diff --git a/packages/ats/contracts/scripts/domain/factory/deployBondFixedRateToken.ts b/packages/ats/contracts/scripts/domain/factory/deployBondFixedRateToken.ts
new file mode 100644
index 000000000..062be40e4
--- /dev/null
+++ b/packages/ats/contracts/scripts/domain/factory/deployBondFixedRateToken.ts
@@ -0,0 +1,175 @@
+import { ethers } from "ethers";
+import type { ResolverProxy } from "@contract-types";
+import { ResolverProxy__factory } from "@contract-types";
+import { GAS_LIMIT } from "@scripts/infrastructure";
+import {
+  ATS_ROLES,
+  BOND_FIXED_RATE_CONFIG_ID,
+  DeployBondFromFactoryParams,
+  FactoryRegulationDataParams,
+  Rbac,
+} from "@scripts/domain";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface FixedRateParams {
+  rate: number;
+  rateDecimals: number;
+}
+
+// ============================================================================
+// Main Functions
+// ============================================================================
+
+/**
+ * Deploy a bond token using the Factory contract.
+ *
+ * This function constructs the required data structures and calls the factory's
+ * deployBond method to create a new bond token with a diamond proxy.
+ *
+ * @param bondData - Bond deployment parameters
+ * @returns Deployed ResolverProxy (diamond) contract instance
+ *
+ * @example
+ * ```typescript
+ * const bond = await deployBondFromFactory({
+ *   adminAccount: deployer.address,
+ *   isWhiteList: true,
+ *   isControllable: true,
+ *   isMultiPartition: false,
+ *   name: 'My Bond',
+ *   symbol: 'MBND',
+ *   decimals: 18,
+ *   isin: 'US0378331005',
+ *   votingRight: true,
+ *   // ... other params
+ *   regulationType: RegulationType.REG_S,
+ *   regulationSubType: RegulationSubType.NONE,
+ *   factory: factoryContract,
+ *   businessLogicResolver: blrAddress,
+ * });
+ * ```
+ */
+export async function deployBondFixedRateFromFactory(
+  bondDataParams: DeployBondFromFactoryParams,
+  regulationTypeParams: FactoryRegulationDataParams,
+  fixedRate: FixedRateParams,
+): Promise<ResolverProxy> {
+  const {
+    factory,
+    adminAccount,
+    securityData: securityDataParams,
+    bondDetails: bondDetailsParams,
+    proceedRecipients,
+    proceedRecipientsData,
+  } = bondDataParams;
+
+  const { rate, rateDecimals } = fixedRate;
+
+  // Build RBAC array with admin
+  const rbacs: Rbac[] = [
+    {
+      role: ATS_ROLES._DEFAULT_ADMIN_ROLE,
+      members: [adminAccount],
+    },
+    ...securityDataParams.rbacs,
+  ];
+
+  // Build resolver proxy configuration
+  const resolverProxyConfiguration = {
+    key: BOND_FIXED_RATE_CONFIG_ID,
+    version: 1,
+  };
+
+  // Build security data structure
+  const securityData = {
+    arePartitionsProtected: securityDataParams.arePartitionsProtected,
+    isMultiPartition: securityDataParams.isMultiPartition,
+    resolver: securityDataParams.resolver,
+    resolverProxyConfiguration,
+    rbacs,
+    isControllable: securityDataParams.isControllable,
+    isWhiteList: securityDataParams.isWhiteList,
+    maxSupply: securityDataParams.maxSupply,
+    erc20MetadataInfo: {
+      name: securityDataParams.erc20MetadataInfo.name,
+      symbol: securityDataParams.erc20MetadataInfo.symbol,
+      isin: securityDataParams.erc20MetadataInfo.isin,
+      decimals: securityDataParams.erc20MetadataInfo.decimals,
+    },
+    clearingActive: securityDataParams.clearingActive,
+    internalKycActivated: securityDataParams.internalKycActivated,
+    erc20VotesActivated: securityDataParams.erc20VotesActivated,
+    externalPauses: securityDataParams.externalPauses,
+    externalControlLists: securityDataParams.externalControlLists,
+    externalKycLists: securityDataParams.externalKycLists,
+    compliance: securityDataParams.compliance,
+    identityRegistry: securityDataParams.identityRegistry,
+  };
+
+  // Build bond details structure
+  const bondDetails = {
+    currency: bondDetailsParams.currency,
+    nominalValue: bondDetailsParams.nominalValue,
+    nominalValueDecimals: bondDetailsParams.nominalValueDecimals,
+    startingDate: bondDetailsParams.startingDate || Math.floor(Date.now() / 1000),
+    maturityDate: bondDetailsParams.maturityDate || 0,
+  };
+
+  // Build bond data
+  const bondData = {
+    security: securityData,
+    bondDetails,
+    proceedRecipients: proceedRecipients,
+    proceedRecipientsData: proceedRecipientsData,
+  };
+
+  // Build regulation data
+  const factoryRegulationData = {
+    regulationType: regulationTypeParams.regulationType,
+    regulationSubType: regulationTypeParams.regulationSubType,
+    additionalSecurityData: {
+      countriesControlListType: regulationTypeParams.additionalSecurityData.countriesControlListType,
+      listOfCountries: regulationTypeParams.additionalSecurityData.listOfCountries,
+      info: regulationTypeParams.additionalSecurityData.info,
+    },
+  };
+
+  const fixedRateData = {
+    rate: rate,
+    rateDecimals: rateDecimals,
+  };
+
+  const bondFixedRateData = {
+    bondData: bondData,
+    factoryRegulationData: factoryRegulationData,
+    fixedRateData: fixedRateData,
+  };
+
+  // Deploy bond token via factory
+  const tx = await factory.deployBondFixedRate(bondFixedRateData, {
+    gasLimit: GAS_LIMIT.high,
+  });
+  const receipt = await tx.wait();
+
+  // Find BondDeployed event to get diamond address
+  const event = receipt.events?.find((e) => e.event === "BondFixedRateDeployed");
+  if (!event || !event.args) {
+    throw new Error(
+      `BondFixedRateDeployed event not found in deployment transaction. Events: ${JSON.stringify(
+        receipt.events?.map((e) => e.event),
+      )}`,
+    );
+  }
+
+  const diamondAddress = event.args.diamondProxyAddress || event.args[1];
+
+  if (!diamondAddress || diamondAddress === ethers.constants.AddressZero) {
+    throw new Error(`Invalid diamond address from event. Args: ${JSON.stringify(event.args)}`);
+  }
+
+  // Return diamond proxy as ResolverProxy contract
+  return ResolverProxy__factory.connect(diamondAddress, factory.signer);
+}
diff --git a/packages/ats/contracts/scripts/domain/factory/deployBondKpiLinkedRateToken.ts b/packages/ats/contracts/scripts/domain/factory/deployBondKpiLinkedRateToken.ts
new file mode 100644
index 000000000..0e30efc25
--- /dev/null
+++ b/packages/ats/contracts/scripts/domain/factory/deployBondKpiLinkedRateToken.ts
@@ -0,0 +1,186 @@
+import { ethers } from "ethers";
+import type { ResolverProxy } from "@contract-types";
+import { ResolverProxy__factory } from "@contract-types";
+import { GAS_LIMIT } from "@scripts/infrastructure";
+import {
+  ATS_ROLES,
+  BOND_KPI_LINKED_RATE_CONFIG_ID,
+  DeployBondFromFactoryParams,
+  FactoryRegulationDataParams,
+  Rbac,
+} from "@scripts/domain";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface InterestRateParams {
+  maxRate: number;
+  baseRate: number;
+  minRate: number;
+  startPeriod: number;
+  startRate: number;
+  missedPenalty: number;
+  reportPeriod: number;
+  rateDecimals: number;
+}
+
+export interface ImpactDataParams {
+  maxDeviationCap: number;
+  baseLine: number;
+  maxDeviationFloor: number;
+  impactDataDecimals: number;
+  adjustmentPrecision: number;
+}
+
+// ============================================================================
+// Main Functions
+// ============================================================================
+
+/**
+ * Deploy a bond token using the Factory contract.
+ *
+ * This function constructs the required data structures and calls the factory's
+ * deployBond method to create a new bond token with a diamond proxy.
+ *
+ * @param bondData - Bond deployment parameters
+ * @returns Deployed ResolverProxy (diamond) contract instance
+ *
+ * @example
+ * ```typescript
+ * const bond = await deployBondFromFactory({
+ *   adminAccount: deployer.address,
+ *   isWhiteList: true,
+ *   isControllable: true,
+ *   isMultiPartition: false,
+ *   name: 'My Bond',
+ *   symbol: 'MBND',
+ *   decimals: 18,
+ *   isin: 'US0378331005',
+ *   votingRight: true,
+ *   // ... other params
+ *   regulationType: RegulationType.REG_S,
+ *   regulationSubType: RegulationSubType.NONE,
+ *   factory: factoryContract,
+ *   businessLogicResolver: blrAddress,
+ * });
+ * ```
+ */
+export async function deployBondKpiLinkedRateFromFactory(
+  bondDataParams: DeployBondFromFactoryParams,
+  regulationTypeParams: FactoryRegulationDataParams,
+  interestRateParams: InterestRateParams,
+  impactDataParams: ImpactDataParams,
+  kpiOracle: string,
+): Promise<ResolverProxy> {
+  const {
+    factory,
+    adminAccount,
+    securityData: securityDataParams,
+    bondDetails: bondDetailsParams,
+    proceedRecipients,
+    proceedRecipientsData,
+  } = bondDataParams;
+
+  // Build RBAC array with admin
+  const rbacs: Rbac[] = [
+    {
+      role: ATS_ROLES._DEFAULT_ADMIN_ROLE,
+      members: [adminAccount],
+    },
+    ...securityDataParams.rbacs,
+  ];
+
+  // Build resolver proxy configuration
+  const resolverProxyConfiguration = {
+    key: BOND_KPI_LINKED_RATE_CONFIG_ID,
+    version: 1,
+  };
+
+  // Build security data structure
+  const securityData = {
+    arePartitionsProtected: securityDataParams.arePartitionsProtected,
+    isMultiPartition: securityDataParams.isMultiPartition,
+    resolver: securityDataParams.resolver,
+    resolverProxyConfiguration,
+    rbacs,
+    isControllable: securityDataParams.isControllable,
+    isWhiteList: securityDataParams.isWhiteList,
+    maxSupply: securityDataParams.maxSupply,
+    erc20MetadataInfo: {
+      name: securityDataParams.erc20MetadataInfo.name,
+      symbol: securityDataParams.erc20MetadataInfo.symbol,
+      isin: securityDataParams.erc20MetadataInfo.isin,
+      decimals: securityDataParams.erc20MetadataInfo.decimals,
+    },
+    clearingActive: securityDataParams.clearingActive,
+    internalKycActivated: securityDataParams.internalKycActivated,
+    erc20VotesActivated: securityDataParams.erc20VotesActivated,
+    externalPauses: securityDataParams.externalPauses,
+    externalControlLists: securityDataParams.externalControlLists,
+    externalKycLists: securityDataParams.externalKycLists,
+    compliance: securityDataParams.compliance,
+    identityRegistry: securityDataParams.identityRegistry,
+  };
+
+  // Build bond details structure
+  const bondDetails = {
+    currency: bondDetailsParams.currency,
+    nominalValue: bondDetailsParams.nominalValue,
+    nominalValueDecimals: bondDetailsParams.nominalValueDecimals,
+    startingDate: bondDetailsParams.startingDate || Math.floor(Date.now() / 1000),
+    maturityDate: bondDetailsParams.maturityDate || 0,
+  };
+
+  // Build bond data
+  const bondData = {
+    security: securityData,
+    bondDetails,
+    proceedRecipients: proceedRecipients,
+    proceedRecipientsData: proceedRecipientsData,
+  };
+
+  // Build regulation data
+  const factoryRegulationData = {
+    regulationType: regulationTypeParams.regulationType,
+    regulationSubType: regulationTypeParams.regulationSubType,
+    additionalSecurityData: {
+      countriesControlListType: regulationTypeParams.additionalSecurityData.countriesControlListType,
+      listOfCountries: regulationTypeParams.additionalSecurityData.listOfCountries,
+      info: regulationTypeParams.additionalSecurityData.info,
+    },
+  };
+
+  const bondKpiLinkedRateData = {
+    bondData: bondData,
+    factoryRegulationData: factoryRegulationData,
+    interestRate: interestRateParams,
+    impactData: impactDataParams,
+    kpiOracle,
+  };
+
+  // Deploy bond token via factory
+  const tx = await factory.deployBondKpiLinkedRate(bondKpiLinkedRateData, {
+    gasLimit: GAS_LIMIT.high,
+  });
+  const receipt = await tx.wait();
+
+  // Find BondDeployed event to get diamond address
+  const event = receipt.events?.find((e) => e.event === "BondKpiLinkedRateDeployed");
+  if (!event || !event.args) {
+    throw new Error(
+      `BondKpiLinkedRateDeployed event not found in deployment transaction. Events: ${JSON.stringify(
+        receipt.events?.map((e) => e.event),
+      )}`,
+    );
+  }
+
+  const diamondAddress = event.args.diamondProxyAddress || event.args[1];
+
+  if (!diamondAddress || diamondAddress === ethers.constants.AddressZero) {
+    throw new Error(`Invalid diamond address from event. Args: ${JSON.stringify(event.args)}`);
+  }
+
+  // Return diamond proxy as ResolverProxy contract
+  return ResolverProxy__factory.connect(diamondAddress, factory.signer);
+}
diff --git a/packages/ats/contracts/scripts/domain/factory/types.ts b/packages/ats/contracts/scripts/domain/factory/types.ts
index 614dd300c..fcb83ab85 100644
--- a/packages/ats/contracts/scripts/domain/factory/types.ts
+++ b/packages/ats/contracts/scripts/domain/factory/types.ts
@@ -97,6 +97,11 @@ export interface FactoryRegulationDataParams {
   };
 }
 
+export interface FixedRateDataParams {
+  rate: number;
+  rateDecimals: number;
+}
+
 export enum SecurityType {
   BOND = 0,
   EQUITY = 1,
diff --git a/packages/ats/contracts/scripts/domain/index.ts b/packages/ats/contracts/scripts/domain/index.ts
index 26c18e358..3b2ac76ea 100644
--- a/packages/ats/contracts/scripts/domain/index.ts
+++ b/packages/ats/contracts/scripts/domain/index.ts
@@ -33,12 +33,6 @@ export * from "./constants";
 // Domain registry (ATS-specific contract registry helpers)
 export * from "./atsRegistry";
 
-// Equity configuration
-export * from "./equity/createConfiguration";
-
-// Bond configuration
-export * from "./bond/createConfiguration";
-
 // Factory deployment and types
 export * from "./factory/deploy";
 export * from "./factory/types";
@@ -46,3 +40,17 @@ export * from "./factory/types";
 // Token deployment from factory
 export * from "./factory/deployEquityToken";
 export * from "./factory/deployBondToken";
+export * from "./factory/deployBondFixedRateToken";
+export * from "./factory/deployBondKpiLinkedRateToken";
+
+// Equity configuration
+export * from "./equity/createConfiguration";
+
+// Bond Variable Rate configuration
+export * from "./bond/createConfiguration";
+
+// Bond Fixed Rate configuration
+export * from "./bondFixedRate/createConfiguration";
+
+// Bond Kpi Linked Rate configuration
+export * from "./bondKpiLinkedRate/createConfiguration";
diff --git a/packages/ats/contracts/scripts/infrastructure/checkpoint/utils.ts b/packages/ats/contracts/scripts/infrastructure/checkpoint/utils.ts
index b56f1e0e7..3bb075548 100644
--- a/packages/ats/contracts/scripts/infrastructure/checkpoint/utils.ts
+++ b/packages/ats/contracts/scripts/infrastructure/checkpoint/utils.ts
@@ -45,7 +45,12 @@ export function checkpointToDeploymentOutput(checkpoint: DeploymentCheckpoint):
   if (!steps.facets || steps.facets.size === 0) {
     throw new Error("Checkpoint missing facet deployments");
   }
-  if (!steps.configurations?.equity || !steps.configurations?.bond) {
+  if (
+    !steps.configurations?.equity ||
+    !steps.configurations?.bond ||
+    !steps.configurations?.bondFixedRate ||
+    !steps.configurations?.bondKpiLinkedRate
+  ) {
     throw new Error("Checkpoint missing configurations");
   }
 
@@ -109,12 +114,24 @@ export function checkpointToDeploymentOutput(checkpoint: DeploymentCheckpoint):
         facetCount: steps.configurations.bond.facetCount,
         facets: [], // Will be populated in actual workflow
       },
+      bondFixedRate: {
+        configId: steps.configurations.bondFixedRate.configId,
+        version: steps.configurations.bondFixedRate.version,
+        facetCount: steps.configurations.bondFixedRate.facetCount,
+        facets: [], // Will be populated in actual workflow
+      },
+      bondKpiLinkedRate: {
+        configId: steps.configurations.bondKpiLinkedRate.configId,
+        version: steps.configurations.bondKpiLinkedRate.version,
+        facetCount: steps.configurations.bondKpiLinkedRate.facetCount,
+        facets: [], // Will be populated in actual workflow
+      },
     },
 
     summary: {
       totalContracts: 3 + steps.facets.size, // ProxyAdmin + BLR + Factory + facets
       totalFacets: steps.facets.size,
-      totalConfigurations: 2,
+      totalConfigurations: 3,
       deploymentTime: endTime - start,
       gasUsed: totalGasUsed.toString(),
       success: checkpoint.status === "completed",
@@ -123,6 +140,8 @@ export function checkpointToDeploymentOutput(checkpoint: DeploymentCheckpoint):
     helpers: {
       getEquityFacets: () => [],
       getBondFacets: () => [],
+      getBondFixedRateFacets: () => [],
+      getBondKpiLinkedRateFacets: () => [],
     },
   };
 }
@@ -158,6 +177,10 @@ export function getStepName(step: number, workflowType: "newBlr" | "existingBlr"
       case 5:
         return "Bond Configuration";
       case 6:
+        return "Bond Fixed Rate Configuration";
+      case 7:
+        return "Bond KpiLinked Rate Configuration";
+      case 8:
         return "Factory";
       default:
         return `Unknown Step ${step}`;
@@ -176,6 +199,10 @@ export function getStepName(step: number, workflowType: "newBlr" | "existingBlr"
       case 4:
         return "Bond Configuration";
       case 5:
+        return "Bond Fixed Rate Configuration";
+      case 6:
+        return "Bond KpiLinked Rate Configuration";
+      case 7:
         return "Factory";
       default:
         return `Unknown Step ${step}`;
@@ -190,7 +217,7 @@ export function getStepName(step: number, workflowType: "newBlr" | "existingBlr"
  * @returns Total number of steps
  */
 export function getTotalSteps(workflowType: "newBlr" | "existingBlr" = "newBlr"): number {
-  return workflowType === "newBlr" ? 7 : 6;
+  return workflowType === "newBlr" ? 8 : 7;
 }
 
 /**
diff --git a/packages/ats/contracts/scripts/infrastructure/types/checkpoint.ts b/packages/ats/contracts/scripts/infrastructure/types/checkpoint.ts
index a4da2082a..10150b748 100644
--- a/packages/ats/contracts/scripts/infrastructure/types/checkpoint.ts
+++ b/packages/ats/contracts/scripts/infrastructure/types/checkpoint.ts
@@ -139,6 +139,10 @@ export interface DeploymentCheckpoint {
       equity?: ConfigurationResult;
       /** Bond configuration */
       bond?: ConfigurationResult;
+      /** Bond Fixed Rate configuration */
+      bondFixedRate?: ConfigurationResult;
+      /** Bond KpiLinked Rate configuration */
+      bondKpiLinkedRate?: ConfigurationResult;
     };
 
     /** Factory deployment (step 6) */
diff --git a/packages/ats/contracts/scripts/workflows/deploySystemWithExistingBlr.ts b/packages/ats/contracts/scripts/workflows/deploySystemWithExistingBlr.ts
index a4019f661..2125f5d0f 100644
--- a/packages/ats/contracts/scripts/workflows/deploySystemWithExistingBlr.ts
+++ b/packages/ats/contracts/scripts/workflows/deploySystemWithExistingBlr.ts
@@ -37,7 +37,14 @@ import {
   toConfigurationData,
   convertCheckpointFacets,
 } from "@scripts/infrastructure";
-import { atsRegistry, deployFactory, createEquityConfiguration, createBondConfiguration } from "@scripts/domain";
+import {
+  atsRegistry,
+  deployFactory,
+  createEquityConfiguration,
+  createBondConfiguration,
+  createBondFixedRateConfiguration,
+  createBondKpiLinkedRateConfiguration,
+} from "@scripts/domain";
 
 import { promises as fs } from "fs";
 import { dirname } from "path";
@@ -107,6 +114,26 @@ export interface DeploymentWithExistingBlrOutput {
         address: string;
       }>;
     };
+    bondFixedRate: {
+      configId: string;
+      version: number;
+      facetCount: number;
+      facets: Array<{
+        facetName: string;
+        key: string;
+        address: string;
+      }>;
+    };
+    bondKpiLinkedRate: {
+      configId: string;
+      version: number;
+      facetCount: number;
+      facets: Array<{
+        facetName: string;
+        key: string;
+        address: string;
+      }>;
+    };
   };
 
   /** Deployment summary */
@@ -538,11 +565,18 @@ export async function deploySystemWithExistingBlr(
     // Steps 3 & 4: Create configurations (optional - controlled by createConfigurations flag)
     let equityConfig: Awaited<ReturnType<typeof createEquityConfiguration>> | undefined;
     let bondConfig: Awaited<ReturnType<typeof createBondConfiguration>> | undefined;
+    let bondFixedRateConfig: Awaited<ReturnType<typeof createBondFixedRateConfiguration>> | undefined;
+    let bondKpiLinkedRateConfig: Awaited<ReturnType<typeof createBondKpiLinkedRateConfiguration>> | undefined;
 
     if (shouldCreateConfigurations) {
       if (Object.keys(facetAddresses).length === 0) {
         info("\n⚠️  Step 5/6: Skipping configurations (no facets deployed)...");
-        skippedSteps.push("Equity configuration", "Bond configuration");
+        skippedSteps.push(
+          "Equity configuration",
+          "Bond configuration",
+          "Bond Fixed Rate configuration",
+          "Bond Kpi Linked Rate configuration",
+        );
       } else {
         // Get BLR contract instance
         const blrContract = BusinessLogicResolver__factory.connect(blrAddress, signer);
@@ -631,10 +665,101 @@ export async function deploySystemWithExistingBlr(
           checkpoint.currentStep = 4;
           await checkpointManager.saveCheckpoint(checkpoint);
         }
+
+        // Step 5: Create Bond Fixed Rate Configuration
+        if (checkpoint.steps.configurations?.bondFixedRate && checkpoint.currentStep >= 5) {
+          info("\n✓ Step 5b/6: Bond Fixed Rate configuration already created (resuming)");
+          const bondFixedRateConfigData = checkpoint.steps.configurations.bondFixedRate;
+          info(`✅ Bond Fixed Rate Config ID: ${bondFixedRateConfigData.configId}`);
+          info(`✅ Bond Fixed Rate Version: ${bondFixedRateConfigData.version}`);
+          info(`✅ Bond Fixed Rate Facets: ${bondFixedRateConfigData.facetCount}`);
+
+          // Use converter to reconstruct full ConfigurationData from checkpoint
+          bondFixedRateConfig = toConfigurationData(bondFixedRateConfigData);
+        } else {
+          info("\n🏦 Step 5b/6: Creating Bond Fixed Rate configuration...");
+
+          bondFixedRateConfig = await createBondFixedRateConfiguration(
+            blrContract,
+            facetAddresses,
+            useTimeTravel,
+            false,
+            batchSize,
+            confirmations,
+          );
+
+          if (!bondFixedRateConfig.success) {
+            throw new Error(
+              `Bond Fixed Rate config creation failed: ${bondFixedRateConfig.error} - ${bondFixedRateConfig.message}`,
+            );
+          }
+
+          info(`✅ Bond Fixed Rate Config ID: ${bondFixedRateConfig.data.configurationId}`);
+          info(`✅ Bond Fixed Rate Version: ${bondFixedRateConfig.data.version}`);
+          info(`✅ Bond Fixed Rate Facets: ${bondFixedRateConfig.data.facetKeys.length}`);
+
+          // Save checkpoint
+          checkpoint.steps.configurations!.bondFixedRate = {
+            configId: bondFixedRateConfig.data.configurationId,
+            version: bondFixedRateConfig.data.version,
+            facetCount: bondFixedRateConfig.data.facetKeys.length,
+            txHash: "",
+          };
+          checkpoint.currentStep = 5;
+          await checkpointManager.saveCheckpoint(checkpoint);
+        }
+
+        // Step 6: Create Bond KpiLinked Rate Configuration
+        if (checkpoint.steps.configurations?.bondKpiLinkedRate && checkpoint.currentStep >= 5) {
+          info("\n✓ Step 5b/6: Bond KpiLinked Rate configuration already created (resuming)");
+          const bondKpiLinkedRateConfigData = checkpoint.steps.configurations.bondKpiLinkedRate;
+          info(`✅ Bond KpiLinked Rate Config ID: ${bondKpiLinkedRateConfigData.configId}`);
+          info(`✅ Bond KpiLinked Rate Version: ${bondKpiLinkedRateConfigData.version}`);
+          info(`✅ Bond KpiLinked Rate Facets: ${bondKpiLinkedRateConfigData.facetCount}`);
+
+          // Use converter to reconstruct full ConfigurationData from checkpoint
+          bondKpiLinkedRateConfig = toConfigurationData(bondKpiLinkedRateConfigData);
+        } else {
+          info("\n🏦 Step 6b/7: Creating Bond configuration...");
+
+          bondKpiLinkedRateConfig = await createBondKpiLinkedRateConfiguration(
+            blrContract,
+            facetAddresses,
+            useTimeTravel,
+            false,
+            batchSize,
+            confirmations,
+          );
+
+          if (!bondKpiLinkedRateConfig.success) {
+            throw new Error(
+              `Bond KpiLinked Rate config creation failed: ${bondKpiLinkedRateConfig.error} - ${bondKpiLinkedRateConfig.message}`,
+            );
+          }
+
+          info(`✅ Bond KpiLinked Rate Config ID: ${bondKpiLinkedRateConfig.data.configurationId}`);
+          info(`✅ Bond KpiLinked Rate Version: ${bondKpiLinkedRateConfig.data.version}`);
+          info(`✅ Bond KpiLinked Rate Facets: ${bondKpiLinkedRateConfig.data.facetKeys.length}`);
+
+          // Save checkpoint
+          checkpoint.steps.configurations!.bondKpiLinkedRate = {
+            configId: bondKpiLinkedRateConfig.data.configurationId,
+            version: bondKpiLinkedRateConfig.data.version,
+            facetCount: bondKpiLinkedRateConfig.data.facetKeys.length,
+            txHash: "",
+          };
+          checkpoint.currentStep = 6;
+          await checkpointManager.saveCheckpoint(checkpoint);
+        }
       }
     } else {
-      info("\n💼 Step 5/6: Skipping configurations...");
-      skippedSteps.push("Equity configuration", "Bond configuration");
+      info("\n💼 Step 6/7: Skipping configurations...");
+      skippedSteps.push(
+        "Equity configuration",
+        "Bond configuration",
+        "Bond Fixed Rate configuration",
+        "Bond KpiLinked Rate configuration",
+      );
     }
 
     // Step 5: Deploy Factory (optional - controlled by deployFactory flag)
@@ -642,7 +767,7 @@ export async function deploySystemWithExistingBlr(
 
     if (shouldDeployFactory) {
       if (checkpoint.steps.factory && checkpoint.currentStep >= 5) {
-        info("\n✓ Step 6/6: Factory already deployed (resuming)");
+        info("\n✓ Step 7/7: Factory already deployed (resuming)");
         // Reconstruct DeployFactoryResult from checkpoint (with placeholder proxyResult)
         const proxyAdminAddr = checkpoint.steps.proxyAdmin?.address || proxyAdmin.address;
         factoryResult = {
@@ -690,7 +815,7 @@ export async function deploySystemWithExistingBlr(
         await checkpointManager.saveCheckpoint(checkpoint);
       }
     } else {
-      info("\n🏭 Step 6/6: Skipping Factory deployment...");
+      info("\n🏭 Step 7/7: Skipping Factory deployment...");
       skippedSteps.push("Factory deployment");
     }
 
@@ -745,12 +870,18 @@ export async function deploySystemWithExistingBlr(
               const bondFacet = bondConfig?.success
                 ? bondConfig.data.facetKeys.find((bf) => bf.address === facetAddress)
                 : undefined;
+              const bondFixedRateFacet = bondFixedRateConfig?.success
+                ? bondFixedRateConfig.data.facetKeys.find((bf) => bf.address === facetAddress)
+                : undefined;
+              const bondKpiLinkedRateFacet = bondKpiLinkedRateConfig?.success
+                ? bondKpiLinkedRateConfig.data.facetKeys.find((bf) => bf.address === facetAddress)
+                : undefined;
 
               return {
                 name: facetName,
                 address: facetAddress,
                 contractId: await getContractId(facetAddress),
-                key: equityFacet?.key || bondFacet?.key || "",
+                key: equityFacet?.key || bondFacet?.key || bondFixedRateFacet?.key || bondKpiLinkedRateFacet?.key || "",
               };
             }),
           )
@@ -785,12 +916,44 @@ export async function deploySystemWithExistingBlr(
                 facetCount: 0,
                 facets: [],
               },
+        bondFixedRate:
+          bondFixedRateConfig && bondFixedRateConfig.success
+            ? {
+                configId: bondFixedRateConfig.data.configurationId,
+                version: bondFixedRateConfig.data.version,
+                facetCount: bondFixedRateConfig.data.facetKeys.length,
+                facets: bondFixedRateConfig.data.facetKeys,
+              }
+            : {
+                configId: "N/A (Not created)",
+                version: 0,
+                facetCount: 0,
+                facets: [],
+              },
+        bondKpiLinkedRate:
+          bondKpiLinkedRateConfig && bondKpiLinkedRateConfig.success
+            ? {
+                configId: bondKpiLinkedRateConfig.data.configurationId,
+                version: bondKpiLinkedRateConfig.data.version,
+                facetCount: bondKpiLinkedRateConfig.data.facetKeys.length,
+                facets: bondKpiLinkedRateConfig.data.facetKeys,
+              }
+            : {
+                configId: "N/A (Not created)",
+                version: 0,
+                facetCount: 0,
+                facets: [],
+              },
       },
 
       summary: {
         totalContracts: 1 + (factoryResult ? 1 : 0), // ProxyAdmin + Factory (if deployed)
         totalFacets: facetsResult?.deployed.size || 0,
-        totalConfigurations: (equityConfig ? 1 : 0) + (bondConfig ? 1 : 0),
+        totalConfigurations:
+          (equityConfig ? 1 : 0) +
+          (bondConfig ? 1 : 0) +
+          (bondFixedRateConfig ? 1 : 0) +
+          (bondKpiLinkedRateConfig ? 1 : 0),
         deploymentTime: endTime - startTime,
         gasUsed: totalGasUsed.toString(),
         success: true,
diff --git a/packages/ats/contracts/scripts/workflows/deploySystemWithNewBlr.ts b/packages/ats/contracts/scripts/workflows/deploySystemWithNewBlr.ts
index 21c2780a2..4ca77f539 100644
--- a/packages/ats/contracts/scripts/workflows/deploySystemWithNewBlr.ts
+++ b/packages/ats/contracts/scripts/workflows/deploySystemWithNewBlr.ts
@@ -39,7 +39,14 @@ import {
   convertCheckpointFacets,
   isSuccess,
 } from "@scripts/infrastructure";
-import { atsRegistry, deployFactory, createEquityConfiguration, createBondConfiguration } from "@scripts/domain";
+import {
+  atsRegistry,
+  deployFactory,
+  createEquityConfiguration,
+  createBondConfiguration,
+  createBondFixedRateConfiguration,
+  createBondKpiLinkedRateConfiguration,
+} from "@scripts/domain";
 
 import { promises as fs } from "fs";
 import { dirname } from "path";
@@ -108,6 +115,26 @@ export interface DeploymentOutput {
         address: string;
       }>;
     };
+    bondFixedRate: {
+      configId: string;
+      version: number;
+      facetCount: number;
+      facets: Array<{
+        facetName: string;
+        key: string;
+        address: string;
+      }>;
+    };
+    bondKpiLinkedRate: {
+      configId: string;
+      version: number;
+      facetCount: number;
+      facets: Array<{
+        facetName: string;
+        key: string;
+        address: string;
+      }>;
+    };
   };
 
   /** Deployment summary */
@@ -137,6 +164,20 @@ export interface DeploymentOutput {
       contractId?: string;
       key: string;
     }>;
+
+    getBondFixedRateFacets(): Array<{
+      name: string;
+      address: string;
+      contractId?: string;
+      key: string;
+    }>;
+
+    getBondKpiLinkedRateFacets(): Array<{
+      name: string;
+      address: string;
+      contractId?: string;
+      key: string;
+    }>;
   };
 }
 
@@ -615,11 +656,101 @@ export async function deploySystemWithNewBlr(
       await checkpointManager.saveCheckpoint(checkpoint);
     }
 
-    // Step 6: Deploy Factory
+    // Step 6: Create Bond Fixed Rate configuration
+    let bondFixedRateConfig: Awaited<ReturnType<typeof createBondFixedRateConfiguration>>;
+
+    if (checkpoint.steps.configurations?.bondFixedRate && checkpoint.currentStep >= 5) {
+      info("\n✓ Step 6/7: Bond FixedRate configuration already created (resuming)");
+      const bondFixedRateConfigData = checkpoint.steps.configurations.bondFixedRate;
+      info(`✅ Bond FixedRate Config ID: ${bondFixedRateConfigData.configId}`);
+      info(`✅ Bond FixedRate Version: ${bondFixedRateConfigData.version}`);
+      info(`✅ Bond FixedRate Facets: ${bondFixedRateConfigData.facetCount}`);
+
+      // Use converter to reconstruct full ConfigurationData from checkpoint
+      bondFixedRateConfig = toConfigurationData(bondFixedRateConfigData);
+    } else {
+      info("\n🏦 Step 6/7: Creating Bond FixedRate FixedRateconfiguration...");
+
+      bondFixedRateConfig = await createBondFixedRateConfiguration(
+        blrContract,
+        facetAddresses,
+        useTimeTravel,
+        partialBatchDeploy,
+        batchSize,
+        confirmations,
+      );
+
+      if (!bondFixedRateConfig.success) {
+        throw new Error(
+          `Bond FixedRate config creation failed: ${bondFixedRateConfig.error} - ${bondFixedRateConfig.message}`,
+        );
+      }
+
+      info(`✅ Bond FixedRate Config ID: ${bondFixedRateConfig.data.configurationId}`);
+      info(`✅ Bond FixedRate Version: ${bondFixedRateConfig.data.version}`);
+      info(`✅ Bond FixedRate Facets: ${bondFixedRateConfig.data.facetKeys.length}`);
+
+      // Save checkpoint
+      checkpoint.steps.configurations!.bondFixedRate = {
+        configId: bondFixedRateConfig.data.configurationId,
+        version: bondFixedRateConfig.data.version,
+        facetCount: bondFixedRateConfig.data.facetKeys.length,
+        txHash: "", // createBondFixedRateConfiguration doesn't return tx hash currently
+      };
+      checkpoint.currentStep = 5;
+      await checkpointManager.saveCheckpoint(checkpoint);
+    }
+
+    // Step 7: Create Bond KpiLinked Rate configuration
+    let bondKpiLinkedRateConfig: Awaited<ReturnType<typeof createBondKpiLinkedRateConfiguration>>;
+
+    if (checkpoint.steps.configurations?.bondKpiLinkedRate && checkpoint.currentStep >= 5) {
+      info("\n✓ Step 7/8: Bond KpiLinkedRate configuration already created (resuming)");
+      const bondKpiLinkedRateConfigData = checkpoint.steps.configurations.bondKpiLinkedRate;
+      info(`✅ Bond KpiLinkedRate Config ID: ${bondKpiLinkedRateConfigData.configId}`);
+      info(`✅ Bond KpiLinkedRate Version: ${bondKpiLinkedRateConfigData.version}`);
+      info(`✅ Bond KpiLinkedRate Facets: ${bondKpiLinkedRateConfigData.facetCount}`);
+
+      // Use converter to reconstruct full ConfigurationData from checkpoint
+      bondKpiLinkedRateConfig = toConfigurationData(bondKpiLinkedRateConfigData);
+    } else {
+      info("\n🏦 Step 6/7: Creating Bond KpiLinkedRate KpiLinkedRateconfiguration...");
+
+      bondKpiLinkedRateConfig = await createBondKpiLinkedRateConfiguration(
+        blrContract,
+        facetAddresses,
+        useTimeTravel,
+        partialBatchDeploy,
+        batchSize,
+        confirmations,
+      );
+
+      if (!bondKpiLinkedRateConfig.success) {
+        throw new Error(
+          `Bond KpiLinkedRate config creation failed: ${bondKpiLinkedRateConfig.error} - ${bondKpiLinkedRateConfig.message}`,
+        );
+      }
+
+      info(`✅ Bond KpiLinkedRate Config ID: ${bondKpiLinkedRateConfig.data.configurationId}`);
+      info(`✅ Bond KpiLinkedRate Version: ${bondKpiLinkedRateConfig.data.version}`);
+      info(`✅ Bond KpiLinkedRate Facets: ${bondKpiLinkedRateConfig.data.facetKeys.length}`);
+
+      // Save checkpoint
+      checkpoint.steps.configurations!.bondKpiLinkedRate = {
+        configId: bondKpiLinkedRateConfig.data.configurationId,
+        version: bondKpiLinkedRateConfig.data.version,
+        facetCount: bondKpiLinkedRateConfig.data.facetKeys.length,
+        txHash: "", // createBondKpiLinkedRateConfiguration doesn't return tx hash currently
+      };
+      checkpoint.currentStep = 6;
+      await checkpointManager.saveCheckpoint(checkpoint);
+    }
+
+    // Step 8: Deploy Factory
     let factoryResult: Awaited<ReturnType<typeof deployFactory>>;
 
-    if (checkpoint.steps.factory && checkpoint.currentStep >= 6) {
-      info("\n✓ Step 7/7: Factory already deployed (resuming)");
+    if (checkpoint.steps.factory && checkpoint.currentStep >= 7) {
+      info("\n✓ Step 8/8: Factory already deployed (resuming)");
       // Reconstruct DeployFactoryResult from checkpoint (with placeholder proxyResult)
       const proxyAdminAddr = checkpoint.steps.proxyAdmin?.address || proxyAdmin.address;
       factoryResult = {
@@ -706,12 +837,18 @@ export async function deploySystemWithNewBlr(
           const bondFacet = isSuccess(bondConfig)
             ? bondConfig.data.facetKeys.find((bf) => bf.address === facetAddress)
             : undefined;
+          const bondFixedRateFacet = isSuccess(bondFixedRateConfig)
+            ? bondFixedRateConfig.data.facetKeys.find((bf) => bf.address === facetAddress)
+            : undefined;
+          const bondKpiLinkedRateFacet = isSuccess(bondKpiLinkedRateConfig)
+            ? bondKpiLinkedRateConfig.data.facetKeys.find((bf) => bf.address === facetAddress)
+            : undefined;
 
           return {
             name: facetName,
             address: facetAddress,
             contractId: await getContractId(facetAddress),
-            key: equityFacet?.key || bondFacet?.key || "",
+            key: equityFacet?.key || bondFacet?.key || bondFixedRateFacet?.key || bondKpiLinkedRateFacet?.key || "",
           };
         }),
       ),
@@ -743,12 +880,38 @@ export async function deploySystemWithNewBlr(
               facetCount: 0,
               facets: [],
             },
+        bondFixedRate: isSuccess(bondFixedRateConfig)
+          ? {
+              configId: bondFixedRateConfig.data.configurationId,
+              version: bondFixedRateConfig.data.version,
+              facetCount: bondFixedRateConfig.data.facetKeys.length,
+              facets: bondFixedRateConfig.data.facetKeys,
+            }
+          : {
+              configId: "",
+              version: 0,
+              facetCount: 0,
+              facets: [],
+            },
+        bondKpiLinkedRate: isSuccess(bondKpiLinkedRateConfig)
+          ? {
+              configId: bondKpiLinkedRateConfig.data.configurationId,
+              version: bondKpiLinkedRateConfig.data.version,
+              facetCount: bondKpiLinkedRateConfig.data.facetKeys.length,
+              facets: bondKpiLinkedRateConfig.data.facetKeys,
+            }
+          : {
+              configId: "",
+              version: 0,
+              facetCount: 0,
+              facets: [],
+            },
       },
 
       summary: {
         totalContracts: 3, // ProxyAdmin, BLR, Factory
         totalFacets: facetsResult.deployed.size,
-        totalConfigurations: 2, // Equity + Bond
+        totalConfigurations: 4, // Equity + Bond + BondFixedRate + BondKpiLinkedRate
         deploymentTime: Date.now() - startTime,
         gasUsed: totalGasUsed.toString(),
         success: true,
@@ -767,6 +930,18 @@ export async function deploySystemWithNewBlr(
           const bondKeys = new Set(bondConfig.data.facetKeys.map((f) => f.key));
           return output.facets.filter((facet) => bondKeys.has(facet.key));
         },
+        getBondFixedRateFacets() {
+          // Use type guard to safely access .data property
+          if (!isSuccess(bondFixedRateConfig)) return [];
+          const bondFixedRateKeys = new Set(bondFixedRateConfig.data.facetKeys.map((f) => f.key));
+          return output.facets.filter((facet) => bondFixedRateKeys.has(facet.key));
+        },
+        getBondKpiLinkedRateFacets() {
+          // Use type guard to safely access .data property
+          if (!isSuccess(bondKpiLinkedRateConfig)) return [];
+          const bondKpiLinkedRateKeys = new Set(bondKpiLinkedRateConfig.data.facetKeys.map((f) => f.key));
+          return output.facets.filter((facet) => bondKpiLinkedRateKeys.has(facet.key));
+        },
       },
     };
 
diff --git a/packages/ats/contracts/tasks/compile.ts b/packages/ats/contracts/tasks/compile.ts
index 100bc9a4b..d993d7c39 100644
--- a/packages/ats/contracts/tasks/compile.ts
+++ b/packages/ats/contracts/tasks/compile.ts
@@ -68,6 +68,14 @@ task("erc3643-clone-interfaces", async (_, hre) => {
       original: "contracts/layer_1/interfaces/ERC1400/IERC20.sol:IERC20",
       removeImports: false,
     },
+    // Coupon Interest Rates interfaces
+    { original: "IFixedRate" },
+    { original: "IKpi" },
+    { original: "IKpiLinkedRate" },
+    {
+      original: "IScheduledCouponListing",
+      removeImports: false,
+    },
   ];
 
   const normalized = interfacesToClone.map((i) => ({
@@ -80,6 +88,10 @@ task("erc3643-clone-interfaces", async (_, hre) => {
   const constants = [
     { src: "layer_3/constants/regulation", dst: "regulation" },
     { src: "layer_1/constants/roles", dst: "roles" },
+    {
+      src: "layer_2/interfaces/scheduledTasks/scheduledTasksCommon/IScheduledTasksCommon",
+      dst: "IScheduledTasksCommon",
+    },
   ];
 
   function rewriteImports(source: string): string {
diff --git a/packages/ats/contracts/tasks/deploy.ts b/packages/ats/contracts/tasks/deploy.ts
index 4c7ff5e4f..5c5c0454f 100644
--- a/packages/ats/contracts/tasks/deploy.ts
+++ b/packages/ats/contracts/tasks/deploy.ts
@@ -262,6 +262,7 @@ task(
       scheduledSnapshotsFacet,
       scheduledBalanceAdjustmentsFacet,
       scheduledCrossOrderedTasksFacet,
+      scheduledCouponListingFacet,
       corporateActionsFacet,
       lockFacet,
       holdReadFacet,
@@ -324,6 +325,7 @@ task(
       "Scheduled Snapshots Facet": scheduledSnapshotsFacet.address,
       "Scheduled Balance Adjustments Facet": scheduledBalanceAdjustmentsFacet.address,
       "Scheduled Cross Ordered Tasks Facet": scheduledCrossOrderedTasksFacet.address,
+      "Scheduled Coupon Listing Facet": scheduledCouponListingFacet.address,
       "Corporate Actions Facet": corporateActionsFacet.address,
       "Lock Facet": lockFacet.address,
       "Hold Read Facet": holdReadFacet.address,
diff --git a/packages/ats/contracts/test/contracts/unit/layer_1/ERC1400/ERC20Votes/erc20Votes.test.ts b/packages/ats/contracts/test/contracts/unit/layer_1/ERC1400/ERC20Votes/erc20Votes.test.ts
index 705582b09..176cc5616 100644
--- a/packages/ats/contracts/test/contracts/unit/layer_1/ERC1400/ERC20Votes/erc20Votes.test.ts
+++ b/packages/ats/contracts/test/contracts/unit/layer_1/ERC1400/ERC20Votes/erc20Votes.test.ts
@@ -362,8 +362,8 @@ describe("ERC20Votes Tests", () => {
       await erc20VotesFacet.delegate(signer_B.address);
 
       const checkpoint = await erc20VotesFacet.checkpoints(signer_B.address, 0);
-      expect(checkpoint.fromBlock).to.be.gt(0);
-      expect(checkpoint.votes).to.equal(amount);
+      expect(checkpoint.from).to.be.gt(0);
+      expect(checkpoint.value).to.equal(amount);
     });
   });
 
diff --git a/packages/ats/contracts/test/contracts/unit/layer_1/bond/bond.test.ts b/packages/ats/contracts/test/contracts/unit/layer_1/bond/bond.test.ts
index 662f7e28c..8a0cdf070 100644
--- a/packages/ats/contracts/test/contracts/unit/layer_1/bond/bond.test.ts
+++ b/packages/ats/contracts/test/contracts/unit/layer_1/bond/bond.test.ts
@@ -48,16 +48,23 @@ let couponExecutionDateInSeconds = 0;
 const couponRate = 50;
 const couponRateDecimals = 1;
 const couponPeriod = TIME_PERIODS_S.WEEK;
+let couponFixingDateInSeconds = 0;
+let couponEndDateInSeconds = 0;
+let couponStartDateInSeconds = 0;
 const EMPTY_VC_ID = EMPTY_STRING;
 const YEAR_SECONDS = 365 * 24 * 60 * 60;
 const DECIMALS = 6;
+const couponRateStatus = 1;
 
 let couponData = {
   recordDate: couponRecordDateInSeconds.toString(),
   executionDate: couponExecutionDateInSeconds.toString(),
   rate: couponRate,
   rateDecimals: couponRateDecimals,
-  period: couponPeriod,
+  startDate: couponStartDateInSeconds.toString(),
+  endDate: couponEndDateInSeconds.toString(),
+  fixingDate: couponFixingDateInSeconds.toString(),
+  rateStatus: couponRateStatus,
 };
 
 describe("Bond Tests", () => {
@@ -169,12 +176,18 @@ describe("Bond Tests", () => {
     maturityDate = startingDate + numberOfCoupons * frequency;
     couponRecordDateInSeconds = dateToUnixTimestamp(`2030-01-01T00:01:00Z`);
     couponExecutionDateInSeconds = dateToUnixTimestamp(`2030-01-01T00:10:00Z`);
+    couponFixingDateInSeconds = dateToUnixTimestamp(`2030-01-01T00:10:00Z`);
+    couponEndDateInSeconds = couponFixingDateInSeconds - 1;
+    couponStartDateInSeconds = couponEndDateInSeconds - couponPeriod;
     couponData = {
       recordDate: couponRecordDateInSeconds.toString(),
       executionDate: couponExecutionDateInSeconds.toString(),
       rate: couponRate,
       rateDecimals: couponRateDecimals,
-      period: couponPeriod,
+      startDate: couponStartDateInSeconds.toString(),
+      endDate: couponEndDateInSeconds.toString(),
+      fixingDate: couponFixingDateInSeconds.toString(),
+      rateStatus: 1,
     };
     await loadFixture(deploySecurityFixture);
   });
@@ -370,7 +383,10 @@ describe("Bond Tests", () => {
           executionDate: couponRecordDateInSeconds.toString(),
           rate: couponRate,
           rateDecimals: couponRateDecimals,
-          period: couponPeriod,
+          startDate: couponStartDateInSeconds.toString(),
+          endDate: couponEndDateInSeconds.toString(),
+          fixingDate: couponFixingDateInSeconds.toString(),
+          rateStatus: couponRateStatus,
         };
 
         await expect(bondFacet.connect(signer_C).setCoupon(wrongcouponData_1)).to.be.revertedWithCustomError(
@@ -383,7 +399,10 @@ describe("Bond Tests", () => {
           executionDate: couponExecutionDateInSeconds.toString(),
           rate: couponRate,
           rateDecimals: couponRateDecimals,
-          period: couponPeriod,
+          startDate: couponStartDateInSeconds.toString(),
+          endDate: couponEndDateInSeconds.toString(),
+          fixingDate: couponFixingDateInSeconds.toString(),
+          rateStatus: couponRateStatus,
         };
 
         await expect(bondFacet.connect(signer_C).setCoupon(wrongcouponData_2)).to.be.revertedWithCustomError(
@@ -397,35 +416,41 @@ describe("Bond Tests", () => {
 
         // Create coupon with specific period
         const customPeriod = 3 * 24 * 60 * 60; // 3 days in seconds
+        const customStartDate = couponEndDateInSeconds - customPeriod;
         const customCouponData = {
           recordDate: couponRecordDateInSeconds.toString(),
           executionDate: couponExecutionDateInSeconds.toString(),
           rate: couponRate,
           rateDecimals: couponRateDecimals,
-          period: customPeriod,
+          startDate: customStartDate.toString(),
+          endDate: couponEndDateInSeconds.toString(),
+          fixingDate: couponFixingDateInSeconds.toString(),
+          rateStatus: couponRateStatus,
         };
 
         // Set coupon and verify event includes period
         await expect(bondFacet.connect(signer_C).setCoupon(customCouponData))
           .to.emit(bondFacet, "CouponSet")
-          .withArgs(
-            "0x0000000000000000000000000000000000000000000000000000000000000001",
-            1,
-            signer_C.address,
+          .withArgs("0x0000000000000000000000000000000000000000000000000000000000000001", 1, signer_C.address, [
             couponRecordDateInSeconds,
             couponExecutionDateInSeconds,
+            customStartDate,
+            couponEndDateInSeconds,
+            couponFixingDateInSeconds,
             couponRate,
             couponRateDecimals,
-            customPeriod,
-          );
+            couponRateStatus,
+          ]);
 
         // Verify coupon data includes period
         const registeredCoupon = await bondReadFacet.getCoupon(1);
-        expect(registeredCoupon.coupon.period).to.equal(customPeriod);
+        expect(registeredCoupon.coupon.endDate).to.equal(couponEndDateInSeconds);
+        expect(registeredCoupon.coupon.startDate).to.equal(customStartDate);
 
         // Verify couponFor data includes period
         const couponFor = await bondReadFacet.getCouponFor(1, signer_A.address);
-        expect(couponFor.period).to.equal(customPeriod);
+        expect(couponFor.coupon.endDate).to.equal(couponEndDateInSeconds);
+        expect(couponFor.coupon.startDate).to.equal(customStartDate);
       });
 
       it("GIVEN an account with corporateActions role WHEN setCoupon with period 0 THEN transaction succeeds", async () => {
@@ -441,21 +466,24 @@ describe("Bond Tests", () => {
           executionDate: couponExecutionDateInSeconds.toString(),
           rate: couponRate,
           rateDecimals: couponRateDecimals,
-          period: 0,
+          startDate: couponEndDateInSeconds.toString(),
+          endDate: couponEndDateInSeconds.toString(),
+          fixingDate: couponFixingDateInSeconds.toString(),
+          rateStatus: couponRateStatus,
         };
 
         await expect(bondFacet.setCoupon(minValidPeriodCouponData))
           .to.emit(bondFacet, "CouponSet")
-          .withArgs(
-            "0x0000000000000000000000000000000000000000000000000000000000000001",
-            1,
-            signer_C.address,
+          .withArgs("0x0000000000000000000000000000000000000000000000000000000000000001", 1, signer_C.address, [
             couponRecordDateInSeconds,
             couponExecutionDateInSeconds,
+            couponEndDateInSeconds,
+            couponEndDateInSeconds,
+            couponFixingDateInSeconds,
             couponRate,
             couponRateDecimals,
-            0,
-          );
+            couponRateStatus,
+          ]);
       });
 
       it("GIVEN an account with corporateActions role WHEN setCoupon THEN transaction succeeds", async () => {
@@ -464,16 +492,16 @@ describe("Bond Tests", () => {
         // set coupon
         await expect(bondFacet.connect(signer_C).setCoupon(couponData))
           .to.emit(bondFacet, "CouponSet")
-          .withArgs(
-            "0x0000000000000000000000000000000000000000000000000000000000000001",
-            1,
-            signer_C.address,
+          .withArgs("0x0000000000000000000000000000000000000000000000000000000000000001", 1, signer_C.address, [
             couponRecordDateInSeconds,
             couponExecutionDateInSeconds,
+            couponStartDateInSeconds,
+            couponEndDateInSeconds,
+            couponFixingDateInSeconds,
             couponRate,
             couponRateDecimals,
-            couponPeriod,
-          );
+            couponRateStatus,
+          ]);
 
         // check list members
         await expect(bondReadFacet.getCoupon(1000)).to.be.rejectedWith("WrongIndexForAction");
@@ -491,10 +519,20 @@ describe("Bond Tests", () => {
         expect(coupon.coupon.executionDate).to.equal(couponExecutionDateInSeconds);
         expect(coupon.coupon.rate).to.equal(couponRate);
         expect(coupon.coupon.rateDecimals).to.equal(couponRateDecimals);
-        expect(couponFor.recordDate).to.equal(couponRecordDateInSeconds);
-        expect(couponFor.executionDate).to.equal(couponExecutionDateInSeconds);
-        expect(couponFor.rate).to.equal(couponRate);
-        expect(couponFor.rateDecimals).to.equal(couponRateDecimals);
+        expect(coupon.coupon.startDate).to.equal(couponStartDateInSeconds);
+        expect(coupon.coupon.endDate).to.equal(couponEndDateInSeconds);
+        expect(coupon.coupon.fixingDate).to.equal(couponFixingDateInSeconds);
+        expect(coupon.coupon.rateStatus).to.equal(couponRateStatus);
+
+        expect(couponFor.coupon.recordDate).to.equal(couponRecordDateInSeconds);
+        expect(couponFor.coupon.executionDate).to.equal(couponExecutionDateInSeconds);
+        expect(couponFor.coupon.rate).to.equal(couponRate);
+        expect(couponFor.coupon.rateDecimals).to.equal(couponRateDecimals);
+        expect(couponFor.coupon.startDate).to.equal(couponStartDateInSeconds);
+        expect(couponFor.coupon.endDate).to.equal(couponEndDateInSeconds);
+        expect(couponFor.coupon.fixingDate).to.equal(couponFixingDateInSeconds);
+        expect(couponFor.coupon.rateStatus).to.equal(couponRateStatus);
+
         expect(couponFor.tokenBalance).to.equal(0);
         expect(couponFor.recordDateReached).to.equal(false);
         expect(couponTotalHolders).to.equal(0);
@@ -525,16 +563,16 @@ describe("Bond Tests", () => {
         // set coupon
         await expect(bondFacet.connect(signer_C).setCoupon(couponData))
           .to.emit(bondFacet, "CouponSet")
-          .withArgs(
-            "0x0000000000000000000000000000000000000000000000000000000000000001",
-            1,
-            signer_C.address,
+          .withArgs("0x0000000000000000000000000000000000000000000000000000000000000001", 1, signer_C.address, [
             couponRecordDateInSeconds,
             couponExecutionDateInSeconds,
+            couponStartDateInSeconds,
+            couponEndDateInSeconds,
+            couponFixingDateInSeconds,
             couponRate,
             couponRateDecimals,
-            couponPeriod,
-          );
+            couponRateStatus,
+          ]);
 
         // check list members
         await timeTravelFacet.changeSystemTimestamp(couponRecordDateInSeconds + 1);
@@ -545,6 +583,7 @@ describe("Bond Tests", () => {
         const bondDetails = await bondReadFacet.getBondDetails();
         const couponTotalHolders = await bondReadFacet.getTotalCouponHolders(1);
         const couponHolders = await bondReadFacet.getCouponHolders(1, 0, couponTotalHolders);
+        const period = couponFor.coupon.endDate.sub(couponFor.coupon.startDate);
 
         expect(couponFor.tokenBalance).to.equal(TotalAmount);
         expect(couponFor.recordDateReached).to.equal(true);
@@ -553,12 +592,12 @@ describe("Bond Tests", () => {
         expect(couponHolders).to.have.members([signer_A.address]);
         expect(couponAmountFor.recordDateReached).to.equal(couponFor.recordDateReached);
         expect(couponAmountFor.numerator).to.equal(
-          couponFor.tokenBalance.mul(bondDetails.nominalValue).mul(couponFor.rate).mul(couponFor.period),
+          couponFor.tokenBalance.mul(bondDetails.nominalValue).mul(couponFor.coupon.rate).mul(period),
         );
         expect(couponAmountFor.denominator).to.equal(
-          BigNumber.from(10 ** (couponFor.decimals + bondDetails.nominalValueDecimals + couponFor.rateDecimals)).mul(
-            YEAR_SECONDS,
-          ),
+          BigNumber.from(
+            10 ** (couponFor.decimals + bondDetails.nominalValueDecimals + couponFor.coupon.rateDecimals),
+          ).mul(YEAR_SECONDS),
         );
       });
 
@@ -590,16 +629,16 @@ describe("Bond Tests", () => {
         // set coupon
         await expect(bondFacet.connect(signer_C).setCoupon(couponData))
           .to.emit(bondFacet, "CouponSet")
-          .withArgs(
-            "0x0000000000000000000000000000000000000000000000000000000000000001",
-            1,
-            signer_C.address,
+          .withArgs("0x0000000000000000000000000000000000000000000000000000000000000001", 1, signer_C.address, [
             couponRecordDateInSeconds,
             couponExecutionDateInSeconds,
+            couponStartDateInSeconds,
+            couponEndDateInSeconds,
+            couponFixingDateInSeconds,
             couponRate,
             couponRateDecimals,
-            couponPeriod,
-          );
+            couponRateStatus,
+          ]);
 
         // check list members
         await timeTravelFacet.changeSystemTimestamp(couponRecordDateInSeconds + 1);
@@ -610,6 +649,7 @@ describe("Bond Tests", () => {
         const bondDetails = await bondReadFacet.getBondDetails();
         const couponTotalHolders = await bondReadFacet.getTotalCouponHolders(1);
         const couponHolders = await bondReadFacet.getCouponHolders(1, 0, couponTotalHolders);
+        const period = couponFor.coupon.endDate.sub(couponFor.coupon.startDate);
 
         expect(couponFor.tokenBalance).to.equal(TotalAmount);
         expect(couponFor.recordDateReached).to.equal(true);
@@ -618,12 +658,12 @@ describe("Bond Tests", () => {
         expect(couponHolders).to.have.members([signer_A.address]);
         expect(couponAmountFor.recordDateReached).to.equal(couponFor.recordDateReached);
         expect(couponAmountFor.numerator).to.equal(
-          couponFor.tokenBalance.mul(bondDetails.nominalValue).mul(couponFor.rate).mul(couponFor.period),
+          couponFor.tokenBalance.mul(bondDetails.nominalValue).mul(couponFor.coupon.rate).mul(period),
         );
         expect(couponAmountFor.denominator).to.equal(
-          BigNumber.from(10 ** (couponFor.decimals + bondDetails.nominalValueDecimals + couponFor.rateDecimals)).mul(
-            YEAR_SECONDS,
-          ),
+          BigNumber.from(
+            10 ** (couponFor.decimals + bondDetails.nominalValueDecimals + couponFor.coupon.rateDecimals),
+          ).mul(YEAR_SECONDS),
         );
       });
 
@@ -750,16 +790,16 @@ describe("Bond Tests", () => {
         // set coupon
         await expect(bondFacet.connect(signer_C).setCoupon(couponData))
           .to.emit(bondFacet, "CouponSet")
-          .withArgs(
-            "0x0000000000000000000000000000000000000000000000000000000000000001",
-            1,
-            signer_C.address,
+          .withArgs("0x0000000000000000000000000000000000000000000000000000000000000001", 1, signer_C.address, [
             couponRecordDateInSeconds,
             couponExecutionDateInSeconds,
+            couponStartDateInSeconds,
+            couponEndDateInSeconds,
+            couponFixingDateInSeconds,
             couponRate,
             couponRateDecimals,
-            couponPeriod,
-          );
+            couponRateStatus,
+          ]);
 
         // --- Pre: before record date -> tokenBalance should be 0 and not reached
         const before = await bondReadFacet.getCouponFor(1, signer_A.address);
@@ -778,16 +818,17 @@ describe("Bond Tests", () => {
         const couponFor = await bondReadFacet.getCouponFor(1, signer_A.address);
         const couponAmountForAfter = await bondReadFacet.getCouponAmountFor(1, signer_A.address);
         const bondDetails = await bondReadFacet.getBondDetails();
+        const period = couponFor.coupon.endDate.sub(couponFor.coupon.startDate);
         expect(couponFor.recordDateReached).to.equal(true);
         expect(couponFor.tokenBalance).to.equal(totalAmount); // normal+cleared+held+locked+frozen
         expect(couponAmountForAfter.recordDateReached).to.equal(couponFor.recordDateReached);
         expect(couponAmountForAfter.numerator).to.equal(
-          couponFor.tokenBalance.mul(bondDetails.nominalValue).mul(couponFor.rate).mul(couponFor.period),
+          couponFor.tokenBalance.mul(bondDetails.nominalValue).mul(couponFor.coupon.rate).mul(period),
         );
         expect(couponAmountForAfter.denominator).to.equal(
-          BigNumber.from(10 ** (couponFor.decimals + bondDetails.nominalValueDecimals + couponFor.rateDecimals)).mul(
-            YEAR_SECONDS,
-          ),
+          BigNumber.from(
+            10 ** (couponFor.decimals + bondDetails.nominalValueDecimals + couponFor.coupon.rateDecimals),
+          ).mul(YEAR_SECONDS),
         );
       });
     });
diff --git a/packages/ats/contracts/test/contracts/unit/layer_1/bond/fixedRate/bondFixedRate.test.ts b/packages/ats/contracts/test/contracts/unit/layer_1/bond/fixedRate/bondFixedRate.test.ts
new file mode 100644
index 000000000..41147e798
--- /dev/null
+++ b/packages/ats/contracts/test/contracts/unit/layer_1/bond/fixedRate/bondFixedRate.test.ts
@@ -0,0 +1,120 @@
+import { expect } from "chai";
+import { ethers } from "hardhat";
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers.js";
+import { ResolverProxy, BondUSAFixedRate, FixedRate, BondUSAReadFacet } from "@contract-types";
+import { dateToUnixTimestamp, ATS_ROLES, TIME_PERIODS_S } from "@scripts";
+import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
+import { deployBondFixedRateTokenFixture } from "@test";
+import { executeRbac } from "@test";
+
+let couponRecordDateInSeconds = 0;
+let couponExecutionDateInSeconds = 0;
+const couponPeriod = TIME_PERIODS_S.WEEK;
+let couponFixingDateInSeconds = 0;
+let couponEndDateInSeconds = 0;
+let couponStartDateInSeconds = 0;
+
+let couponData = {
+  recordDate: couponRecordDateInSeconds.toString(),
+  executionDate: couponExecutionDateInSeconds.toString(),
+  rate: 0,
+  rateDecimals: 0,
+  startDate: couponStartDateInSeconds.toString(),
+  endDate: couponEndDateInSeconds.toString(),
+  fixingDate: couponFixingDateInSeconds.toString(),
+  rateStatus: 0,
+};
+
+describe("Bond Fixed Rate Tests", () => {
+  let diamond: ResolverProxy;
+  let signer_A: SignerWithAddress;
+
+  let bondFixedRateFacet: BondUSAFixedRate;
+  let bondReadFacet: BondUSAReadFacet;
+  let fixedRateFacet: FixedRate;
+
+  async function deploySecurityFixture() {
+    const base = await deployBondFixedRateTokenFixture();
+
+    diamond = base.diamond;
+    signer_A = base.deployer;
+
+    await executeRbac(base.accessControlFacet, [
+      {
+        role: ATS_ROLES._CORPORATE_ACTION_ROLE,
+        members: [signer_A.address],
+      },
+    ]);
+
+    bondFixedRateFacet = await ethers.getContractAt("BondUSAFixedRateFacetTimeTravel", diamond.address, signer_A);
+    bondReadFacet = await ethers.getContractAt("BondUSAReadFacetTimeTravel", diamond.address, signer_A);
+    fixedRateFacet = await ethers.getContractAt("FixedRate", diamond.address, signer_A);
+  }
+
+  beforeEach(async () => {
+    couponRecordDateInSeconds = dateToUnixTimestamp(`2030-01-01T00:01:00Z`);
+    couponExecutionDateInSeconds = dateToUnixTimestamp(`2030-01-01T00:10:00Z`);
+    couponFixingDateInSeconds = dateToUnixTimestamp(`2030-01-01T00:10:00Z`);
+    couponEndDateInSeconds = couponFixingDateInSeconds - 1;
+    couponStartDateInSeconds = couponEndDateInSeconds - couponPeriod;
+    couponData = {
+      recordDate: couponRecordDateInSeconds.toString(),
+      executionDate: couponExecutionDateInSeconds.toString(),
+      rate: 0,
+      rateDecimals: 0,
+      startDate: couponStartDateInSeconds.toString(),
+      endDate: couponEndDateInSeconds.toString(),
+      fixingDate: couponFixingDateInSeconds.toString(),
+      rateStatus: 0,
+    };
+    await loadFixture(deploySecurityFixture);
+  });
+
+  it("GIVEN a fixed rate bond WHEN setting a coupon with non pending status THEN transaction fails with InterestRateIsFixed", async () => {
+    couponData.rateStatus = 1;
+
+    await expect(bondFixedRateFacet.setCoupon(couponData)).to.be.rejectedWith("InterestRateIsFixed");
+  });
+
+  it("GIVEN a fixed rate bond WHEN setting a coupon with rate non 0 THEN transaction fails with InterestRateIsFixed", async () => {
+    couponData.rate = 1;
+
+    await expect(bondFixedRateFacet.setCoupon(couponData)).to.be.rejectedWith("InterestRateIsFixed");
+  });
+
+  it("GIVEN a fixed rate bond WHEN setting a coupon with rate decimals non 0 THEN transaction fails with InterestRateIsFixed", async () => {
+    couponData.rateDecimals = 1;
+
+    await expect(bondFixedRateFacet.setCoupon(couponData)).to.be.rejectedWith("InterestRateIsFixed");
+  });
+
+  it("GIVEN a fixed rate bond WHEN setting a coupon with pending status THEN transaction success", async () => {
+    const fixedRate = await fixedRateFacet.getRate();
+
+    await expect(bondFixedRateFacet.connect(signer_A).setCoupon(couponData))
+      .to.emit(bondFixedRateFacet, "CouponSet")
+      .withArgs("0x0000000000000000000000000000000000000000000000000000000000000001", 1, signer_A.address, [
+        couponRecordDateInSeconds,
+        couponExecutionDateInSeconds,
+        couponStartDateInSeconds,
+        couponEndDateInSeconds,
+        couponFixingDateInSeconds,
+        fixedRate.rate_,
+        fixedRate.decimals_,
+        1,
+      ]);
+
+    const couponCount = await bondReadFacet.getCouponCount();
+    expect(couponCount).to.equal(1);
+
+    const registeredCoupon = await bondReadFacet.getCoupon(1);
+    expect(registeredCoupon.coupon.recordDate).to.equal(couponRecordDateInSeconds);
+    expect(registeredCoupon.coupon.executionDate).to.equal(couponExecutionDateInSeconds);
+    expect(registeredCoupon.coupon.startDate).to.equal(couponStartDateInSeconds);
+    expect(registeredCoupon.coupon.endDate).to.equal(couponEndDateInSeconds);
+    expect(registeredCoupon.coupon.fixingDate).to.equal(couponFixingDateInSeconds);
+    expect(registeredCoupon.coupon.rate).to.equal(fixedRate.rate_);
+    expect(registeredCoupon.coupon.rateDecimals).to.equal(fixedRate.decimals_);
+    expect(registeredCoupon.coupon.rateStatus).to.equal(1);
+  });
+});
diff --git a/packages/ats/contracts/test/contracts/unit/layer_1/bond/kpiLinkedRate/bondKpiLinkedRate.test.ts b/packages/ats/contracts/test/contracts/unit/layer_1/bond/kpiLinkedRate/bondKpiLinkedRate.test.ts
new file mode 100644
index 000000000..50b532438
--- /dev/null
+++ b/packages/ats/contracts/test/contracts/unit/layer_1/bond/kpiLinkedRate/bondKpiLinkedRate.test.ts
@@ -0,0 +1,430 @@
+import { expect } from "chai";
+import { ethers } from "hardhat";
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers.js";
+import {
+  ResolverProxy,
+  BondUSAKpiLinkedRateFacetTimeTravel,
+  KpiLinkedRateFacetTimeTravel,
+  BondUSAReadFacetTimeTravel,
+  TimeTravelFacet,
+  ERC1594FacetTimeTravel,
+} from "@contract-types";
+import { dateToUnixTimestamp, ATS_ROLES, TIME_PERIODS_S, ADDRESS_ZERO } from "@scripts";
+import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
+import { deployBondKpiLinkedRateTokenFixture, DEFAULT_BOND_KPI_LINKED_RATE_PARAMS } from "@test";
+import { executeRbac } from "@test";
+import { Contract } from "ethers";
+
+const couponPeriod = TIME_PERIODS_S.WEEK;
+const referenceDate = dateToUnixTimestamp(`2030-01-01T00:01:00Z`);
+const amount = 1000;
+
+describe("Bond KpiLinked Rate Tests", () => {
+  let couponRecordDateInSeconds = 0;
+  let couponExecutionDateInSeconds = 0;
+  let couponFixingDateInSeconds = 0;
+  let couponEndDateInSeconds = 0;
+  let couponStartDateInSeconds = 0;
+  let newInterestRate = {
+    maxRate: 0,
+    baseRate: 0,
+    minRate: 0,
+    startPeriod: 0,
+    startRate: 0,
+    missedPenalty: 0,
+    reportPeriod: 0,
+    rateDecimals: 0,
+  };
+  let newImpactData = {
+    maxDeviationCap: 0,
+    baseLine: 0,
+    maxDeviationFloor: 0,
+    impactDataDecimals: 0,
+    adjustmentPrecision: 0,
+  };
+
+  let diamond: ResolverProxy;
+  let signer_A: SignerWithAddress;
+
+  let bondKpiLinkedRateFacet: BondUSAKpiLinkedRateFacetTimeTravel;
+  let bondReadFacet: BondUSAReadFacetTimeTravel;
+  let kpiLinkedRateFacet: KpiLinkedRateFacetTimeTravel;
+  let mockKpiOracle: Contract;
+  let timeTravelFacet: TimeTravelFacet;
+  let erc1594Facet: ERC1594FacetTimeTravel;
+
+  let couponData = {
+    recordDate: couponRecordDateInSeconds.toString(),
+    executionDate: couponExecutionDateInSeconds.toString(),
+    rate: 0,
+    rateDecimals: 0,
+    startDate: couponStartDateInSeconds.toString(),
+    endDate: couponEndDateInSeconds.toString(),
+    fixingDate: couponFixingDateInSeconds.toString(),
+    rateStatus: 0,
+  };
+
+  async function deploySecurityFixture() {
+    const base = await deployBondKpiLinkedRateTokenFixture();
+
+    diamond = base.diamond;
+    signer_A = base.deployer;
+
+    await executeRbac(base.accessControlFacet, [
+      {
+        role: ATS_ROLES._CORPORATE_ACTION_ROLE,
+        members: [signer_A.address],
+      },
+      {
+        role: ATS_ROLES._INTEREST_RATE_MANAGER_ROLE,
+        members: [signer_A.address],
+      },
+      {
+        role: ATS_ROLES._ISSUER_ROLE,
+        members: [signer_A.address],
+      },
+    ]);
+
+    bondKpiLinkedRateFacet = await ethers.getContractAt(
+      "BondUSAKpiLinkedRateFacetTimeTravel",
+      diamond.address,
+      signer_A,
+    );
+    bondReadFacet = await ethers.getContractAt("BondUSAReadFacetTimeTravel", diamond.address, signer_A);
+    kpiLinkedRateFacet = await ethers.getContractAt("KpiLinkedRateFacetTimeTravel", diamond.address, signer_A);
+    erc1594Facet = await ethers.getContractAt("ERC1594FacetTimeTravel", diamond.address, signer_A);
+    timeTravelFacet = await ethers.getContractAt("TimeTravelFacet", diamond.address);
+
+    const MockedKpiOracle = await ethers.getContractFactory("MockedKpiOracle");
+    mockKpiOracle = await MockedKpiOracle.deploy();
+
+    await erc1594Facet.issue(signer_A.address, amount, "0x");
+  }
+
+  async function setKpiConfiguration(startPeriodOffsetToFixingDate: number) {
+    couponData = {
+      startDate: referenceDate.toString(),
+      endDate: (referenceDate + 100).toString(),
+      fixingDate: (referenceDate + 200).toString(),
+      recordDate: (referenceDate + 300).toString(),
+      executionDate: (referenceDate + 400).toString(),
+      rate: 0,
+      rateDecimals: 0,
+      rateStatus: 0,
+    };
+
+    newInterestRate = {
+      maxRate: 10000,
+      baseRate: 7500,
+      minRate: 5000,
+      startPeriod: parseInt(couponData.fixingDate) + startPeriodOffsetToFixingDate,
+      startRate: 4000,
+      missedPenalty: 100,
+      reportPeriod: 5000,
+      rateDecimals: 3,
+    };
+    newImpactData = {
+      maxDeviationCap: 200000,
+      baseLine: 150000,
+      maxDeviationFloor: 100000,
+      impactDataDecimals: 2,
+      adjustmentPrecision: 2,
+    };
+
+    await kpiLinkedRateFacet.connect(signer_A).setInterestRate(newInterestRate);
+    await kpiLinkedRateFacet.connect(signer_A).setImpactData(newImpactData);
+    await kpiLinkedRateFacet.connect(signer_A).setKpiOracle(mockKpiOracle.address);
+  }
+
+  async function checkCouponPostValues(
+    interestRate: number,
+    interestRateDecimals: number,
+    amount: number,
+    couponID: number,
+    accountAddress: string,
+  ) {
+    const registeredCouponPostFixingDate = await bondReadFacet.getCoupon(couponID);
+    const couponForPostFixingDate = await bondReadFacet.getCouponFor(couponID, accountAddress);
+    const couponAmountForPostFixingDate = await bondReadFacet.getCouponAmountFor(couponID, accountAddress);
+
+    const numerator =
+      BigInt(amount) *
+      BigInt(DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.nominalValue) *
+      BigInt(interestRate) *
+      (BigInt(couponData.endDate) - BigInt(couponData.startDate));
+    const denominator =
+      BigInt(10) **
+        (BigInt(couponForPostFixingDate.decimals) +
+          BigInt(DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.nominalValueDecimals) +
+          BigInt(interestRateDecimals)) *
+      BigInt(365 * 24 * 60 * 60);
+
+    expect(registeredCouponPostFixingDate.coupon.rate).to.equal(interestRate);
+    expect(registeredCouponPostFixingDate.coupon.rateDecimals).to.equal(interestRateDecimals);
+    expect(registeredCouponPostFixingDate.coupon.rateStatus).to.equal(1);
+
+    expect(couponForPostFixingDate.coupon.rate).to.equal(interestRate);
+    expect(couponForPostFixingDate.coupon.rateDecimals).to.equal(interestRateDecimals);
+    expect(couponForPostFixingDate.coupon.rateStatus).to.equal(1);
+
+    expect(couponAmountForPostFixingDate.numerator.toString()).to.equal(numerator.toString());
+    expect(couponAmountForPostFixingDate.denominator.toString()).to.equal(denominator.toString());
+  }
+
+  function updateCouponDates() {
+    const newFixingDate = parseInt(couponData.recordDate) + 10;
+    const newRecordDate = newFixingDate + 100;
+    const newExecutionDate = newRecordDate + 100;
+
+    couponData.fixingDate = newFixingDate.toString();
+    couponData.recordDate = newRecordDate.toString();
+    couponData.executionDate = newExecutionDate.toString();
+  }
+
+  beforeEach(async () => {
+    couponRecordDateInSeconds = dateToUnixTimestamp(`2030-01-01T00:01:00Z`);
+    couponExecutionDateInSeconds = dateToUnixTimestamp(`2030-05-01T00:10:00Z`);
+    couponFixingDateInSeconds = dateToUnixTimestamp(`2030-03-01T00:10:00Z`);
+    couponEndDateInSeconds = couponFixingDateInSeconds - 1;
+    couponStartDateInSeconds = couponEndDateInSeconds - couponPeriod;
+    couponData = {
+      recordDate: couponRecordDateInSeconds.toString(),
+      executionDate: couponExecutionDateInSeconds.toString(),
+      rate: 0,
+      rateDecimals: 0,
+      startDate: couponStartDateInSeconds.toString(),
+      endDate: couponEndDateInSeconds.toString(),
+      fixingDate: couponFixingDateInSeconds.toString(),
+      rateStatus: 0,
+    };
+    await loadFixture(deploySecurityFixture);
+  });
+
+  it("GIVEN a kpiLinked rate bond WHEN setting a coupon with non pending status THEN transaction fails with InterestRateIsKpiLinked", async () => {
+    couponData.rateStatus = 1;
+
+    await expect(bondKpiLinkedRateFacet.setCoupon(couponData)).to.be.rejectedWith("InterestRateIsKpiLinked");
+  });
+
+  it("GIVEN a kpiLinked rate bond WHEN setting a coupon with rate non 0 THEN transaction fails with InterestRateIsKpiLinked", async () => {
+    couponData.rate = 1;
+
+    await expect(bondKpiLinkedRateFacet.setCoupon(couponData)).to.be.rejectedWith("InterestRateIsKpiLinked");
+  });
+
+  it("GIVEN a kpiLinked rate bond WHEN setting a coupon with rate decimals non 0 THEN transaction fails with InterestRateIsKpiLinked", async () => {
+    couponData.rateDecimals = 1;
+
+    await expect(bondKpiLinkedRateFacet.setCoupon(couponData)).to.be.rejectedWith("InterestRateIsKpiLinked");
+  });
+
+  it("GIVEN a kpiLinked rate bond WHEN setting a coupon with pending status THEN transaction success", async () => {
+    await expect(bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData))
+      .to.emit(bondKpiLinkedRateFacet, "CouponSet")
+      .withArgs("0x0000000000000000000000000000000000000000000000000000000000000001", 1, signer_A.address, [
+        couponRecordDateInSeconds,
+        couponExecutionDateInSeconds,
+        couponStartDateInSeconds,
+        couponEndDateInSeconds,
+        couponFixingDateInSeconds,
+        0,
+        0,
+        0,
+      ]);
+
+    const couponCount = await bondReadFacet.getCouponCount();
+    expect(couponCount).to.equal(1);
+
+    const registeredCoupon = await bondReadFacet.getCoupon(1);
+    expect(registeredCoupon.coupon.recordDate).to.equal(couponRecordDateInSeconds);
+    expect(registeredCoupon.coupon.executionDate).to.equal(couponExecutionDateInSeconds);
+    expect(registeredCoupon.coupon.startDate).to.equal(couponStartDateInSeconds);
+    expect(registeredCoupon.coupon.endDate).to.equal(couponEndDateInSeconds);
+    expect(registeredCoupon.coupon.fixingDate).to.equal(couponFixingDateInSeconds);
+    expect(registeredCoupon.coupon.rate).to.equal(0);
+    expect(registeredCoupon.coupon.rateDecimals).to.equal(0);
+    expect(registeredCoupon.coupon.rateStatus).to.equal(0);
+  });
+
+  it("GIVEN a kpiLinked rate bond WHEN rate is during start Period THEN transaction success and rate is start rate", async () => {
+    await setKpiConfiguration(10);
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+
+    const registeredCouponPreFixingDate = await bondReadFacet.getCoupon(1);
+    const couponForPreFixingDate = await bondReadFacet.getCouponFor(1, signer_A.address);
+    const couponAmountForPreFixingDate = await bondReadFacet.getCouponAmountFor(1, signer_A.address);
+
+    expect(registeredCouponPreFixingDate.coupon.rate).to.equal(0);
+    expect(registeredCouponPreFixingDate.coupon.rateDecimals).to.equal(0);
+    expect(registeredCouponPreFixingDate.coupon.rateStatus).to.equal(0);
+
+    expect(couponForPreFixingDate.coupon.rate).to.equal(0);
+    expect(couponForPreFixingDate.coupon.rateDecimals).to.equal(0);
+    expect(couponForPreFixingDate.coupon.rateStatus).to.equal(0);
+
+    expect(couponAmountForPreFixingDate.numerator).to.equal(0);
+    expect(couponAmountForPreFixingDate.denominator).to.equal(0);
+
+    await timeTravelFacet.changeSystemTimestamp(couponData.fixingDate + 1);
+
+    await checkCouponPostValues(newInterestRate.startRate, newInterestRate.rateDecimals, amount, 1, signer_A.address);
+  });
+
+  it("GIVEN a kpiLinked rate bond with no oracle WHEN rate is calculated THEN transaction success and rate is base rate", async () => {
+    await setKpiConfiguration(-10);
+    await kpiLinkedRateFacet.connect(signer_A).setKpiOracle(ADDRESS_ZERO);
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+
+    await timeTravelFacet.changeSystemTimestamp(couponData.fixingDate + 1);
+
+    await checkCouponPostValues(newInterestRate.baseRate, newInterestRate.rateDecimals, amount, 1, signer_A.address);
+  });
+
+  it("GIVEN a kpiLinked rate bond WHEN no oracle report is found THEN transaction success and rate is previous rate plus penalty", async () => {
+    await setKpiConfiguration(-10);
+
+    // Test missed penalty when there is a single coupon
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+
+    await timeTravelFacet.changeSystemTimestamp(parseInt(couponData.recordDate) + 1);
+
+    await checkCouponPostValues(
+      0 + newInterestRate.missedPenalty,
+      newInterestRate.rateDecimals,
+      amount,
+      1,
+      signer_A.address,
+    );
+
+    // Test missed penalty when there are two coupons
+    updateCouponDates();
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+
+    await timeTravelFacet.changeSystemTimestamp(parseInt(couponData.recordDate) + 1);
+
+    await checkCouponPostValues(
+      0 + newInterestRate.missedPenalty,
+      newInterestRate.rateDecimals,
+      amount,
+      1,
+      signer_A.address,
+    );
+
+    await checkCouponPostValues(
+      newInterestRate.missedPenalty + newInterestRate.missedPenalty,
+      newInterestRate.rateDecimals,
+      amount,
+      2,
+      signer_A.address,
+    );
+
+    // Test missed penalty when previous coupon had less decimals
+    const previousCouponRate = 2 * newInterestRate.missedPenalty;
+    const previousCouponRateDecimals = newInterestRate.rateDecimals;
+
+    newInterestRate.missedPenalty = previousCouponRate;
+    newInterestRate.rateDecimals = previousCouponRateDecimals + 1;
+
+    await kpiLinkedRateFacet.connect(signer_A).setInterestRate(newInterestRate);
+
+    updateCouponDates();
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+
+    await timeTravelFacet.changeSystemTimestamp(parseInt(couponData.recordDate) + 1);
+
+    const rate = previousCouponRate * 10 + newInterestRate.missedPenalty;
+
+    await checkCouponPostValues(previousCouponRate / 2, previousCouponRateDecimals, amount, 1, signer_A.address);
+
+    await checkCouponPostValues(previousCouponRate, previousCouponRateDecimals, amount, 2, signer_A.address);
+
+    await checkCouponPostValues(rate, newInterestRate.rateDecimals, amount, 3, signer_A.address);
+
+    // Test missed penalty when previous coupon had more decimals
+    const previousCouponRate_2 = rate;
+    const previousCouponRateDecimals_2 = newInterestRate.rateDecimals;
+
+    newInterestRate.missedPenalty = previousCouponRate_2;
+    newInterestRate.rateDecimals = previousCouponRateDecimals_2 - 1;
+
+    await kpiLinkedRateFacet.connect(signer_A).setInterestRate(newInterestRate);
+
+    updateCouponDates();
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+
+    await timeTravelFacet.changeSystemTimestamp(parseInt(couponData.recordDate) + 1);
+
+    const rate_2 = previousCouponRate_2 / 10 + newInterestRate.missedPenalty;
+
+    await checkCouponPostValues(previousCouponRate / 2, previousCouponRateDecimals, amount, 1, signer_A.address);
+
+    await checkCouponPostValues(previousCouponRate, previousCouponRateDecimals, amount, 2, signer_A.address);
+
+    await checkCouponPostValues(previousCouponRate_2, previousCouponRateDecimals_2, amount, 3, signer_A.address);
+
+    await checkCouponPostValues(rate_2, newInterestRate.rateDecimals, amount, 4, signer_A.address);
+  });
+
+  it("GIVEN a kpiLinked rate bond WHEN impact data is above baseline THEN transaction success and rate is calculated", async () => {
+    await setKpiConfiguration(-10);
+
+    const impactData = newImpactData.baseLine + (newImpactData.maxDeviationCap - newImpactData.baseLine) / 2;
+    await mockKpiOracle.setKpiValue(impactData);
+    await mockKpiOracle.setExists(true);
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+
+    await timeTravelFacet.changeSystemTimestamp(parseInt(couponData.recordDate) + 1);
+
+    const rate = newInterestRate.baseRate + (newInterestRate.maxRate - newInterestRate.baseRate) / 2;
+
+    await checkCouponPostValues(rate, newInterestRate.rateDecimals, amount, 1, signer_A.address);
+
+    const impactData_2 = 2 * newImpactData.maxDeviationCap;
+    await mockKpiOracle.setKpiValue(impactData_2);
+    await mockKpiOracle.setExists(true);
+
+    updateCouponDates();
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+    await timeTravelFacet.changeSystemTimestamp(parseInt(couponData.recordDate) + 1);
+
+    const rate_2 = newInterestRate.maxRate;
+
+    await checkCouponPostValues(rate_2, newInterestRate.rateDecimals, amount, 2, signer_A.address);
+  });
+
+  it("GIVEN a kpiLinked rate bond WHEN impact data is below baseline THEN transaction success and rate is calculated", async () => {
+    await setKpiConfiguration(-10);
+
+    const impactData = newImpactData.baseLine - (newImpactData.baseLine - newImpactData.maxDeviationFloor) / 2;
+    await mockKpiOracle.setKpiValue(impactData);
+    await mockKpiOracle.setExists(true);
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+
+    await timeTravelFacet.changeSystemTimestamp(parseInt(couponData.recordDate) + 1);
+
+    const rate = newInterestRate.baseRate - (newInterestRate.baseRate - newInterestRate.minRate) / 2;
+
+    await checkCouponPostValues(rate, newInterestRate.rateDecimals, amount, 1, signer_A.address);
+
+    const impactData_2 = newImpactData.maxDeviationFloor / 2;
+    await mockKpiOracle.setKpiValue(impactData_2);
+    await mockKpiOracle.setExists(true);
+
+    updateCouponDates();
+
+    await bondKpiLinkedRateFacet.connect(signer_A).setCoupon(couponData);
+    await timeTravelFacet.changeSystemTimestamp(parseInt(couponData.recordDate) + 1);
+
+    const rate_2 = newInterestRate.minRate;
+
+    await checkCouponPostValues(rate_2, newInterestRate.rateDecimals, amount, 2, signer_A.address);
+  });
+});
diff --git a/packages/ats/contracts/test/contracts/unit/layer_1/corporateActions/corporateActions.test.ts b/packages/ats/contracts/test/contracts/unit/layer_1/corporateActions/corporateActions.test.ts
index 35cc18641..487b139c8 100644
--- a/packages/ats/contracts/test/contracts/unit/layer_1/corporateActions/corporateActions.test.ts
+++ b/packages/ats/contracts/test/contracts/unit/layer_1/corporateActions/corporateActions.test.ts
@@ -87,6 +87,7 @@ describe("Corporate Actions Tests", () => {
     expect(listMembersByType.length).to.equal(listCountByType);
     expect(listMembersByType[0]).to.equal(corporateActionId_1);
     expect(corporateAction[0].toUpperCase()).to.equal(actionType.toUpperCase());
-    expect(corporateAction[1].toUpperCase()).to.equal(actionData.toUpperCase());
+    expect(corporateAction[1]).to.equal(BigInt(listMembersByType[0]));
+    expect(corporateAction[2].toUpperCase()).to.equal(actionData.toUpperCase());
   });
 });
diff --git a/packages/ats/contracts/test/contracts/unit/layer_1/interestRates/fixedRate/fixedRate.test.ts b/packages/ats/contracts/test/contracts/unit/layer_1/interestRates/fixedRate/fixedRate.test.ts
new file mode 100644
index 000000000..07cfe2bd9
--- /dev/null
+++ b/packages/ats/contracts/test/contracts/unit/layer_1/interestRates/fixedRate/fixedRate.test.ts
@@ -0,0 +1,89 @@
+import { expect } from "chai";
+import { ethers } from "hardhat";
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers.js";
+import { type ResolverProxy, Pause, FixedRate } from "@contract-types";
+import { ATS_ROLES } from "@scripts";
+import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
+import { DEFAULT_BOND_FIXED_RATE_PARAMS, deployBondFixedRateTokenFixture } from "@test";
+import { executeRbac } from "@test";
+
+describe("Fixed Rate Tests", () => {
+  let diamond: ResolverProxy;
+  let signer_A: SignerWithAddress;
+  let signer_B: SignerWithAddress;
+  let signer_C: SignerWithAddress;
+
+  let fixedRateFacet: FixedRate;
+  let pauseFacet: Pause;
+
+  async function deploySecurityFixtureMultiPartition() {
+    const base = await deployBondFixedRateTokenFixture();
+    diamond = base.diamond;
+    signer_A = base.deployer;
+    signer_B = base.user2;
+    signer_C = base.user3;
+
+    await executeRbac(base.accessControlFacet, [
+      {
+        role: ATS_ROLES._PAUSER_ROLE,
+        members: [signer_B.address],
+      },
+      {
+        role: ATS_ROLES._INTEREST_RATE_MANAGER_ROLE,
+        members: [signer_A.address],
+      },
+    ]);
+
+    fixedRateFacet = await ethers.getContractAt("FixedRate", diamond.address, signer_A);
+    pauseFacet = await ethers.getContractAt("Pause", diamond.address, signer_A);
+  }
+
+  beforeEach(async () => {
+    await loadFixture(deploySecurityFixtureMultiPartition);
+  });
+
+  it("GIVEN an initialized contract WHEN trying to initialize it again THEN transaction fails with AlreadyInitialized", async () => {
+    await expect(fixedRateFacet.initialize_FixedRate({ rate: 1, rateDecimals: 0 })).to.be.rejectedWith(
+      "AlreadyInitialized",
+    );
+  });
+
+  describe("Paused", () => {
+    beforeEach(async () => {
+      // Pausing the token
+      await pauseFacet.connect(signer_B).pause();
+    });
+
+    it("GIVEN a paused Token WHEN setFixedRate THEN transaction fails with TokenIsPaused", async () => {
+      // transfer with data fails
+      await expect(fixedRateFacet.connect(signer_A).setRate(1, 2)).to.be.rejectedWith("TokenIsPaused");
+    });
+  });
+
+  describe("AccessControl", () => {
+    it("GIVEN an account without interest rate manager role WHEN setFixedRate THEN transaction fails with AccountHasNoRole", async () => {
+      // add to list fails
+      await expect(fixedRateFacet.connect(signer_C).setRate(1, 2)).to.be.rejectedWith("AccountHasNoRole");
+    });
+  });
+
+  describe("New Interest Rate OK", () => {
+    it("GIVEN a token WHEN setFixedRate THEN transaction succeeds", async () => {
+      const newRate = 355;
+      const newRateDecimals = 3;
+
+      const oldRateValues = await fixedRateFacet.getRate();
+
+      await expect(fixedRateFacet.connect(signer_A).setRate(newRate, newRateDecimals))
+        .to.emit(fixedRateFacet, "RateUpdated")
+        .withArgs(signer_A.address, newRate, newRateDecimals);
+
+      const newRateValues = await fixedRateFacet.getRate();
+
+      expect(oldRateValues.rate_).to.equal(DEFAULT_BOND_FIXED_RATE_PARAMS.rate);
+      expect(oldRateValues.decimals_).to.equal(DEFAULT_BOND_FIXED_RATE_PARAMS.rateDecimals);
+      expect(newRateValues.rate_).to.equal(newRate);
+      expect(newRateValues.decimals_).to.equal(newRateDecimals);
+    });
+  });
+});
diff --git a/packages/ats/contracts/test/contracts/unit/layer_1/interestRates/kpiLinkedRate/kpiLinkedRate.test.ts b/packages/ats/contracts/test/contracts/unit/layer_1/interestRates/kpiLinkedRate/kpiLinkedRate.test.ts
new file mode 100644
index 000000000..0a3e5bcaa
--- /dev/null
+++ b/packages/ats/contracts/test/contracts/unit/layer_1/interestRates/kpiLinkedRate/kpiLinkedRate.test.ts
@@ -0,0 +1,291 @@
+import { expect } from "chai";
+import { ethers } from "hardhat";
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers.js";
+import { type ResolverProxy, Pause, KpiLinkedRate } from "@contract-types";
+import { ADDRESS_ZERO, ATS_ROLES } from "@scripts";
+import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
+import { DEFAULT_BOND_KPI_LINKED_RATE_PARAMS, deployBondKpiLinkedRateTokenFixture } from "@test";
+import { executeRbac } from "@test";
+
+describe("Kpi Linked Rate Tests", () => {
+  let diamond: ResolverProxy;
+  let signer_A: SignerWithAddress;
+  let signer_B: SignerWithAddress;
+  let signer_C: SignerWithAddress;
+
+  let kpiLinkedRateFacet: KpiLinkedRate;
+  let pauseFacet: Pause;
+
+  async function deploySecurityFixtureMultiPartition() {
+    const base = await deployBondKpiLinkedRateTokenFixture();
+    diamond = base.diamond;
+    signer_A = base.deployer;
+    signer_B = base.user2;
+    signer_C = base.user3;
+
+    await executeRbac(base.accessControlFacet, [
+      {
+        role: ATS_ROLES._PAUSER_ROLE,
+        members: [signer_B.address],
+      },
+      {
+        role: ATS_ROLES._INTEREST_RATE_MANAGER_ROLE,
+        members: [signer_A.address],
+      },
+    ]);
+
+    kpiLinkedRateFacet = await ethers.getContractAt("KpiLinkedRate", diamond.address, signer_A);
+    pauseFacet = await ethers.getContractAt("Pause", diamond.address, signer_A);
+  }
+
+  beforeEach(async () => {
+    await loadFixture(deploySecurityFixtureMultiPartition);
+  });
+
+  it("GIVEN an initialized contract WHEN trying to initialize it again THEN transaction fails with AlreadyInitialized", async () => {
+    await expect(
+      kpiLinkedRateFacet.initialize_KpiLinkedRate(
+        {
+          maxRate: 3,
+          baseRate: 2,
+          minRate: 1,
+          startPeriod: 1000,
+          startRate: 2,
+          missedPenalty: 2,
+          reportPeriod: 5000,
+          rateDecimals: 1,
+        },
+        {
+          maxDeviationCap: 1000,
+          baseLine: 700,
+          maxDeviationFloor: 300,
+          impactDataDecimals: 1,
+          adjustmentPrecision: 3,
+        },
+        ADDRESS_ZERO,
+      ),
+    ).to.be.rejectedWith("AlreadyInitialized");
+  });
+
+  describe("Paused", () => {
+    beforeEach(async () => {
+      // Pausing the token
+      await pauseFacet.connect(signer_B).pause();
+    });
+
+    it("GIVEN a paused Token WHEN setInterestRate THEN transaction fails with TokenIsPaused", async () => {
+      // transfer with data fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_A).setInterestRate({
+          maxRate: 3,
+          baseRate: 2,
+          minRate: 1,
+          startPeriod: 1000,
+          startRate: 2,
+          missedPenalty: 2,
+          reportPeriod: 5000,
+          rateDecimals: 1,
+        }),
+      ).to.be.rejectedWith("TokenIsPaused");
+    });
+
+    it("GIVEN a paused Token WHEN setImpactData THEN transaction fails with TokenIsPaused", async () => {
+      // transfer with data fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_A).setImpactData({
+          maxDeviationCap: 1000,
+          baseLine: 700,
+          maxDeviationFloor: 300,
+          impactDataDecimals: 1,
+          adjustmentPrecision: 3,
+        }),
+      ).to.be.rejectedWith("TokenIsPaused");
+    });
+
+    it("GIVEN a paused Token WHEN setKpiOracle THEN transaction fails with TokenIsPaused", async () => {
+      // transfer with data fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_A).setKpiOracle("0x0000000000000000000000000000000000000001"),
+      ).to.be.rejectedWith("TokenIsPaused");
+    });
+  });
+
+  describe("AccessControl", () => {
+    it("GIVEN an account without interest rate manager role WHEN setInterestRate THEN transaction fails with AccountHasNoRole", async () => {
+      // add to list fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_C).setInterestRate({
+          maxRate: 3,
+          baseRate: 2,
+          minRate: 1,
+          startPeriod: 1000,
+          startRate: 2,
+          missedPenalty: 2,
+          reportPeriod: 5000,
+          rateDecimals: 1,
+        }),
+      ).to.be.rejectedWith("AccountHasNoRole");
+    });
+
+    it("GIVEN an account without interest rate manager role WHEN setImpactData THEN transaction fails with AccountHasNoRole", async () => {
+      // add to list fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_C).setImpactData({
+          maxDeviationCap: 1000,
+          baseLine: 700,
+          maxDeviationFloor: 300,
+          impactDataDecimals: 1,
+          adjustmentPrecision: 3,
+        }),
+      ).to.be.rejectedWith("AccountHasNoRole");
+    });
+
+    it("GIVEN an account without interest rate manager role WHEN setKpiOracle THEN transaction fails with AccountHasNoRole", async () => {
+      // add to list fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_C).setKpiOracle("0x0000000000000000000000000000000000000001"),
+      ).to.be.rejectedWith("AccountHasNoRole");
+    });
+  });
+
+  describe("Interest Rate", () => {
+    it("GIVEN Min Rate larger than Base Rate WHEN setInterestRate THEN transaction fails with WrongInterestRateValues", async () => {
+      // add to list fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_A).setInterestRate({
+          maxRate: 4,
+          baseRate: 2,
+          minRate: 3,
+          startPeriod: 1000,
+          startRate: 2,
+          missedPenalty: 2,
+          reportPeriod: 5000,
+          rateDecimals: 1,
+        }),
+      ).to.be.rejectedWith("WrongInterestRateValues");
+    });
+
+    it("GIVEN Base Rate larger than Max Rate WHEN setInterestRate THEN transaction fails with WrongInterestRateValues", async () => {
+      // add to list fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_A).setInterestRate({
+          maxRate: 4,
+          baseRate: 5,
+          minRate: 3,
+          startPeriod: 1000,
+          startRate: 2,
+          missedPenalty: 2,
+          reportPeriod: 5000,
+          rateDecimals: 1,
+        }),
+      ).to.be.rejectedWith("WrongInterestRateValues");
+    });
+
+    it("GIVEN correct interest rate WHEN setInterestRate THEN transaction succeeds", async () => {
+      const newInterestRate = {
+        maxRate: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.maxRate + 100,
+        baseRate: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.baseRate + 100,
+        minRate: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.minRate + 100,
+        startPeriod: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.startPeriod + 1000,
+        startRate: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.startRate + 100,
+        missedPenalty: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.missedPenalty + 100,
+        reportPeriod: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.reportPeriod + 1000,
+        rateDecimals: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.rateDecimals + 1,
+      };
+
+      await expect(kpiLinkedRateFacet.connect(signer_A).setInterestRate(newInterestRate))
+        .to.emit(kpiLinkedRateFacet, "InterestRateUpdated")
+        .withArgs(signer_A.address, [
+          newInterestRate.maxRate,
+          newInterestRate.baseRate,
+          newInterestRate.minRate,
+          newInterestRate.startPeriod,
+          newInterestRate.startRate,
+          newInterestRate.missedPenalty,
+          newInterestRate.reportPeriod,
+          newInterestRate.rateDecimals,
+        ]);
+
+      const interestRate = await kpiLinkedRateFacet.getInterestRate();
+
+      expect(interestRate.maxRate).to.equal(newInterestRate.maxRate);
+      expect(interestRate.baseRate).to.equal(newInterestRate.baseRate);
+      expect(interestRate.minRate).to.equal(newInterestRate.minRate);
+      expect(interestRate.startPeriod).to.equal(newInterestRate.startPeriod);
+      expect(interestRate.startRate).to.equal(newInterestRate.startRate);
+      expect(interestRate.missedPenalty).to.equal(newInterestRate.missedPenalty);
+      expect(interestRate.reportPeriod).to.equal(newInterestRate.reportPeriod);
+      expect(interestRate.rateDecimals).to.equal(newInterestRate.rateDecimals);
+    });
+  });
+
+  describe("Impact Data", () => {
+    it("GIVEN Max deviation floor larger than Base Line WHEN setImpactData THEN transaction fails with WrongImpactDataValues", async () => {
+      // add to list fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_A).setImpactData({
+          maxDeviationCap: 1000,
+          baseLine: 700,
+          maxDeviationFloor: 800,
+          impactDataDecimals: 1,
+          adjustmentPrecision: 8,
+        }),
+      ).to.be.rejectedWith("WrongImpactDataValues");
+    });
+
+    it("GIVEN Base Line larger than Max Deviation Cap WHEN setImpactData THEN transaction fails with WrongImpactDataValues", async () => {
+      // add to list fails
+      await expect(
+        kpiLinkedRateFacet.connect(signer_A).setImpactData({
+          maxDeviationCap: 1000,
+          baseLine: 7000,
+          maxDeviationFloor: 800,
+          impactDataDecimals: 1,
+          adjustmentPrecision: 8,
+        }),
+      ).to.be.rejectedWith("WrongImpactDataValues");
+    });
+
+    it("GIVEN correct impact data WHEN setImpactData THEN transaction succeeds", async () => {
+      const newImpactData = {
+        maxDeviationCap: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.maxDeviationCap + 100,
+        baseLine: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.baseLine + 100,
+        maxDeviationFloor: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.maxDeviationFloor + 100,
+        impactDataDecimals: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.impactDataDecimals + 1,
+        adjustmentPrecision: DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.adjustmentPrecision + 1,
+      };
+
+      await expect(kpiLinkedRateFacet.connect(signer_A).setImpactData(newImpactData))
+        .to.emit(kpiLinkedRateFacet, "ImpactDataUpdated")
+        .withArgs(signer_A.address, [
+          newImpactData.maxDeviationCap,
+          newImpactData.baseLine,
+          newImpactData.maxDeviationFloor,
+          newImpactData.impactDataDecimals,
+          newImpactData.adjustmentPrecision,
+        ]);
+
+      const impactData = await kpiLinkedRateFacet.getImpactData();
+
+      expect(impactData.maxDeviationCap).to.equal(newImpactData.maxDeviationCap);
+      expect(impactData.baseLine).to.equal(newImpactData.baseLine);
+      expect(impactData.maxDeviationFloor).to.equal(newImpactData.maxDeviationFloor);
+      expect(impactData.impactDataDecimals).to.equal(newImpactData.impactDataDecimals);
+      expect(impactData.adjustmentPrecision).to.equal(newImpactData.adjustmentPrecision);
+    });
+  });
+
+  describe("Kpi Oracle", () => {
+    it("GIVEN oracle WHEN setKpiOracle THEN transaction succeeds", async () => {
+      const newOracle = "0x0000000000000000000000000000000000000011";
+
+      await expect(kpiLinkedRateFacet.connect(signer_A).setKpiOracle(newOracle))
+        .to.emit(kpiLinkedRateFacet, "KpiOracleUpdated")
+        .withArgs(signer_A.address, newOracle);
+
+      const oracle = await kpiLinkedRateFacet.getKpiOracle();
+
+      expect(oracle).to.equal(newOracle);
+    });
+  });
+});
diff --git a/packages/ats/contracts/test/contracts/unit/resolver/diamondCutManager.test.ts b/packages/ats/contracts/test/contracts/unit/resolver/diamondCutManager.test.ts
index 49b7c36ef..37fb93448 100644
--- a/packages/ats/contracts/test/contracts/unit/resolver/diamondCutManager.test.ts
+++ b/packages/ats/contracts/test/contracts/unit/resolver/diamondCutManager.test.ts
@@ -10,15 +10,21 @@ import {
   IDiamondCutManager,
   IDiamondLoupe,
 } from "@contract-types";
-import { ATS_ROLES, BOND_CONFIG_ID, EQUITY_CONFIG_ID } from "@scripts";
+import {
+  ATS_ROLES,
+  BOND_CONFIG_ID,
+  BOND_FIXED_RATE_CONFIG_ID,
+  BOND_KPI_LINKED_RATE_CONFIG_ID,
+  EQUITY_CONFIG_ID,
+} from "@scripts";
 import { deployAtsInfrastructureFixture } from "@test";
 
 // Test-specific configuration IDs for negative test cases
 // These are separate from EQUITY_CONFIG_ID/BOND_CONFIG_ID to avoid conflicts
 const TEST_CONFIG_IDS = {
-  PAUSE_TEST: "0x0000000000000000000000000000000000000000000000000000000000000003",
-  PAUSE_BATCH_TEST: "0x0000000000000000000000000000000000000000000000000000000000000004",
-  BLACKLIST_TEST: "0x0000000000000000000000000000000000000000000000000000000000000005",
+  PAUSE_TEST: "0x0000000000000000000000000000000000000000000000000000000000000004",
+  PAUSE_BATCH_TEST: "0x0000000000000000000000000000000000000000000000000000000000000005",
+  BLACKLIST_TEST: "0x0000000000000000000000000000000000000000000000000000000000000006",
 };
 
 describe("DiamondCutManager", () => {
@@ -31,6 +37,8 @@ describe("DiamondCutManager", () => {
   let pause: Pause;
   let equityFacetIdList: string[] = [];
   let bondFacetIdList: string[] = [];
+  let bondFixedRateFacetIdList: string[] = [];
+  let bondKpiLinkedRateFacetIdList: string[] = [];
   let equityFacetVersionList: number[] = [];
 
   before(async () => {
@@ -49,6 +57,8 @@ describe("DiamondCutManager", () => {
     diamondCutManager = await ethers.getContractAt("DiamondCutManager", businessLogicResolver.address, signer_A);
     equityFacetIdList = Object.values(infrastructure.equityFacetKeys);
     bondFacetIdList = Object.values(infrastructure.bondFacetKeys);
+    bondFixedRateFacetIdList = Object.values(infrastructure.bondFixedRateFacetKeys);
+    bondKpiLinkedRateFacetIdList = Object.values(infrastructure.bondKpiLinkedRateFacetKeys);
     equityFacetVersionList = Array(equityFacetIdList.length).fill(1);
   });
 
@@ -59,7 +69,12 @@ describe("DiamondCutManager", () => {
     }
     // Clean up blacklisted selectors for all test config IDs
     const pauseSelector = "0x8456cb59";
-    const configIdsToCleanup = [EQUITY_CONFIG_ID, TEST_CONFIG_IDS.BLACKLIST_TEST];
+    const configIdsToCleanup = [
+      EQUITY_CONFIG_ID,
+      TEST_CONFIG_IDS.PAUSE_TEST,
+      TEST_CONFIG_IDS.PAUSE_BATCH_TEST,
+      TEST_CONFIG_IDS.BLACKLIST_TEST,
+    ];
 
     for (const configId of configIdsToCleanup) {
       try {
@@ -251,7 +266,15 @@ describe("DiamondCutManager", () => {
     expect(facetAddresses).to.have.members(facetAddresses_2);
 
     const expectedFacetIdList =
-      configId === EQUITY_CONFIG_ID ? equityFacetIdList : configId === BOND_CONFIG_ID ? bondFacetIdList : null;
+      configId === EQUITY_CONFIG_ID
+        ? equityFacetIdList
+        : configId === BOND_CONFIG_ID
+          ? bondFacetIdList
+          : configId == BOND_FIXED_RATE_CONFIG_ID
+            ? bondFixedRateFacetIdList
+            : configId == BOND_KPI_LINKED_RATE_CONFIG_ID
+              ? bondKpiLinkedRateFacetIdList
+              : null;
 
     if (!expectedFacetIdList) {
       expect.fail("Unknown configId");
@@ -263,10 +286,15 @@ describe("DiamondCutManager", () => {
 
   it("GIVEN a resolver WHEN reading configuration information THEN everything matches", async () => {
     const configLength = (await diamondCutManager.getConfigurationsLength()).toNumber();
-    expect(configLength).to.equal(2);
+    expect(configLength).to.equal(4);
 
     const configIds = await diamondCutManager.getConfigurations(0, configLength);
-    expect(configIds).to.have.members([EQUITY_CONFIG_ID, BOND_CONFIG_ID]);
+    expect(configIds).to.have.members([
+      EQUITY_CONFIG_ID,
+      BOND_CONFIG_ID,
+      BOND_FIXED_RATE_CONFIG_ID,
+      BOND_KPI_LINKED_RATE_CONFIG_ID,
+    ]);
 
     for (const configId of configIds) {
       const configLatestVersion = (await diamondCutManager.getLatestVersionByConfiguration(configId)).toNumber();
@@ -422,7 +450,7 @@ describe("DiamondCutManager", () => {
     const originalDiamondCutManager = diamondCutManager;
     diamondCutManager = batchDiamondCutManager;
 
-    for (const configId of [EQUITY_CONFIG_ID, BOND_CONFIG_ID]) {
+    for (const configId of [EQUITY_CONFIG_ID, BOND_CONFIG_ID, BOND_FIXED_RATE_CONFIG_ID]) {
       const configLatestVersion = (await batchDiamondCutManager.getLatestVersionByConfiguration(configId)).toNumber();
       expect(configLatestVersion).to.equal(0);
 
diff --git a/packages/ats/contracts/test/fixtures/index.ts b/packages/ats/contracts/test/fixtures/index.ts
index 0fa163383..87ad4ff39 100644
--- a/packages/ats/contracts/test/fixtures/index.ts
+++ b/packages/ats/contracts/test/fixtures/index.ts
@@ -20,6 +20,13 @@ export { deployEquityTokenFixture, DEFAULT_EQUITY_PARAMS, getEquityDetails } fro
 
 export { deployBondTokenFixture, DEFAULT_BOND_PARAMS, getBondDetails } from "./tokens/bond.fixture";
 
+export { deployBondFixedRateTokenFixture, DEFAULT_BOND_FIXED_RATE_PARAMS } from "./tokens/bondFixedRate.fixture";
+
+export {
+  deployBondKpiLinkedRateTokenFixture,
+  DEFAULT_BOND_KPI_LINKED_RATE_PARAMS,
+} from "./tokens/bondKpiLinkedRate.fixture";
+
 // Common token utilities
 export {
   MAX_UINT256,
diff --git a/packages/ats/contracts/test/fixtures/infrastructure.fixture.ts b/packages/ats/contracts/test/fixtures/infrastructure.fixture.ts
index fff2e3406..3dbdba073 100644
--- a/packages/ats/contracts/test/fixtures/infrastructure.fixture.ts
+++ b/packages/ats/contracts/test/fixtures/infrastructure.fixture.ts
@@ -102,5 +102,19 @@ export async function deployAtsInfrastructureFixture(
       },
       {} as Record<string, string>,
     ),
+    bondFixedRateFacetKeys: deployment.helpers.getBondFixedRateFacets().reduce(
+      (acc, f) => {
+        acc[f.name] = f.key;
+        return acc;
+      },
+      {} as Record<string, string>,
+    ),
+    bondKpiLinkedRateFacetKeys: deployment.helpers.getBondKpiLinkedRateFacets().reduce(
+      (acc, f) => {
+        acc[f.name] = f.key;
+        return acc;
+      },
+      {} as Record<string, string>,
+    ),
   };
 }
diff --git a/packages/ats/contracts/test/fixtures/tokens/bondFixedRate.fixture.ts b/packages/ats/contracts/test/fixtures/tokens/bondFixedRate.fixture.ts
new file mode 100644
index 000000000..f84018848
--- /dev/null
+++ b/packages/ats/contracts/test/fixtures/tokens/bondFixedRate.fixture.ts
@@ -0,0 +1,102 @@
+import { deployAtsInfrastructureFixture } from "../infrastructure.fixture";
+import { CURRENCIES, DeepPartial, BOND_FIXED_RATE_CONFIG_ID } from "../../../scripts";
+import {
+  AccessControlFacet__factory,
+  PauseFacet__factory,
+  KycFacet__factory,
+  ControlListFacet__factory,
+} from "@contract-types";
+import { DeployBondFromFactoryParams, FixedRateParams, deployBondFixedRateFromFactory } from "@scripts/domain";
+import { FactoryRegulationDataParams } from "@scripts/domain";
+import { getRegulationData, getSecurityData } from "./common.fixture";
+import { getBondDetails } from "./bond.fixture";
+import { getDltTimestamp } from "@test";
+
+/**
+ * Default bond token parameters.
+ * Override by passing custom params to fixture functions.
+ */
+export const DEFAULT_BOND_FIXED_RATE_PARAMS = {
+  currency: CURRENCIES.USD,
+  nominalValue: 100,
+  nominalValueDecimals: 2,
+  proceedRecipients: [] as string[],
+  proceedRecipientsData: [] as string[],
+  startingDate: async () => {
+    return (await getDltTimestamp()) + 3600; //block.timestamp + 1 hour
+  },
+  rate: 50,
+  rateDecimals: 1,
+} as const;
+
+/**
+ * Fixture: Deploy ATS infrastructure + single Bond token
+ *
+ * Extends deployAtsInfrastructureFixture with a deployed bond token
+ * using default parameters (single partition, controllable, internal KYC).
+ *
+ * @param tokenParams - Optional custom token parameters (merged with defaults)
+ * @returns Infrastructure + deployed bond token + connected facets
+ */
+export async function deployBondFixedRateTokenFixture({
+  bondDataParams,
+  regulationTypeParams,
+  fixedRateParams,
+}: {
+  bondDataParams?: DeepPartial<DeployBondFromFactoryParams>;
+  regulationTypeParams?: DeepPartial<FactoryRegulationDataParams>;
+  fixedRateParams?: DeepPartial<FixedRateParams>;
+} = {}) {
+  const infrastructure = await deployAtsInfrastructureFixture();
+  const { factory, blr, deployer } = infrastructure;
+
+  const securityData = getSecurityData(blr, {
+    ...bondDataParams?.securityData,
+    resolverProxyConfiguration: {
+      key: BOND_FIXED_RATE_CONFIG_ID,
+      version: 1,
+    },
+  });
+  const bondDetails = await getBondDetails(bondDataParams?.bondDetails);
+
+  const diamond = await deployBondFixedRateFromFactory(
+    {
+      adminAccount: deployer.address,
+      factory: factory,
+      securityData,
+      bondDetails,
+      proceedRecipients: [
+        ...((bondDataParams?.proceedRecipients as string[]) ?? DEFAULT_BOND_FIXED_RATE_PARAMS.proceedRecipients),
+      ],
+      proceedRecipientsData: [
+        ...((bondDataParams?.proceedRecipientsData as string[]) ??
+          DEFAULT_BOND_FIXED_RATE_PARAMS.proceedRecipientsData),
+      ],
+    },
+    getRegulationData(regulationTypeParams),
+    {
+      rate: fixedRateParams?.rate ?? DEFAULT_BOND_FIXED_RATE_PARAMS.rate,
+      rateDecimals: fixedRateParams?.rateDecimals ?? DEFAULT_BOND_FIXED_RATE_PARAMS.rateDecimals,
+    },
+  );
+
+  // Connect commonly used facets to diamond
+  const accessControlFacet = AccessControlFacet__factory.connect(diamond.address, deployer);
+  const pauseFacet = PauseFacet__factory.connect(diamond.address, deployer);
+  const kycFacet = KycFacet__factory.connect(diamond.address, deployer);
+  const controlListFacet = ControlListFacet__factory.connect(diamond.address, deployer);
+
+  return {
+    ...infrastructure,
+
+    // Token
+    diamond,
+    tokenAddress: diamond.address,
+
+    // Connected facets (most commonly used)
+    accessControlFacet,
+    pauseFacet,
+    kycFacet,
+    controlListFacet,
+  };
+}
diff --git a/packages/ats/contracts/test/fixtures/tokens/bondKpiLinkedRate.fixture.ts b/packages/ats/contracts/test/fixtures/tokens/bondKpiLinkedRate.fixture.ts
new file mode 100644
index 000000000..63b8e7c23
--- /dev/null
+++ b/packages/ats/contracts/test/fixtures/tokens/bondKpiLinkedRate.fixture.ts
@@ -0,0 +1,140 @@
+import { deployAtsInfrastructureFixture } from "../infrastructure.fixture";
+import { CURRENCIES, DeepPartial, BOND_KPI_LINKED_RATE_CONFIG_ID, ADDRESS_ZERO } from "../../../scripts";
+import {
+  AccessControlFacet__factory,
+  PauseFacet__factory,
+  KycFacet__factory,
+  ControlListFacet__factory,
+} from "@contract-types";
+import {
+  DeployBondFromFactoryParams,
+  InterestRateParams,
+  ImpactDataParams,
+  deployBondKpiLinkedRateFromFactory,
+} from "@scripts/domain";
+import { FactoryRegulationDataParams } from "@scripts/domain";
+import { getRegulationData, getSecurityData } from "./common.fixture";
+import { getBondDetails } from "./bond.fixture";
+import { getDltTimestamp } from "@test";
+
+/**
+ * Default bond token parameters.
+ * Override by passing custom params to fixture functions.
+ */
+export const DEFAULT_BOND_KPI_LINKED_RATE_PARAMS = {
+  currency: CURRENCIES.USD,
+  nominalValue: 100,
+  nominalValueDecimals: 2,
+  proceedRecipients: [] as string[],
+  proceedRecipientsData: [] as string[],
+  startingDate: async () => {
+    return (await getDltTimestamp()) + 3600; //block.timestamp + 1 hour
+  },
+  maxRate: 100,
+  baseRate: 75,
+  minRate: 50,
+  startPeriod: 1000,
+  startRate: 60,
+  missedPenalty: 10,
+  reportPeriod: 2000,
+  rateDecimals: 1,
+  maxDeviationCap: 1000,
+  baseLine: 750,
+  maxDeviationFloor: 500,
+  impactDataDecimals: 2,
+  adjustmentPrecision: 2,
+  kpiOracle: ADDRESS_ZERO,
+} as const;
+
+/**
+ * Fixture: Deploy ATS infrastructure + single Bond token
+ *
+ * Extends deployAtsInfrastructureFixture with a deployed bond token
+ * using default parameters (single partition, controllable, internal KYC).
+ *
+ * @param tokenParams - Optional custom token parameters (merged with defaults)
+ * @returns Infrastructure + deployed bond token + connected facets
+ */
+export async function deployBondKpiLinkedRateTokenFixture({
+  bondDataParams,
+  regulationTypeParams,
+  interestRateParams,
+  impactDataParams,
+  kpiOracle,
+}: {
+  bondDataParams?: DeepPartial<DeployBondFromFactoryParams>;
+  regulationTypeParams?: DeepPartial<FactoryRegulationDataParams>;
+  interestRateParams?: DeepPartial<InterestRateParams>;
+  impactDataParams?: DeepPartial<ImpactDataParams>;
+  kpiOracle?: string;
+} = {}) {
+  const infrastructure = await deployAtsInfrastructureFixture();
+  const { factory, blr, deployer } = infrastructure;
+
+  const securityData = getSecurityData(blr, {
+    internalKycActivated: false,
+    ...bondDataParams?.securityData,
+    resolverProxyConfiguration: {
+      key: BOND_KPI_LINKED_RATE_CONFIG_ID,
+      version: 1,
+    },
+  });
+  const bondDetails = await getBondDetails(bondDataParams?.bondDetails);
+  const interestRate = {
+    maxRate: interestRateParams?.maxRate ?? 0,
+    baseRate: interestRateParams?.baseRate ?? 0,
+    minRate: interestRateParams?.minRate ?? 0,
+    startPeriod: interestRateParams?.startPeriod ?? 0,
+    startRate: interestRateParams?.startRate ?? 0,
+    missedPenalty: interestRateParams?.missedPenalty ?? 0,
+    reportPeriod: interestRateParams?.reportPeriod ?? 0,
+    rateDecimals: interestRateParams?.rateDecimals ?? 0,
+  };
+  const impactData = {
+    maxDeviationCap: impactDataParams?.maxDeviationCap ?? 0,
+    baseLine: impactDataParams?.baseLine ?? 0,
+    maxDeviationFloor: impactDataParams?.maxDeviationFloor ?? 0,
+    impactDataDecimals: impactDataParams?.impactDataDecimals ?? 0,
+    adjustmentPrecision: impactDataParams?.adjustmentPrecision ?? 0,
+  };
+
+  const diamond = await deployBondKpiLinkedRateFromFactory(
+    {
+      adminAccount: deployer.address,
+      factory: factory,
+      securityData,
+      bondDetails,
+      proceedRecipients: [
+        ...((bondDataParams?.proceedRecipients as string[]) ?? DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.proceedRecipients),
+      ],
+      proceedRecipientsData: [
+        ...((bondDataParams?.proceedRecipientsData as string[]) ??
+          DEFAULT_BOND_KPI_LINKED_RATE_PARAMS.proceedRecipientsData),
+      ],
+    },
+    getRegulationData(regulationTypeParams),
+    interestRate,
+    impactData,
+    kpiOracle ?? "0x0000000000000000000000000000000000000000",
+  );
+
+  // Connect commonly used facets to diamond
+  const accessControlFacet = AccessControlFacet__factory.connect(diamond.address, deployer);
+  const pauseFacet = PauseFacet__factory.connect(diamond.address, deployer);
+  const kycFacet = KycFacet__factory.connect(diamond.address, deployer);
+  const controlListFacet = ControlListFacet__factory.connect(diamond.address, deployer);
+
+  return {
+    ...infrastructure,
+
+    // Token
+    diamond,
+    tokenAddress: diamond.address,
+
+    // Connected facets (most commonly used)
+    accessControlFacet,
+    pauseFacet,
+    kycFacet,
+    controlListFacet,
+  };
+}
diff --git a/packages/ats/contracts/test/scripts/unit/checkpoint/utils.test.ts b/packages/ats/contracts/test/scripts/unit/checkpoint/utils.test.ts
index 9c32ce09f..e75071067 100644
--- a/packages/ats/contracts/test/scripts/unit/checkpoint/utils.test.ts
+++ b/packages/ats/contracts/test/scripts/unit/checkpoint/utils.test.ts
@@ -75,6 +75,18 @@ describe("Checkpoint Utilities", () => {
               facetCount: 43,
               txHash: "0xpqr678",
             },
+            bondFixedRate: {
+              configId: "0x0000000000000000000000000000000000000000000000000000000000000003",
+              version: 1,
+              facetCount: 47,
+              txHash: "0xabc789",
+            },
+            bondKpiLinkedRate: {
+              configId: "0x0000000000000000000000000000000000000000000000000000000000000004",
+              version: 1,
+              facetCount: 47,
+              txHash: "0xdef123",
+            },
           },
           factory: {
             address: "0x5555555555555555555555555555555555555555",
@@ -129,11 +141,16 @@ describe("Checkpoint Utilities", () => {
       );
       expect(output.configurations.bond.version).to.equal(1);
       expect(output.configurations.bond.facetCount).to.equal(43);
+      expect(output.configurations.bondFixedRate.configId).to.equal(
+        "0x0000000000000000000000000000000000000000000000000000000000000003",
+      );
+      expect(output.configurations.bondFixedRate.version).to.equal(1);
+      expect(output.configurations.bondFixedRate.facetCount).to.equal(47);
 
       // Summary
       expect(output.summary.totalContracts).to.equal(5); // ProxyAdmin + BLR + Factory + 2 facets
       expect(output.summary.totalFacets).to.equal(2);
-      expect(output.summary.totalConfigurations).to.equal(2);
+      expect(output.summary.totalConfigurations).to.equal(3);
       expect(output.summary.success).to.be.true;
       expect(output.summary.deploymentTime).to.be.a("number");
       expect(output.summary.gasUsed).to.equal("1750000"); // 500000 + 450000 + 800000
@@ -216,6 +233,18 @@ describe("Checkpoint Utilities", () => {
               facetCount: 0,
               txHash: "0xpqr678",
             },
+            bondFixedRate: {
+              configId: "0x0000000000000000000000000000000000000000000000000000000000000003",
+              version: 1,
+              facetCount: 0,
+              txHash: "0xabc789",
+            },
+            bondKpiLinkedRate: {
+              configId: "0x0000000000000000000000000000000000000000000000000000000000000004",
+              version: 1,
+              facetCount: 0,
+              txHash: "0xdef123",
+            },
           },
         },
         options: {},
@@ -318,7 +347,9 @@ describe("Checkpoint Utilities", () => {
         expect(getStepName(3, "newBlr")).to.equal("Register Facets");
         expect(getStepName(4, "newBlr")).to.equal("Equity Configuration");
         expect(getStepName(5, "newBlr")).to.equal("Bond Configuration");
-        expect(getStepName(6, "newBlr")).to.equal("Factory");
+        expect(getStepName(6, "newBlr")).to.equal("Bond Fixed Rate Configuration");
+        expect(getStepName(7, "newBlr")).to.equal("Bond KpiLinked Rate Configuration");
+        expect(getStepName(8, "newBlr")).to.equal("Factory");
       });
 
       it("should handle unknown step numbers", () => {
@@ -334,7 +365,9 @@ describe("Checkpoint Utilities", () => {
         expect(getStepName(2, "existingBlr")).to.equal("Register Facets");
         expect(getStepName(3, "existingBlr")).to.equal("Equity Configuration");
         expect(getStepName(4, "existingBlr")).to.equal("Bond Configuration");
-        expect(getStepName(5, "existingBlr")).to.equal("Factory");
+        expect(getStepName(5, "existingBlr")).to.equal("Bond Fixed Rate Configuration");
+        expect(getStepName(6, "existingBlr")).to.equal("Bond KpiLinked Rate Configuration");
+        expect(getStepName(7, "existingBlr")).to.equal("Factory");
       });
 
       it("should handle unknown step numbers", () => {
@@ -345,12 +378,12 @@ describe("Checkpoint Utilities", () => {
   });
 
   describe("getTotalSteps", () => {
-    it("should return 7 for newBlr workflow", () => {
-      expect(getTotalSteps("newBlr")).to.equal(7);
+    it("should return 8 for newBlr workflow", () => {
+      expect(getTotalSteps("newBlr")).to.equal(8);
     });
 
-    it("should return 6 for existingBlr workflow", () => {
-      expect(getTotalSteps("existingBlr")).to.equal(6);
+    it("should return 7 for existingBlr workflow", () => {
+      expect(getTotalSteps("existingBlr")).to.equal(7);
     });
   });
 
@@ -373,7 +406,7 @@ describe("Checkpoint Utilities", () => {
 
       expect(formatted).to.include("Checkpoint: hedera-testnet-1731085200000");
       expect(formatted).to.include("Status: in-progress");
-      expect(formatted).to.include("Step: 3/7 - Facets");
+      expect(formatted).to.include("Step: 3/8 - Facets");
       expect(formatted).to.include("Started: 2025-11-08T10:00:00.000Z");
       expect(formatted).to.include("Last Update: 2025-11-08T10:05:00.000Z");
       expect(formatted).to.not.include("Failed:");
@@ -411,7 +444,7 @@ describe("Checkpoint Utilities", () => {
         network: "hedera-testnet",
         deployer: "0x1234567890123456789012345678901234567890",
         status: "completed",
-        currentStep: 6,
+        currentStep: 8,
         workflowType: "newBlr",
         startTime: "2025-11-08T10:00:00.000Z",
         lastUpdate: "2025-11-08T10:15:00.000Z",
@@ -422,7 +455,7 @@ describe("Checkpoint Utilities", () => {
       const formatted = formatCheckpointStatus(checkpoint);
 
       expect(formatted).to.include("Status: completed");
-      expect(formatted).to.include("Step: 7/7 - Factory");
+      expect(formatted).to.include("Step: 9/8 - Factory");
     });
 
     it("should format existingBlr workflow correctly", () => {
@@ -441,7 +474,7 @@ describe("Checkpoint Utilities", () => {
 
       const formatted = formatCheckpointStatus(checkpoint);
 
-      expect(formatted).to.include("Step: 2/6 - Facets");
+      expect(formatted).to.include("Step: 2/7 - Facets");
     });
   });
 
diff --git a/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledCouponListing/scheduledCouponListing.test.ts b/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledCouponListing/scheduledCouponListing.test.ts
new file mode 100644
index 000000000..322135314
--- /dev/null
+++ b/packages/ats/contracts/test/unitTests/layer_1/scheduledTasks/scheduledCouponListing/scheduledCouponListing.test.ts
@@ -0,0 +1,445 @@
+/*
+                                 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 { 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 Bond,
+  type ScheduledCouponListing,
+  type AccessControl,
+  ScheduledCrossOrderedTasks,
+  TimeTravel,
+  BusinessLogicResolver,
+  IFactory,
+  AccessControl__factory,
+  Bond__factory,
+  ScheduledCrossOrderedTasks__factory,
+  ScheduledCouponListing__factory,
+  TimeTravel__factory,
+} from "@typechain";
+import {
+  CORPORATE_ACTION_ROLE,
+  PAUSER_ROLE,
+  deployBondFromFactory,
+  Rbac,
+  RegulationSubType,
+  RegulationType,
+  deployAtsFullInfrastructure,
+  DeployAtsFullInfrastructureCommand,
+  dateToUnixTimestamp,
+  TIME_PERIODS_S,
+  InterestRateType,
+} from "@scripts";
+import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
+
+const numberOfUnits = 1000;
+let startingDate = 9999999999;
+const numberOfCoupons = 50;
+const frequency = TIME_PERIODS_S.DAY;
+let maturityDate = startingDate + numberOfCoupons * frequency;
+const countriesControlListType = true;
+const listOfCountries = "ES,FR,CH";
+const info = "info";
+const interestRateType = InterestRateType.KPI_BASED_PER_COUPON;
+
+describe("Scheduled Coupon Listing Tests", () => {
+  let diamond: ResolverProxy;
+  let signer_A: SignerWithAddress;
+  let signer_B: SignerWithAddress;
+  let signer_C: SignerWithAddress;
+
+  let account_A: string;
+  let account_B: string;
+  let account_C: string;
+
+  let factory: IFactory;
+  let businessLogicResolver: BusinessLogicResolver;
+  let bondFacet: Bond;
+  let scheduledCouponListingFacet: ScheduledCouponListing;
+  let scheduledTasksFacet: ScheduledCrossOrderedTasks;
+  let accessControlFacet: AccessControl;
+  let timeTravelFacet: TimeTravel;
+
+  async function deploySecurityFixtureSinglePartition() {
+    const init_rbacs: Rbac[] = set_initRbacs();
+
+    diamond = await deployBondFromFactory({
+      adminAccount: account_A,
+      isWhiteList: false,
+      isControllable: true,
+      arePartitionsProtected: false,
+      clearingActive: false,
+      internalKycActivated: true,
+      isMultiPartition: false,
+      name: "TEST_AccessControl",
+      symbol: "TAC",
+      decimals: 6,
+      isin: isinGenerator(),
+      currency: "0x455552",
+      numberOfUnits,
+      nominalValue: 100,
+      startingDate,
+      maturityDate,
+      regulationType: RegulationType.REG_S,
+      regulationSubType: RegulationSubType.NONE,
+      countriesControlListType,
+      listOfCountries,
+      info,
+      init_rbacs,
+      businessLogicResolver: businessLogicResolver.address,
+      factory,
+      interestRateType,
+    });
+
+    await setFacets(diamond);
+  }
+
+  async function setFacets(diamond: ResolverProxy) {
+    accessControlFacet = AccessControl__factory.connect(diamond.address, signer_A);
+    bondFacet = Bond__factory.connect(diamond.address, signer_A);
+    scheduledCouponListingFacet = ScheduledCouponListing__factory.connect(diamond.address, signer_A);
+    scheduledTasksFacet = ScheduledCrossOrderedTasks__factory.connect(diamond.address, signer_A);
+    timeTravelFacet = TimeTravel__factory.connect(diamond.address, signer_A);
+  }
+
+  function set_initRbacs(): Rbac[] {
+    const rbacPause: Rbac = {
+      role: PAUSER_ROLE,
+      members: [account_B],
+    };
+    return [rbacPause];
+  }
+
+  before(async () => {
+    //mute | mock console.log
+    console.log = () => {};
+    [signer_A, signer_B, signer_C] = await ethers.getSigners();
+    account_A = signer_A.address;
+    account_B = signer_B.address;
+    account_C = signer_C.address;
+
+    const { ...deployedContracts } = await deployAtsFullInfrastructure(
+      await DeployAtsFullInfrastructureCommand.newInstance({
+        signer: signer_A,
+        useDeployed: false,
+        useEnvironment: true,
+        timeTravelEnabled: true,
+      }),
+    );
+
+    factory = deployedContracts.factory.contract;
+    businessLogicResolver = deployedContracts.businessLogicResolver.contract;
+  });
+
+  beforeEach(async () => {
+    await loadFixture(deploySecurityFixtureSinglePartition);
+  });
+
+  afterEach(async () => {
+    timeTravelFacet.resetSystemTimestamp();
+  });
+
+  it("GIVEN a token WHEN triggerCouponListing THEN transaction succeeds", async () => {
+    await accessControlFacet.connect(signer_A).grantRole(CORPORATE_ACTION_ROLE, account_C);
+
+    // set coupons
+    const couponsRecordDateInSeconds = dateToUnixTimestamp("2030-01-01T00:00:06Z");
+    const couponsExecutionDateInSeconds = dateToUnixTimestamp("2030-01-01T00:01:00Z");
+    const couponsStartDateInSeconds = dateToUnixTimestamp("2029-12-31T00:00:00Z");
+    const couponsEndDateInSeconds = dateToUnixTimestamp("2029-12-31T00:10:00Z");
+    const couponsFixingDateInSeconds_1 = dateToUnixTimestamp("2030-01-01T00:00:06Z");
+    const couponsFixingDateInSeconds_2 = dateToUnixTimestamp("2030-01-01T00:00:12Z");
+    const couponsFixingDateInSeconds_3 = dateToUnixTimestamp("2030-01-01T00:00:18Z");
+    const couponsRate = 1;
+    const couponRateDecimals = 0;
+
+    const couponData_1 = {
+      recordDate: couponsRecordDateInSeconds.toString(),
+      executionDate: couponsExecutionDateInSeconds.toString(),
+      rate: couponsRate,
+      startDate: couponsStartDateInSeconds.toString(),
+      endDate: couponsEndDateInSeconds.toString(),
+      fixingDate: couponsFixingDateInSeconds_1.toString(),
+      rateDecimals: couponRateDecimals,
+    };
+    const couponData_2 = {
+      recordDate: couponsRecordDateInSeconds.toString(),
+      executionDate: couponsExecutionDateInSeconds.toString(),
+      rate: couponsRate,
+      startDate: couponsStartDateInSeconds.toString(),
+      endDate: couponsEndDateInSeconds.toString(),
+      fixingDate: couponsFixingDateInSeconds_2.toString(),
+      rateDecimals: couponRateDecimals,
+    };
+    const couponData_3 = {
+      recordDate: couponsRecordDateInSeconds.toString(),
+      executionDate: couponsExecutionDateInSeconds.toString(),
+      rate: couponsRate,
+      startDate: couponsStartDateInSeconds.toString(),
+      endDate: couponsEndDateInSeconds.toString(),
+      fixingDate: couponsFixingDateInSeconds_3.toString(),
+      rateDecimals: couponRateDecimals,
+    };
+    await bondFacet.connect(signer_C).setCoupon(couponData_2);
+    await bondFacet.connect(signer_C).setCoupon(couponData_3);
+    await bondFacet.connect(signer_C).setCoupon(couponData_1);
+
+    const coupon_2_Id = "0x0000000000000000000000000000000000000000000000000000000000000001";
+    const coupon_3_Id = "0x0000000000000000000000000000000000000000000000000000000000000002";
+    const coupon_1_Id = "0x0000000000000000000000000000000000000000000000000000000000000003";
+
+    // check schedled CouponListing
+    let scheduledCouponListingCount = await scheduledCouponListingFacet.scheduledCouponListingCount();
+    let scheduledCouponListing = await scheduledCouponListingFacet.getScheduledCouponListing(0, 100);
+
+    expect(scheduledCouponListingCount).to.equal(3);
+    expect(scheduledCouponListing.length).to.equal(scheduledCouponListingCount);
+    expect(scheduledCouponListing[0].scheduledTimestamp.toNumber()).to.equal(couponsFixingDateInSeconds_3);
+    expect(scheduledCouponListing[0].data).to.equal(coupon_3_Id);
+    expect(scheduledCouponListing[1].scheduledTimestamp.toNumber()).to.equal(couponsFixingDateInSeconds_2);
+    expect(scheduledCouponListing[1].data).to.equal(coupon_2_Id);
+    expect(scheduledCouponListing[2].scheduledTimestamp.toNumber()).to.equal(couponsFixingDateInSeconds_1);
+    expect(scheduledCouponListing[2].data).to.equal(coupon_1_Id);
+
+    // AFTER FIRST SCHEDULED CouponListing ------------------------------------------------------------------
+    await timeTravelFacet.changeSystemTimestamp(couponsFixingDateInSeconds_1 + 1);
+    await scheduledTasksFacet.connect(signer_A).triggerPendingScheduledCrossOrderedTasks();
+
+    scheduledCouponListingCount = await scheduledCouponListingFacet.scheduledCouponListingCount();
+    scheduledCouponListing = await scheduledCouponListingFacet.getScheduledCouponListing(0, 100);
+
+    expect(scheduledCouponListingCount).to.equal(2);
+    expect(scheduledCouponListing.length).to.equal(scheduledCouponListingCount);
+    expect(scheduledCouponListing[0].scheduledTimestamp.toNumber()).to.equal(couponsFixingDateInSeconds_3);
+    expect(scheduledCouponListing[0].data).to.equal(coupon_3_Id);
+    expect(scheduledCouponListing[1].scheduledTimestamp.toNumber()).to.equal(couponsFixingDateInSeconds_2);
+    expect(scheduledCouponListing[1].data).to.equal(coupon_2_Id);
+
+    // AFTER SECOND SCHEDULED CouponListing ------------------------------------------------------------------
+    await timeTravelFacet.changeSystemTimestamp(couponsFixingDateInSeconds_2 + 1);
+    await scheduledTasksFacet.connect(signer_A).triggerScheduledCrossOrderedTasks(100);
+
+    scheduledCouponListingCount = await scheduledCouponListingFacet.scheduledCouponListingCount();
+    scheduledCouponListing = await scheduledCouponListingFacet.getScheduledCouponListing(0, 100);
+
+    expect(scheduledCouponListingCount).to.equal(1);
+    expect(scheduledCouponListing.length).to.equal(scheduledCouponListingCount);
+    expect(scheduledCouponListing[0].scheduledTimestamp.toNumber()).to.equal(couponsFixingDateInSeconds_3);
+    expect(scheduledCouponListing[0].data).to.equal(coupon_3_Id);
+
+    // AFTER SECOND SCHEDULED CouponListing ------------------------------------------------------------------
+    await timeTravelFacet.changeSystemTimestamp(couponsFixingDateInSeconds_3 + 1);
+    await scheduledTasksFacet.connect(signer_A).triggerScheduledCrossOrderedTasks(0);
+
+    scheduledCouponListingCount = await scheduledCouponListingFacet.scheduledCouponListingCount();
+    scheduledCouponListing = await scheduledCouponListingFacet.getScheduledCouponListing(0, 100);
+
+    expect(scheduledCouponListingCount).to.equal(0);
+    expect(scheduledCouponListing.length).to.equal(scheduledCouponListingCount);
+  });
+});
diff --git a/packages/ats/sdk/__tests__/fixtures/bond/BondFixture.ts b/packages/ats/sdk/__tests__/fixtures/bond/BondFixture.ts
index 5f2447c3f..807f9ba62 100644
--- a/packages/ats/sdk/__tests__/fixtures/bond/BondFixture.ts
+++ b/packages/ats/sdk/__tests__/fixtures/bond/BondFixture.ts
@@ -1,216 +1,145 @@
 // SPDX-License-Identifier: Apache-2.0
 
-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,
-  HederaIdPropsFixture,
-  PartitionIdFixture,
-} from '../shared/DataFixture';
-import { SecurityPropsFixture } from '../shared/SecurityFixture';
-import { UpdateMaturityDateCommand } from '@command/bond/updateMaturityDate/UpdateMaturityDateCommand';
-import { BondDetails } from '@domain/context/bond/BondDetails';
-import { GetCouponQuery } from '@query/bond/coupons/getCoupon/GetCouponQuery';
-import { GetCouponCountQuery } from '@query/bond/coupons/getCouponCount/GetCouponCountQuery';
-import { GetCouponForQuery } from '@query/bond/coupons/getCouponFor/GetCouponForQuery';
-import { GetCouponAmountForQuery } from '@query/bond/coupons/getCouponAmountFor/GetCouponAmountForQuery';
-import { GetPrincipalForQuery } from '@query/bond/get/getPrincipalFor/GetPrincipalForQuery';
-import { GetBondDetailsQuery } from '@query/bond/get/getBondDetails/GetBondDetailsQuery';
-import { HederaId } from '@domain/context/shared/HederaId';
-import CreateBondRequest from '@port/in/request/bond/CreateBondRequest';
+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, HederaIdPropsFixture, PartitionIdFixture } from "../shared/DataFixture";
+import { SecurityPropsFixture } from "../shared/SecurityFixture";
+import { UpdateMaturityDateCommand } from "@command/bond/updateMaturityDate/UpdateMaturityDateCommand";
+import { BondDetails } from "@domain/context/bond/BondDetails";
+import { GetCouponQuery } from "@query/bond/coupons/getCoupon/GetCouponQuery";
+import { GetCouponCountQuery } from "@query/bond/coupons/getCouponCount/GetCouponCountQuery";
+import { GetCouponForQuery } from "@query/bond/coupons/getCouponFor/GetCouponForQuery";
+import { GetCouponAmountForQuery } from "@query/bond/coupons/getCouponAmountFor/GetCouponAmountForQuery";
+import { GetPrincipalForQuery } from "@query/bond/get/getPrincipalFor/GetPrincipalForQuery";
+import { GetBondDetailsQuery } from "@query/bond/get/getBondDetails/GetBondDetailsQuery";
+import { HederaId } from "@domain/context/shared/HederaId";
+import CreateBondRequest from "@port/in/request/bond/CreateBondRequest";
 import {
   CastRegulationSubType,
   CastRegulationType,
   RegulationSubType,
   RegulationType,
-} from '@domain/context/factory/RegulationType';
-import { faker } from '@faker-js/faker/.';
-import GetBondDetailsRequest from '@port/in/request/bond/GetBondDetailsRequest';
-import SetCouponRequest from '@port/in/request/bond/SetCouponRequest';
-import GetCouponForRequest from '@port/in/request/bond/GetCouponForRequest';
-import GetPrincipalForRequest from '@port/in/request/bond/GetPrincipalForRequest';
-import GetCouponRequest from '@port/in/request/bond/GetCouponRequest';
-import GetAllCouponsRequest from '@port/in/request/bond/GetAllCouponsRequest';
-import UpdateMaturityDateRequest from '@port/in/request/bond/UpdateMaturityDateRequest';
-import BigDecimal from '@domain/context/shared/BigDecimal';
-import { BigNumber } from 'ethers';
-import { Coupon } from '@domain/context/bond/Coupon';
-import { RedeemAtMaturityByPartitionCommand } from '@command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommand';
-import RedeemAtMaturityByPartitionRequest from '@port/in/request/bond/RedeemAtMaturityByPartitionRequest';
-import { FullRedeemAtMaturityCommand } from '@command/bond/fullRedeemAtMaturity/FullRedeemAtMaturityCommand';
-import FullRedeemAtMaturityRequest from '@port/in/request/bond/FullRedeemAtMaturityRequest';
-import { GetCouponHoldersQuery } from '@query/bond/coupons/getCouponHolders/GetCouponHoldersQuery';
-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';
+} from "@domain/context/factory/RegulationType";
+import { faker } from "@faker-js/faker/.";
+import GetBondDetailsRequest from "@port/in/request/bond/GetBondDetailsRequest";
+import SetCouponRequest from "@port/in/request/bond/SetCouponRequest";
+import GetCouponForRequest from "@port/in/request/bond/GetCouponForRequest";
+import GetPrincipalForRequest from "@port/in/request/bond/GetPrincipalForRequest";
+import GetCouponRequest from "@port/in/request/bond/GetCouponRequest";
+import GetAllCouponsRequest from "@port/in/request/bond/GetAllCouponsRequest";
+import UpdateMaturityDateRequest from "@port/in/request/bond/UpdateMaturityDateRequest";
+import BigDecimal from "@domain/context/shared/BigDecimal";
+import { BigNumber } from "ethers";
+import { Coupon } from "@domain/context/bond/Coupon";
+import { RedeemAtMaturityByPartitionCommand } from "@command/bond/redeemAtMaturityByPartition/RedeemAtMaturityByPartitionCommand";
+import RedeemAtMaturityByPartitionRequest from "@port/in/request/bond/RedeemAtMaturityByPartitionRequest";
+import { FullRedeemAtMaturityCommand } from "@command/bond/fullRedeemAtMaturity/FullRedeemAtMaturityCommand";
+import FullRedeemAtMaturityRequest from "@port/in/request/bond/FullRedeemAtMaturityRequest";
+import { GetCouponHoldersQuery } from "@query/bond/coupons/getCouponHolders/GetCouponHoldersQuery";
+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,
   GetProceedRecipientsCountRequest,
   GetProceedRecipientsRequest,
   GetProceedRecipientDataRequest,
   IsProceedRecipientRequest,
-} from 'src';
-import AddProceedRecipientRequest from '@port/in/request/bond/AddProceedRecipientRequest';
-import RemoveProceedRecipientRequest from '@port/in/request/bond/RemoveProceedRecipientRequest';
-import UpdateProceedRecipientDataRequest from '@port/in/request/bond/UpdateProceedRecipientDataRequest';
-
-export const SetCouponCommandFixture = createFixture<SetCouponCommand>(
-  (command) => {
-    command.address.as(() => HederaIdPropsFixture.create().value);
-    command.recordDate.faker((faker) =>
-      faker.date.future().getTime().toString(),
-    );
-    command.executionDate.faker((faker) =>
-      faker.date.future().getTime().toString(),
-    );
-    command.rate.faker((faker) =>
-      faker.number.int({ min: 100, max: 999 }).toString(),
-    );
-    command.period.faker((faker) =>
-      faker.number.int({ min: 86400, max: 31536000 }).toString(),
-    );
-  },
-);
+} from "src";
+import AddProceedRecipientRequest from "@port/in/request/bond/AddProceedRecipientRequest";
+import RemoveProceedRecipientRequest from "@port/in/request/bond/RemoveProceedRecipientRequest";
+import UpdateProceedRecipientDataRequest from "@port/in/request/bond/UpdateProceedRecipientDataRequest";
+import { CastRateStatus, RateStatus } from "@domain/context/bond/RateStatus";
+
+export const SetCouponCommandFixture = createFixture<SetCouponCommand>((command) => {
+  command.address.as(() => HederaIdPropsFixture.create().value);
+  command.recordDate.faker((faker) => faker.date.future().getTime().toString());
+  command.executionDate.faker((faker) => faker.date.future().getTime().toString());
+  command.rate.faker((faker) => faker.number.int({ min: 100, max: 999 }).toString());
+  command.startDate.faker((faker) => faker.date.future().getTime().toString());
+  command.endDate.faker((faker) => faker.date.future().getTime().toString());
+  command.fixingDate.faker((faker) => faker.date.future().getTime().toString());
+});
 
-export const CreateBondCommandFixture = createFixture<CreateBondCommand>(
-  (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.nominalValueDecimals.faker((faker) =>
-      faker.number.int({ min: 1, max: 5 }),
-    );
-    command.startingDate.faker((faker) =>
-      faker.date.recent().getTime().toString(),
-    );
-    command.maturityDate.faker((faker) =>
-      faker.date.future({ years: 2 }).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.externalControlListsIds?.as(() => [
-      HederaIdPropsFixture.create().value,
-    ]);
-    command.externalKycListsIds?.as(() => [
-      HederaIdPropsFixture.create().value,
-    ]);
-    command.complianceId?.as(() => HederaIdPropsFixture.create().value);
-    command.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
-    command.proceedRecipientsIds?.faker((faker) => [
-      HederaIdPropsFixture.create().value,
-    ]);
-    command.proceedRecipientsData?.as(() => ['0x0000']);
-  },
-);
+export const CreateBondCommandFixture = createFixture<CreateBondCommand>((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.nominalValueDecimals.faker((faker) => faker.number.int({ min: 1, max: 5 }));
+  command.startingDate.faker((faker) => faker.date.recent().getTime().toString());
+  command.maturityDate.faker((faker) => faker.date.future({ years: 2 }).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.externalControlListsIds?.as(() => [HederaIdPropsFixture.create().value]);
+  command.externalKycListsIds?.as(() => [HederaIdPropsFixture.create().value]);
+  command.complianceId?.as(() => HederaIdPropsFixture.create().value);
+  command.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
+  command.proceedRecipientsIds?.faker((faker) => [HederaIdPropsFixture.create().value]);
+  command.proceedRecipientsData?.as(() => ["0x0000"]);
+});
 
-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.nominalValueDecimals.faker((faker) =>
-      faker.number.int({ min: 1, max: 5 }),
-    );
-    command.startingDate.faker((faker) =>
-      faker.date.recent().getTime().toString(),
-    );
-    command.maturityDate.faker((faker) =>
-      faker.date.future({ years: 2 }).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);
-    command.proceedRecipientsIds?.faker((faker) => [
-      faker.finance.ethereumAddress(),
-    ]);
-    command.proceedRecipientsData?.faker((faker) => [
-      faker.string.alphanumeric({ length: 32 }),
-    ]);
-  });
+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.nominalValueDecimals.faker((faker) => faker.number.int({ min: 1, max: 5 }));
+  command.startingDate.faker((faker) => faker.date.recent().getTime().toString());
+  command.maturityDate.faker((faker) => faker.date.future({ years: 2 }).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);
+  command.proceedRecipientsIds?.faker((faker) => [faker.finance.ethereumAddress()]);
+  command.proceedRecipientsData?.faker((faker) => [faker.string.alphanumeric({ length: 32 })]);
+});
 
-export const UpdateMaturityDateCommandFixture =
-  createFixture<UpdateMaturityDateCommand>((command) => {
-    command.maturityDate.faker((faker) =>
-      faker.date.future().getTime().toString(),
-    );
-    command.securityId.as(() => HederaIdPropsFixture.create().value);
-  });
+export const UpdateMaturityDateCommandFixture = createFixture<UpdateMaturityDateCommand>((command) => {
+  command.maturityDate.faker((faker) => faker.date.future().getTime().toString());
+  command.securityId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const RedeemAtMaturityByPartitionCommandFixture =
-  createFixture<RedeemAtMaturityByPartitionCommand>((command) => {
-    command.amount.faker((faker) =>
-      faker.number.int({ min: 1, max: 1000 }).toString(),
-    );
+export const RedeemAtMaturityByPartitionCommandFixture = createFixture<RedeemAtMaturityByPartitionCommand>(
+  (command) => {
+    command.amount.faker((faker) => faker.number.int({ min: 1, max: 1000 }).toString());
     command.securityId.as(() => HederaIdPropsFixture.create().value);
     command.sourceId.as(() => HederaIdPropsFixture.create().value);
     command.partitionId.as(() => PartitionIdFixture.create().value);
-  });
+  },
+);
 
-export const FullRedeemAtMaturityCommandFixture =
-  createFixture<FullRedeemAtMaturityCommand>((command) => {
-    command.securityId.as(() => HederaIdPropsFixture.create().value);
-    command.sourceId.as(() => HederaIdPropsFixture.create().value);
-  });
+export const FullRedeemAtMaturityCommandFixture = createFixture<FullRedeemAtMaturityCommand>((command) => {
+  command.securityId.as(() => HederaIdPropsFixture.create().value);
+  command.sourceId.as(() => HederaIdPropsFixture.create().value);
+});
 
 export const BondDetailsFixture = createFixture<BondDetails>((props) => {
   props.currency.faker((faker) => faker.finance.currencyCode());
-  props.nominalValue.faker((faker) =>
-    faker.finance.amount({ min: 1, max: 10, dec: 2 }),
-  );
-  props.nominalValueDecimals.faker((faker) =>
-    faker.number.int({ min: 1, max: 5 }),
-  );
+  props.nominalValue.faker((faker) => faker.finance.amount({ min: 1, max: 10, dec: 2 }));
+  props.nominalValueDecimals.faker((faker) => faker.number.int({ min: 1, max: 5 }));
   props.startingDate.faker((faker) => faker.date.past());
   props.maturityDate.faker((faker) => faker.date.recent());
 });
@@ -220,389 +149,290 @@ export const GetCouponQueryFixture = createFixture<GetCouponQuery>((query) => {
   query.couponId.faker((faker) => faker.number.int({ min: 1, max: 999 }));
 });
 
-export const GetCouponCountQueryFixture = createFixture<GetCouponCountQuery>(
-  (query) => {
-    query.securityId.as(() => HederaIdPropsFixture.create().value);
-  },
-);
+export const GetCouponCountQueryFixture = createFixture<GetCouponCountQuery>((query) => {
+  query.securityId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const GetCouponForQueryFixture = createFixture<GetCouponForQuery>(
-  (query) => {
-    query.securityId.as(() => HederaIdPropsFixture.create().value);
-    query.targetId.as(() => HederaIdPropsFixture.create().value);
-    query.couponId.faker((faker) => faker.number.int({ min: 1, max: 999 }));
-  },
-);
+export const GetCouponForQueryFixture = createFixture<GetCouponForQuery>((query) => {
+  query.securityId.as(() => HederaIdPropsFixture.create().value);
+  query.targetId.as(() => HederaIdPropsFixture.create().value);
+  query.couponId.faker((faker) => faker.number.int({ min: 1, max: 999 }));
+});
 
-export const GetCouponAmountForQueryFixture =
-  createFixture<GetCouponAmountForQuery>((query) => {
-    query.securityId.as(() => HederaIdPropsFixture.create().value);
-    query.targetId.as(() => HederaIdPropsFixture.create().value);
-    query.couponId.faker((faker) => faker.number.int({ min: 1, max: 999 }));
-  });
+export const GetCouponAmountForQueryFixture = createFixture<GetCouponAmountForQuery>((query) => {
+  query.securityId.as(() => HederaIdPropsFixture.create().value);
+  query.targetId.as(() => HederaIdPropsFixture.create().value);
+  query.couponId.faker((faker) => faker.number.int({ min: 1, max: 999 }));
+});
 
-export const GetPrincipalForQueryFixture = createFixture<GetPrincipalForQuery>(
-  (query) => {
-    query.securityId.as(() => HederaIdPropsFixture.create().value);
-    query.targetId.as(() => HederaIdPropsFixture.create().value);
-  },
-);
+export const GetPrincipalForQueryFixture = createFixture<GetPrincipalForQuery>((query) => {
+  query.securityId.as(() => HederaIdPropsFixture.create().value);
+  query.targetId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const GetBondDetailsQueryFixture = createFixture<GetBondDetailsQuery>(
-  (query) => {
-    query.bondId.as(() => new HederaId(HederaIdPropsFixture.create().value));
-  },
-);
+export const GetBondDetailsQueryFixture = createFixture<GetBondDetailsQuery>((query) => {
+  query.bondId.as(() => new HederaId(HederaIdPropsFixture.create().value));
+});
 
-export const GetCouponHoldersQueryFixture =
-  createFixture<GetCouponHoldersQuery>((query) => {
-    query.securityId.as(() => HederaIdPropsFixture.create().value);
-    query.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
-    query.start.faker((faker) => faker.number.int({ min: 1, max: 999 }));
-    query.end.faker((faker) => faker.number.int({ min: 1, max: 999 }));
-  });
+export const GetCouponHoldersQueryFixture = createFixture<GetCouponHoldersQuery>((query) => {
+  query.securityId.as(() => HederaIdPropsFixture.create().value);
+  query.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
+  query.start.faker((faker) => faker.number.int({ min: 1, max: 999 }));
+  query.end.faker((faker) => faker.number.int({ min: 1, max: 999 }));
+});
 
-export const GetTotalCouponHoldersQueryFixture =
-  createFixture<GetTotalCouponHoldersQuery>((query) => {
-    query.securityId.as(() => HederaIdPropsFixture.create().value);
-    query.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
-  });
+export const GetTotalCouponHoldersQueryFixture = createFixture<GetTotalCouponHoldersQuery>((query) => {
+  query.securityId.as(() => HederaIdPropsFixture.create().value);
+  query.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
+});
 
 export const CouponFixture = createFixture<Coupon>((props) => {
-  props.recordTimeStamp.faker((faker) =>
-    faker.date.past().getTime().toString(),
+  props.recordTimeStamp.faker((faker) => faker.date.past().getTime().toString());
+  props.executionTimeStamp.faker((faker) => faker.date.past().getTime().toString());
+  props.rate.faker((faker) => new BigDecimal(BigNumber.from(faker.number.int({ min: 1, max: 5 }))));
+  props.rateDecimals.faker((faker) => faker.number.int({ min: 1, max: 10 }));
+  props.startTimeStamp.faker((faker) => faker.date.past().getTime().toString());
+  props.endTimeStamp.faker((faker) => faker.date.past().getTime().toString());
+  props.fixingTimeStamp.faker((faker) => faker.date.past().getTime().toString());
+  props.rateStatus.faker((faker) => faker.helpers.arrayElement(Object.values(RateStatus)));
+});
+
+export const GetCouponHoldersRequestFixture = createFixture<GetCouponHoldersRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
+  request.start.faker((faker) => faker.number.int({ min: 1, max: 999 }));
+  request.end.faker((faker) => faker.number.int({ min: 1, max: 999 }));
+});
+
+export const GetTotalCouponHoldersRequestFixture = createFixture<GetTotalCouponHoldersRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
+});
+
+export const CreateBondRequestFixture = createFixture<CreateBondRequest>((request) => {
+  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)),
   );
-  props.executionTimeStamp.faker((faker) =>
-    faker.date.past().getTime().toString(),
+  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(","),
   );
-  props.rate.faker(
+  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 }));
+  request.nominalValueDecimals.faker((faker) => faker.number.int({ min: 1, max: 5 }));
+  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.configId.faker(
     (faker) =>
-      new BigDecimal(BigNumber.from(faker.number.int({ min: 1, max: 5 }))),
+      `0x000000000000000000000000000000000000000000000000000000000000000${faker.number.int({ min: 1, max: 9 })}`,
   );
+  request.configVersion.as(() => 1);
+  request.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
+  request.externalPausesIds?.as(() => [HederaIdPropsFixture.create().value]);
+  request.externalControlListsIds?.as(() => [HederaIdPropsFixture.create().value]);
+  request.externalKycListsIds?.as(() => [HederaIdPropsFixture.create().value]);
+  request.complianceId?.as(() => HederaIdPropsFixture.create().value);
+  request.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
+  request.proceedRecipientsIds?.faker((faker) => [HederaIdPropsFixture.create().value]);
+  request.proceedRecipientsData?.as(() => ["0x0000"]);
 });
 
-export const GetCouponHoldersRequestFixture =
-  createFixture<GetCouponHoldersRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
-    request.start.faker((faker) => faker.number.int({ min: 1, max: 999 }));
-    request.end.faker((faker) => faker.number.int({ min: 1, max: 999 }));
-  });
-
-export const GetTotalCouponHoldersRequestFixture =
-  createFixture<GetTotalCouponHoldersRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
-  });
+export const GetBondDetailsRequestFixture = createFixture<GetBondDetailsRequest>((request) => {
+  request.bondId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const CreateBondRequestFixture = createFixture<CreateBondRequest>(
-  (request) => {
-    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 }),
-    );
-    request.nominalValueDecimals.faker((faker) =>
-      faker.number.int({ min: 1, max: 5 }),
-    );
-    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.configId.faker(
-      (faker) =>
-        `0x000000000000000000000000000000000000000000000000000000000000000${faker.number.int({ min: 1, max: 9 })}`,
-    );
-    request.configVersion.as(() => 1);
-    request.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
-    request.externalPausesIds?.as(() => [HederaIdPropsFixture.create().value]);
-    request.externalControlListsIds?.as(() => [
-      HederaIdPropsFixture.create().value,
-    ]);
-    request.externalKycListsIds?.as(() => [
-      HederaIdPropsFixture.create().value,
-    ]);
-    request.complianceId?.as(() => HederaIdPropsFixture.create().value);
-    request.identityRegistryId?.as(() => HederaIdPropsFixture.create().value);
-    request.proceedRecipientsIds?.faker((faker) => [
-      HederaIdPropsFixture.create().value,
-    ]);
-    request.proceedRecipientsData?.as(() => ['0x0000']);
-  },
-);
+export const SetCouponRequestFixture = createFixture<SetCouponRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.rate.faker((faker) => faker.number.int({ min: 1, max: 12 }).toString());
+  request.recordTimestamp.faker((faker) => faker.date.past().getTime().toString());
+  request.executionTimestamp.faker((faker) => faker.date.future().getTime().toString());
+  request.startTimestamp.as(() => "0");
+  request.endTimestamp.as(() => TIME_PERIODS_S.DAY.toString());
+  request.fixingTimestamp.faker((faker) => faker.date.past().getTime().toString());
+  request.rateStatus.faker((faker) => CastRateStatus.toNumber(faker.helpers.arrayElement(Object.values(RateStatus))));
+});
 
-export const GetBondDetailsRequestFixture =
-  createFixture<GetBondDetailsRequest>((request) => {
-    request.bondId.as(() => HederaIdPropsFixture.create().value);
-  });
+export const GetCouponForRequestFixture = createFixture<GetCouponForRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.targetId.as(() => HederaIdPropsFixture.create().value);
+  request.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
+});
 
-export const SetCouponRequestFixture = createFixture<SetCouponRequest>(
-  (request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.rate.faker((faker) =>
-      faker.number.int({ min: 1, max: 12 }).toString(),
-    );
-    request.recordTimestamp.faker((faker) =>
-      faker.date.past().getTime().toString(),
-    );
-    request.executionTimestamp.faker((faker) =>
-      faker.date.future().getTime().toString(),
-    );
-    request.period.as(() => TIME_PERIODS_S.DAY.toString());
-  },
-);
+export const GetPrincipalForRequestFixture = createFixture<GetPrincipalForRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.targetId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const GetCouponForRequestFixture = createFixture<GetCouponForRequest>(
-  (request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.targetId.as(() => HederaIdPropsFixture.create().value);
-    request.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
-  },
-);
+export const GetCouponRequestFixture = createFixture<GetCouponRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
+});
 
-export const GetPrincipalForRequestFixture =
-  createFixture<GetPrincipalForRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.targetId.as(() => HederaIdPropsFixture.create().value);
-  });
+export const GetAllCouponsRequestFixture = createFixture<GetAllCouponsRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const GetCouponRequestFixture = createFixture<GetCouponRequest>(
-  (request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.couponId.faker((faker) => faker.number.int({ min: 1, max: 10 }));
-  },
-);
+export const UpdateMaturityDateRequestFixture = createFixture<UpdateMaturityDateRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.maturityDate.faker((faker) => faker.date.future().getTime().toString());
+});
 
-export const GetAllCouponsRequestFixture = createFixture<GetAllCouponsRequest>(
+export const RedeemAtMaturityByPartitionRequestFixture = createFixture<RedeemAtMaturityByPartitionRequest>(
   (request) => {
+    request.amount.faker((faker) => faker.number.int({ min: 1, max: 1000 }).toString());
     request.securityId.as(() => HederaIdPropsFixture.create().value);
+    request.sourceId.as(() => HederaIdPropsFixture.create().value);
+    request.partitionId.as(() => PartitionIdFixture.create().value);
   },
 );
 
-export const UpdateMaturityDateRequestFixture =
-  createFixture<UpdateMaturityDateRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.maturityDate.faker((faker) =>
-      faker.date.future().getTime().toString(),
-    );
-  });
+export const FullRedeemAtMaturityRequestFixture = createFixture<FullRedeemAtMaturityRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.sourceId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const RedeemAtMaturityByPartitionRequestFixture =
-  createFixture<RedeemAtMaturityByPartitionRequest>((request) => {
-    request.amount.faker((faker) =>
-      faker.number.int({ min: 1, max: 1000 }).toString(),
-    );
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    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 }));
+  request.nominalValueDecimals.faker((faker) => faker.number.int({ min: 1, max: 5 }));
+  let startingDate: Date;
+  request.startingDate.faker((faker) => {
+    startingDate = faker.date.recent();
+    return startingDate.getTime().toString();
   });
-
-export const FullRedeemAtMaturityRequestFixture =
-  createFixture<FullRedeemAtMaturityRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.sourceId.as(() => HederaIdPropsFixture.create().value);
+  let maturityDate: Date;
+  request.maturityDate.faker((faker) => {
+    maturityDate = faker.date.future({ years: 2 });
+    return maturityDate.getTime().toString();
   });
 
-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 }),
-    );
-    request.nominalValueDecimals.faker((faker) =>
-      faker.number.int({ min: 1, max: 5 }),
-    );
-    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.configId.faker(
-      (faker) =>
-        `0x000000000000000000000000000000000000000000000000000000000000000${faker.number.int({ min: 1, max: 9 })}`,
-    );
-    request.configVersion.as(() => 1);
-    request.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
-    request.proceedRecipientsIds?.faker((faker) => [
-      faker.finance.ethereumAddress(),
-    ]);
-    request.proceedRecipientsData?.faker((faker) => ['0x0000']);
-    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);
-  });
+  request.configId.faker(
+    (faker) =>
+      `0x000000000000000000000000000000000000000000000000000000000000000${faker.number.int({ min: 1, max: 9 })}`,
+  );
+  request.configVersion.as(() => 1);
+  request.diamondOwnerAccount?.as(() => HederaIdPropsFixture.create().value);
+  request.proceedRecipientsIds?.faker((faker) => [faker.finance.ethereumAddress()]);
+  request.proceedRecipientsData?.faker((faker) => ["0x0000"]);
+  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);
+});
 
-export const AddProceedRecipientRequestFixture =
-  createFixture<AddProceedRecipientRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
-    request.data?.as(() => '0x');
-  });
-export const UpdateProceedRecipientDataRequestFixture =
-  createFixture<UpdateProceedRecipientDataRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
-    request.data.as(() => '0x');
-  });
+export const AddProceedRecipientRequestFixture = createFixture<AddProceedRecipientRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
+  request.data?.as(() => "0x");
+});
+export const UpdateProceedRecipientDataRequestFixture = createFixture<UpdateProceedRecipientDataRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
+  request.data.as(() => "0x");
+});
 
-export const RemoveProceedRecipientRequestFixture =
-  createFixture<RemoveProceedRecipientRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
-  });
+export const RemoveProceedRecipientRequestFixture = createFixture<RemoveProceedRecipientRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const IsProceedRecipientRequestFixture =
-  createFixture<IsProceedRecipientRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
-  });
+export const IsProceedRecipientRequestFixture = createFixture<IsProceedRecipientRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
+});
 
-export const GetProceedRecipientsRequestFixture =
-  createFixture<GetProceedRecipientsRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.pageIndex.faker((faker) => faker.number.int({ min: 1, max: 10 }));
-    request.pageSize.faker((faker) => faker.number.int({ min: 1, max: 50 }));
-  });
+export const GetProceedRecipientsRequestFixture = createFixture<GetProceedRecipientsRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.pageIndex.faker((faker) => faker.number.int({ min: 1, max: 10 }));
+  request.pageSize.faker((faker) => faker.number.int({ min: 1, max: 50 }));
+});
 
-export const GetProceedRecipientsCountRequestFixture =
-  createFixture<GetProceedRecipientsCountRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-  });
-export const GetProceedRecipientDataRequestFixture =
-  createFixture<GetProceedRecipientDataRequest>((request) => {
-    request.securityId.as(() => HederaIdPropsFixture.create().value);
-    request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
-  });
+export const GetProceedRecipientsCountRequestFixture = createFixture<GetProceedRecipientsCountRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+});
+export const GetProceedRecipientDataRequestFixture = createFixture<GetProceedRecipientDataRequest>((request) => {
+  request.securityId.as(() => HederaIdPropsFixture.create().value);
+  request.proceedRecipientId.as(() => HederaIdPropsFixture.create().value);
+});
diff --git a/packages/ats/sdk/__tests__/port/environmentMock.ts b/packages/ats/sdk/__tests__/port/environmentMock.ts
index 0cd716718..200da37e0 100644
--- a/packages/ats/sdk/__tests__/port/environmentMock.ts
+++ b/packages/ats/sdk/__tests__/port/environmentMock.ts
@@ -243,6 +243,7 @@ import {
   ClearingTransfer,
 } from "@domain/context/security/Clearing";
 import { HoldDetails } from "@domain/context/security/Hold";
+import { RateStatus } from '@domain/context/bond/RateStatus';
 
 //* Mock console.log() method
 global.console.log = jest.fn();
@@ -508,8 +509,18 @@ function createBondMockImplementation(
   const numberOfCoupons = Math.ceil(diff / couponInfo.couponFrequency);
 
   for (let i = 0; i < numberOfCoupons; i++) {
-    const timeStamp = couponInfo.firstCouponDate + couponInfo.couponFrequency * i;
-    const coupon = new Coupon(timeStamp, timeStamp, couponInfo.couponRate, couponInfo.couponRateDecimals, 0);
+    const timeStamp =
+      couponInfo.firstCouponDate + couponInfo.couponFrequency * i;
+    const coupon = new Coupon(
+      timeStamp,
+      timeStamp,
+      couponInfo.couponRate,
+      couponInfo.couponRateDecimals,
+      timeStamp,
+      timeStamp,
+      timeStamp,
+      RateStatus.PENDING,
+    );
     coupons.push(coupon);
   }
 
@@ -1601,13 +1612,25 @@ jest.mock("@port/out/rpc/RPCTransactionAdapter", () => {
   });
 
   singletonInstance.setCoupon = jest.fn(
-    async (address: EvmAddress, recordDate: BigDecimal, executionDate: BigDecimal, rate: BigDecimal) => {
+    async (
+      address: EvmAddress,
+      recordDate: BigDecimal,
+      executionDate: BigDecimal,
+      rate: BigDecimal,
+      startDate: BigDecimal,
+      endDate: BigDecimal,
+      fixingDate: BigDecimal,
+      rateStatus: RateStatus,
+    ) => {
       const coupon = new Coupon(
         parseInt(recordDate.toString()),
         parseInt(executionDate.toString()),
         rate,
         rate.decimals,
-        0,
+        parseInt(startDate.toString()),
+        parseInt(endDate.toString()),
+        parseInt(fixingDate.toString()),
+        rateStatus,
       );
       coupons.push(coupon);
       return {
diff --git a/packages/ats/sdk/__tests__/port/in/Bond.test.ts b/packages/ats/sdk/__tests__/port/in/Bond.test.ts
index ceeddd450..c8ff7714f 100644
--- a/packages/ats/sdk/__tests__/port/in/Bond.test.ts
+++ b/packages/ats/sdk/__tests__/port/in/Bond.test.ts
@@ -37,6 +37,7 @@ import { MirrorNodeAdapter } from "@port/out/mirror/MirrorNodeAdapter";
 import { RPCTransactionAdapter } from "@port/out/rpc/RPCTransactionAdapter";
 import { Wallet, ethers } from "ethers";
 import BaseError from "@core/error/BaseError";
+import { CastRateStatus, RateStatus } from "@domain/context/bond/RateStatus";
 
 SDK.log = { level: "ERROR", transports: new LoggerTransports.Console() };
 
@@ -169,6 +170,7 @@ describe("🧪 Bond test", () => {
     const couponRate = "3";
     const couponRecordDate = startingDate + 30;
     const couponExecutionDate = startingDate + 35;
+    const couponFixingDate = startingDate + 25;
 
     await Bond.setCoupon(
       new SetCouponRequest({
@@ -176,7 +178,10 @@ describe("🧪 Bond test", () => {
         rate: couponRate,
         recordTimestamp: couponRecordDate.toString(),
         executionTimestamp: couponExecutionDate.toString(),
-        period: TIME_PERIODS_S.DAY.toString(),
+        startTimestamp: "0",
+        endTimestamp: TIME_PERIODS_S.DAY.toString(),
+        fixingTimestamp: couponFixingDate.toString(),
+        rateStatus: CastRateStatus.toNumber(RateStatus.SET),
       }),
     );
 
@@ -234,6 +239,7 @@ describe("🧪 Bond test", () => {
     const rate = "1";
     const recordTimestamp = Math.ceil(new Date().getTime() / 1000) + 1000;
     const executionTimestamp = recordTimestamp + 1000;
+    const couponFixingDate = recordTimestamp - 1000;
 
     await Bond.setCoupon(
       new SetCouponRequest({
@@ -241,7 +247,10 @@ describe("🧪 Bond test", () => {
         rate: rate,
         recordTimestamp: recordTimestamp.toString(),
         executionTimestamp: executionTimestamp.toString(),
-        period: TIME_PERIODS_S.DAY.toString(),
+        startTimestamp: "0",
+        endTimestamp: TIME_PERIODS_S.DAY.toString(),
+        fixingTimestamp: couponFixingDate.toString(),
+        rateStatus: CastRateStatus.toNumber(RateStatus.PENDING),
       }),
     );
 
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 cee0eb249..2bd9f71b1 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
@@ -205,6 +205,7 @@
 
 import { Command } from '@core/command/Command';
 import { CommandResponse } from '@core/command/CommandResponse';
+import { RateStatus } from '@domain/context/bond/RateStatus.js';
 
 export class SetCouponCommandResponse implements CommandResponse {
   constructor(
@@ -219,7 +220,10 @@ export class SetCouponCommand extends Command<SetCouponCommandResponse> {
     public readonly recordDate: string,
     public readonly executionDate: string,
     public readonly rate: string,
-    public readonly period: string,
+    public readonly startDate: string,
+    public readonly endDate: string,
+    public readonly fixingDate: string,
+    public readonly rateStatus: RateStatus,
   ) {
     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 9bc7bc7b3..585e68414 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,16 @@ export class SetCouponCommandHandler
 
   async execute(command: SetCouponCommand): Promise<SetCouponCommandResponse> {
     try {
-      const { address, recordDate, executionDate, rate, period } = command;
+      const {
+        address,
+        recordDate,
+        executionDate,
+        rate,
+        startDate,
+        endDate,
+        fixingDate,
+        rateStatus,
+      } = command;
       const handler = this.transactionService.getHandler();
 
       const securityEvmAddress =
@@ -236,7 +245,10 @@ export class SetCouponCommandHandler
         BigDecimal.fromString(recordDate),
         BigDecimal.fromString(executionDate),
         BigDecimal.fromString(rate),
-        BigDecimal.fromString(period),
+        BigDecimal.fromString(startDate),
+        BigDecimal.fromString(endDate),
+        BigDecimal.fromString(fixingDate),
+        rateStatus,
         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 7158e8858..b0eb727d2 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,7 +314,10 @@ describe('SetCouponCommandHandler', () => {
       BigDecimal.fromString(command.recordDate),
       BigDecimal.fromString(command.executionDate),
       BigDecimal.fromString(command.rate),
-      BigDecimal.fromString(command.period),
+      BigDecimal.fromString(command.startDate),
+      BigDecimal.fromString(command.endDate),
+      BigDecimal.fromString(command.fixingDate),
+      command.rateStatus,
       command.address,
     );
     expect(transactionServiceMock.getTransactionResult).toHaveBeenCalledWith(
diff --git a/packages/ats/sdk/src/core/error/BaseError.ts b/packages/ats/sdk/src/core/error/BaseError.ts
index 6e4f274ec..6343af4a9 100644
--- a/packages/ats/sdk/src/core/error/BaseError.ts
+++ b/packages/ats/sdk/src/core/error/BaseError.ts
@@ -236,6 +236,8 @@ export enum ErrorCode {
   InvalidVcFormat = '10034',
   InvalidVcDates = '10036',
   InvalidTimeUnits = '10037',
+  InvalidInterestRateType = '10038',
+  InvalidRateStatus = '10039',
 
   // Error codes for Logic Errors (Prefix: 2XXXX)
   AccountAlreadyInControlList = '20013',
diff --git a/packages/ats/sdk/src/domain/context/bond/Bond.ts b/packages/ats/sdk/src/domain/context/bond/Bond.ts
index 48af2bad4..fa8e28bf9 100644
--- a/packages/ats/sdk/src/domain/context/bond/Bond.ts
+++ b/packages/ats/sdk/src/domain/context/bond/Bond.ts
@@ -204,7 +204,24 @@
 */
 
 import { Security, SecurityProps } from '../security/Security';
+import BaseError from '@core/error/BaseError';
+import { CastRateStatus, RateStatus } from './RateStatus';
+import { InvalidRateStatus} from './error/InvalidRateStatus';
 
 export interface BondProps extends SecurityProps {}
 
-export class Bond extends Security implements BondProps {}
+export class Bond extends Security implements BondProps {
+   public static checkRateStatus(value: number | RateStatus): BaseError[] {
+       const errorList: BaseError[] = [];
+   
+       const length = Object.keys(RateStatus).length;
+   
+       if (typeof value !== 'number') {
+         value = CastRateStatus.toNumber(value);
+       }
+   
+       if (value >= length) errorList.push(new InvalidRateStatus(value));
+   
+       return errorList;
+     }
+}
diff --git a/packages/ats/sdk/src/domain/context/bond/Coupon.ts b/packages/ats/sdk/src/domain/context/bond/Coupon.ts
index 33883d292..2582594ea 100644
--- a/packages/ats/sdk/src/domain/context/bond/Coupon.ts
+++ b/packages/ats/sdk/src/domain/context/bond/Coupon.ts
@@ -206,14 +206,18 @@
 import ValidatedDomain from '@core/validation/ValidatedArgs';
 import BigDecimal from '../shared/BigDecimal';
 import { SecurityDate } from '../shared/SecurityDate';
+import { RateStatus } from './RateStatus';
+import { Bond } from './Bond';
 
 export class Coupon extends ValidatedDomain<Coupon> {
   recordTimeStamp: number;
   executionTimeStamp: number;
   rate: BigDecimal;
   rateDecimals: number;
-  period: number;
-
+  startTimeStamp: number;
+  endTimeStamp: number;
+  fixingTimeStamp: number;
+  rateStatus: RateStatus;
   snapshotId?: number;
 
   constructor(
@@ -221,20 +225,29 @@ export class Coupon extends ValidatedDomain<Coupon> {
     executionTimeStamp: number,
     rate: BigDecimal,
     rateDecimals: number,
-    period: number,
+    startTimeStamp: number,
+    endTimeStamp: number,
+    fixingTimeStamp: number,
+    rateStatus: RateStatus,
     snapshotId?: number,
   ) {
     super({
       executionTimeStamp: (val) => {
         return SecurityDate.checkDateTimestamp(val, this.recordTimeStamp);
       },
+      rateStatus: (val) => {
+         return Bond.checkRateStatus(val);
+      },
     });
 
     this.recordTimeStamp = recordTimeStamp;
     this.executionTimeStamp = executionTimeStamp;
     this.rate = rate;
     this.rateDecimals = rateDecimals;
-    this.period = period;
+    this.startTimeStamp = startTimeStamp;
+    this.endTimeStamp = endTimeStamp;
+    this.fixingTimeStamp = fixingTimeStamp;
+    this.rateStatus = rateStatus;
     this.snapshotId = snapshotId ? snapshotId : undefined;
 
     ValidatedDomain.handleValidation(Coupon.name, this);
diff --git a/packages/ats/sdk/src/domain/context/bond/RateStatus.ts b/packages/ats/sdk/src/domain/context/bond/RateStatus.ts
new file mode 100644
index 000000000..c8e5ec16e
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/bond/RateStatus.ts
@@ -0,0 +1,221 @@
+/*
+                                 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.
+
+*/
+
+export enum RateStatus {
+  PENDING = 'PENDING',
+  SET = 'SET',
+}
+
+export class CastRateStatus {
+  static fromNumber(id: number): RateStatus {
+    if (id == 0) return RateStatus.PENDING;
+    return RateStatus.SET;
+  }
+
+  static toNumber(value: RateStatus): number {
+    if (value == RateStatus.PENDING) return 0;
+    return 1;
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/bond/error/InvalidRateStatus.ts b/packages/ats/sdk/src/domain/context/bond/error/InvalidRateStatus.ts
new file mode 100644
index 000000000..8995b26b0
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/bond/error/InvalidRateStatus.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 InvalidRateStatus extends BaseError {
+  constructor(value: number) {
+    super(ErrorCode.InvalidRateStatus, `Rate Status ${value} is not valid`);
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/factory/FactorySecurityToken.ts b/packages/ats/sdk/src/domain/context/factory/FactorySecurityToken.ts
index 215388a3b..28c696bf2 100644
--- a/packages/ats/sdk/src/domain/context/factory/FactorySecurityToken.ts
+++ b/packages/ats/sdk/src/domain/context/factory/FactorySecurityToken.ts
@@ -221,7 +221,6 @@ export class FactoryEquityToken {
 export class FactoryBondToken {
   public security: SecurityData;
   public bondDetails: BondDetailsData;
-
   public proceedRecipients: string[];
   public proceedRecipientsData: string[];
 
diff --git a/packages/ats/sdk/src/domain/context/factory/error/InvalidInterestRateType.ts b/packages/ats/sdk/src/domain/context/factory/error/InvalidInterestRateType.ts
new file mode 100644
index 000000000..29f2deb64
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/factory/error/InvalidInterestRateType.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 BaseError, { ErrorCode } from '@core/error/BaseError';
+
+export class InvalidInterestRateType extends BaseError {
+  constructor(value: number) {
+    super(
+      ErrorCode.InvalidInterestRateType,
+      `Interest Rate Type ${value} is not valid`,
+    );
+  }
+}
diff --git a/packages/ats/sdk/src/domain/context/factory/error/MissingInterestRateType.ts b/packages/ats/sdk/src/domain/context/factory/error/MissingInterestRateType.ts
new file mode 100644
index 000000000..e8952aeb2
--- /dev/null
+++ b/packages/ats/sdk/src/domain/context/factory/error/MissingInterestRateType.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 MissingInterestRateType extends BaseError {
+  constructor() {
+    super(ErrorCode.EmptyValue, `Interest Rate type is missing`);
+  }
+}
diff --git a/packages/ats/sdk/src/port/in/bond/Bond.ts b/packages/ats/sdk/src/port/in/bond/Bond.ts
index 8cce5c0f8..a9540680a 100644
--- a/packages/ats/sdk/src/port/in/bond/Bond.ts
+++ b/packages/ats/sdk/src/port/in/bond/Bond.ts
@@ -62,6 +62,7 @@ import {
   GetProceedRecipientsCountRequest,
   GetProceedRecipientsRequest,
 } from "../request";
+import { CastRateStatus } from "@domain/context/bond/RateStatus";
 
 interface IBondInPort {
   create(request: CreateBondRequest): Promise<{ security: SecurityViewModel; transactionId: string }>;
@@ -185,11 +186,29 @@ class BondInPort implements IBondInPort {
 
   @LogError
   async setCoupon(request: SetCouponRequest): Promise<{ payload: number; transactionId: string }> {
-    const { rate, recordTimestamp, executionTimestamp, securityId, period } = request;
+    const {
+      rate,
+      recordTimestamp,
+      executionTimestamp,
+      securityId,
+      startTimestamp,
+      endTimestamp,
+      fixingTimestamp,
+      rateStatus,
+    } = request;
     ValidatedRequest.handleValidation("SetCouponRequest", request);
 
     return await this.commandBus.execute(
-      new SetCouponCommand(securityId, recordTimestamp, executionTimestamp, rate, period),
+      new SetCouponCommand(
+        securityId,
+        recordTimestamp,
+        executionTimestamp,
+        rate,
+        startTimestamp,
+        endTimestamp,
+        fixingTimestamp,
+        CastRateStatus.fromNumber(rateStatus),
+      ),
     );
   }
 
@@ -252,7 +271,10 @@ class BondInPort implements IBondInPort {
       executionDate: new Date(res.coupon.executionTimeStamp * ONE_THOUSAND),
       rate: res.coupon.rate.toString(),
       rateDecimals: res.coupon.rateDecimals,
-      period: res.coupon.period,
+      startDate: new Date(res.coupon.startTimeStamp * ONE_THOUSAND),
+      endDate: new Date(res.coupon.endTimeStamp * ONE_THOUSAND),
+      fixingDate: new Date(res.coupon.fixingTimeStamp * ONE_THOUSAND),
+      rateStatus: CastRateStatus.toNumber(res.coupon.rateStatus),
     };
 
     return coupon;
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 b42208825..277a20272 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
@@ -84,6 +84,7 @@ import { IsProceedRecipientQuery } from "@query/security/proceedRecipient/isProc
 import { GetProceedRecipientsCountQuery } from "@query/security/proceedRecipient/getProceedRecipientsCount/GetProceedRecipientsCountQuery";
 import { GetProceedRecipientDataQuery } from "@query/security/proceedRecipient/getProceedRecipientData/GetProceedRecipientDataQuery";
 import { GetProceedRecipientsQuery } from "@query/security/proceedRecipient/getProceedRecipients/GetProceedRecipientsQuery";
+import { CastRateStatus } from "@domain/context/bond/RateStatus";
 
 describe("Bond", () => {
   let commandBusMock: jest.Mocked<CommandBus>;
@@ -480,7 +481,10 @@ describe("Bond", () => {
           setCouponRequest.recordTimestamp,
           setCouponRequest.executionTimestamp,
           setCouponRequest.rate,
-          setCouponRequest.period,
+          setCouponRequest.startTimestamp,
+          setCouponRequest.endTimestamp,
+          setCouponRequest.fixingTimestamp,
+          CastRateStatus.fromNumber(setCouponRequest.rateStatus),
         ),
       );
 
@@ -501,7 +505,10 @@ describe("Bond", () => {
           setCouponRequest.recordTimestamp,
           setCouponRequest.executionTimestamp,
           setCouponRequest.rate,
-          setCouponRequest.period,
+          setCouponRequest.startTimestamp,
+          setCouponRequest.endTimestamp,
+          setCouponRequest.fixingTimestamp,
+          CastRateStatus.fromNumber(setCouponRequest.rateStatus),
         ),
       );
     });
@@ -857,6 +864,11 @@ describe("Bond", () => {
             recordDate: new Date(expectedResponse2.coupon.recordTimeStamp * ONE_THOUSAND),
             executionDate: new Date(expectedResponse2.coupon.executionTimeStamp * ONE_THOUSAND),
             rate: expectedResponse2.coupon.rate.toString(),
+            rateDecimals: expectedResponse2.coupon.rateDecimals,
+            startDate: new Date(expectedResponse2.coupon.startTimeStamp * ONE_THOUSAND),
+            endDate: new Date(expectedResponse2.coupon.endTimeStamp * ONE_THOUSAND),
+            fixingDate: new Date(expectedResponse2.coupon.fixingTimeStamp * ONE_THOUSAND),
+            rateStatus: CastRateStatus.toNumber(expectedResponse2.coupon.rateStatus),
           },
         ]),
       );
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 8acf0fecd..110a50b65 100644
--- a/packages/ats/sdk/src/port/in/request/bond/SetCouponRequest.ts
+++ b/packages/ats/sdk/src/port/in/request/bond/SetCouponRequest.ts
@@ -207,26 +207,36 @@ import ValidatedRequest from '@core/validation/ValidatedArgs';
 import FormatValidation from '../FormatValidation';
 
 import { SecurityDate } from '@domain/context/shared/SecurityDate';
+import { Bond } from '@domain/context/bond/Bond';
 
 export default class SetCouponRequest extends ValidatedRequest<SetCouponRequest> {
   securityId: string;
   rate: string;
   recordTimestamp: string;
   executionTimestamp: string;
-  period: string;
+  startTimestamp: string;
+  endTimestamp: string;
+  fixingTimestamp: string;
+  rateStatus: number;
 
   constructor({
     securityId,
     rate,
     recordTimestamp,
     executionTimestamp,
-    period,
+    startTimestamp,
+    endTimestamp,
+    fixingTimestamp,
+    rateStatus,
   }: {
     securityId: string;
     rate: string;
     recordTimestamp: string;
     executionTimestamp: string;
-    period: string;
+    startTimestamp: string;
+    endTimestamp: string;
+    fixingTimestamp: string;
+    rateStatus: number;
   }) {
     super({
       rate: FormatValidation.checkAmount(true),
@@ -245,13 +255,32 @@ export default class SetCouponRequest extends ValidatedRequest<SetCouponRequest>
         );
       },
       securityId: FormatValidation.checkHederaIdFormatOrEvmAddress(),
-      period: FormatValidation.checkAmount(),
+      endTimestamp: (val) => {
+        return SecurityDate.checkDateTimestamp(
+          parseInt(val),
+          parseInt(this.startTimestamp),
+          undefined,
+        );
+      },
+      fixingTimestamp: (val) => {
+        return SecurityDate.checkDateTimestamp(
+          parseInt(val),
+          undefined,
+          parseInt(this.executionTimestamp),
+        );
+      },
+      rateStatus: (val) => {
+        return Bond.checkRateStatus(val);
+      },
     });
 
     this.securityId = securityId;
     this.rate = rate;
     this.recordTimestamp = recordTimestamp;
     this.executionTimestamp = executionTimestamp;
-    this.period = period;
+    this.startTimestamp = startTimestamp;
+    this.endTimestamp = endTimestamp;
+    this.fixingTimestamp = fixingTimestamp;
+    this.rateStatus = rateStatus;
   }
 }
diff --git a/packages/ats/sdk/src/port/in/response/CouponViewModel.ts b/packages/ats/sdk/src/port/in/response/CouponViewModel.ts
index 082119c9e..e39231ba7 100644
--- a/packages/ats/sdk/src/port/in/response/CouponViewModel.ts
+++ b/packages/ats/sdk/src/port/in/response/CouponViewModel.ts
@@ -211,6 +211,9 @@ export default interface CouponViewModel extends QueryResponse {
   executionDate: Date;
   rate: string;
   rateDecimals: number;
-  period: number;
+  startDate: Date;
+  endDate: Date;
+  fixingDate: Date;
+  rateStatus: number;
   snapshotId?: number;
 }
diff --git a/packages/ats/sdk/src/port/out/TransactionAdapter.ts b/packages/ats/sdk/src/port/out/TransactionAdapter.ts
index 62e3895dc..f51c51bb5 100644
--- a/packages/ats/sdk/src/port/out/TransactionAdapter.ts
+++ b/packages/ats/sdk/src/port/out/TransactionAdapter.ts
@@ -220,6 +220,7 @@ import DfnsSettings from '@core/settings/custodialWalletSettings/DfnsSettings';
 import FireblocksSettings from '@core/settings/custodialWalletSettings/FireblocksSettings';
 import AWSKMSSettings from '@core/settings/custodialWalletSettings/AWSKMSSettings';
 import { ClearingOperationType } from '@domain/context/security/Clearing';
+import { RateStatus } from '@domain/context/bond/RateStatus';
 
 export interface InitializationData {
   account?: Account;
@@ -381,7 +382,10 @@ interface ITransactionAdapter {
     recordDate: BigDecimal,
     executionDate: BigDecimal,
     rate: BigDecimal,
-    period: BigDecimal,
+    startDate: BigDecimal,
+    endDate: BigDecimal,
+    fixingDate: BigDecimal,
+    rateStatus: RateStatus,
     securityId?: ContractId | string,
   ): Promise<TransactionResponse<any, Error>>;
   setDocument(
@@ -1297,7 +1301,10 @@ export default abstract class TransactionAdapter
     recordDate: BigDecimal,
     executionDate: BigDecimal,
     rate: BigDecimal,
-    period: BigDecimal,
+    startDate: BigDecimal,
+    endDate: BigDecimal,
+    fixingDate: BigDecimal,
+    rateStatus: RateStatus,
     securityId?: ContractId | string,
   ): Promise<TransactionResponse<any, Error>>;
   abstract setVotingRights(
diff --git a/packages/ats/sdk/src/port/out/hs/HederaTransactionAdapter.ts b/packages/ats/sdk/src/port/out/hs/HederaTransactionAdapter.ts
index 7f3f565a3..0fca62ee8 100644
--- a/packages/ats/sdk/src/port/out/hs/HederaTransactionAdapter.ts
+++ b/packages/ats/sdk/src/port/out/hs/HederaTransactionAdapter.ts
@@ -312,6 +312,7 @@ import {
 import { MissingRegulationSubType } from '@domain/context/factory/error/MissingRegulationSubType';
 import { MissingRegulationType } from '@domain/context/factory/error/MissingRegulationType';
 import { BaseContract, Contract, ContractTransaction } from 'ethers';
+import { RateStatus } from '@domain/context/bond/RateStatus';
 
 export abstract class HederaTransactionAdapter extends TransactionAdapter {
   mirrorNodes: MirrorNodes;
@@ -1089,7 +1090,10 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     recordDate: BigDecimal,
     executionDate: BigDecimal,
     rate: BigDecimal,
-    period: BigDecimal,
+    startDate: BigDecimal,
+    endDate: BigDecimal,
+    fixingDate: BigDecimal,
+    rateStatus: RateStatus,
     securityId: ContractId | string,
   ): Promise<TransactionResponse<any, Error>> {
     LogService.logTrace(
@@ -1097,7 +1101,10 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       recordDate :${recordDate} , 
       executionDate: ${executionDate},
       rate : ${rate},
-      period: ${period}`,
+       startDate: ${startDate},
+      endDate: ${endDate},
+      fixingDate: ${fixingDate},
+      rateStatus: ${rateStatus}`,
     );
 
     const coupon = {
@@ -1105,7 +1112,10 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
       executionDate: executionDate.toHexString(),
       rate: rate.toHexString(),
       rateDecimals: rate.decimals,
-      period: period.toHexString(),
+      startDate: startDate.toBigNumber(),
+      endDate: endDate.toBigNumber(),
+      fixingDate: fixingDate.toBigNumber(),
+      rateStatus: rateStatus,
     };
     return this.executeWithArgs(
       new BondUSAFacet__factory().attach(security.toString()),
diff --git a/packages/ats/sdk/src/port/out/rpc/RPCQueryAdapter.ts b/packages/ats/sdk/src/port/out/rpc/RPCQueryAdapter.ts
index 554bc519c..994167932 100644
--- a/packages/ats/sdk/src/port/out/rpc/RPCQueryAdapter.ts
+++ b/packages/ats/sdk/src/port/out/rpc/RPCQueryAdapter.ts
@@ -293,6 +293,7 @@ import { HoldDetails } from '@domain/context/security/Hold';
 import { CouponAmountFor } from '@domain/context/bond/CouponAmountFor';
 import {PrincipalFor} from '@domain/context/bond/PrincipalFor';
 import { DividendAmountFor } from '@domain/context/equity/DividendAmountFor';
+import { CastRateStatus } from '@domain/context/bond/RateStatus';
 import { CouponFor } from '@domain/context/bond/CouponFor';
 
 const LOCAL_JSON_RPC_RELAY_URL = 'http://127.0.0.1:7546/api';
@@ -686,6 +687,7 @@ export class RPCQueryAdapter {
       address.toString(),
     ).getBondDetails();
 
+
     return new BondDetails(
       res.currency,
       new BigDecimal(res.nominalValue.toString()),
@@ -918,6 +920,10 @@ export class RPCQueryAdapter {
       couponInfo.coupon.executionDate.toNumber(),
       new BigDecimal(couponInfo.coupon.rate.toString()),
       couponInfo.coupon.rateDecimals,
+      couponInfo.coupon.startDate.toNumber(),
+      couponInfo.coupon.endDate.toNumber(),
+      couponInfo.coupon.fixingDate.toNumber(),
+      CastRateStatus.fromNumber(couponInfo.coupon.rateStatus),
       couponInfo.snapshotId.toNumber(),
     );
   }
diff --git a/packages/ats/sdk/src/port/out/rpc/RPCTransactionAdapter.ts b/packages/ats/sdk/src/port/out/rpc/RPCTransactionAdapter.ts
index 7cbb7048f..1d061e9d0 100644
--- a/packages/ats/sdk/src/port/out/rpc/RPCTransactionAdapter.ts
+++ b/packages/ats/sdk/src/port/out/rpc/RPCTransactionAdapter.ts
@@ -309,6 +309,7 @@ import {
 import { SecurityDataBuilder } from '@domain/context/util/SecurityDataBuilder';
 import NetworkService from '@service/network/NetworkService';
 import MetamaskService from '@service/wallet/metamask/MetamaskService';
+import { RateStatus } from '@domain/context/bond/RateStatus';
 
 @singleton()
 export class RPCTransactionAdapter extends TransactionAdapter {
@@ -856,7 +857,10 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     recordDate: BigDecimal,
     executionDate: BigDecimal,
     rate: BigDecimal,
-    period: BigDecimal,
+    startDate: BigDecimal,
+    endDate: BigDecimal,
+    fixingDate: BigDecimal,
+    rateStatus: RateStatus,
     securityId?: ContractId | string,
   ): Promise<TransactionResponse> {
     LogService.logTrace(
@@ -864,14 +868,19 @@ export class RPCTransactionAdapter extends TransactionAdapter {
       recordDate :${recordDate} , 
       executionDate: ${executionDate},
       rate : ${rate},
-      period: ${period}`,
+      startDate: ${startDate},
+      endDate: ${endDate},
+      fixingDate: ${fixingDate}`,
     );
     const couponStruct: IBondRead.CouponStruct = {
       recordDate: recordDate.toBigNumber(),
       executionDate: executionDate.toBigNumber(),
       rate: rate.toBigNumber(),
       rateDecimals: rate.decimals,
-      period: period.toBigNumber(),
+      startDate: startDate.toBigNumber(),
+      endDate: endDate.toBigNumber(),
+      fixingDate: fixingDate.toBigNumber(),
+      rateStatus: rateStatus,
     };
 
     return this.executeTransaction(
diff --git a/packages/mass-payout/contracts/contracts/core/AccessControl.sol b/packages/mass-payout/contracts/contracts/core/AccessControl.sol
index f3f5e44cb..8a7a46661 100644
--- a/packages/mass-payout/contracts/contracts/core/AccessControl.sol
+++ b/packages/mass-payout/contracts/contracts/core/AccessControl.sol
@@ -207,7 +207,7 @@ pragma solidity 0.8.18;
 // SPDX-License-Identifier: BSD-3-Clause-Attribution
 
 import { IAccessControl } from './interfaces/IAccessControl.sol';
-import { Common } from '../common/Common.sol';
+import { Common } from '../../layer_0/common/Common.sol';
 
 abstract contract AccessControl is IAccessControl, Common {
     function grantRole(
diff --git a/packages/mass-payout/contracts/contracts/core/Pause.sol b/packages/mass-payout/contracts/contracts/core/Pause.sol
index e9fff8f6a..63b78096e 100644
--- a/packages/mass-payout/contracts/contracts/core/Pause.sol
+++ b/packages/mass-payout/contracts/contracts/core/Pause.sol
@@ -208,7 +208,7 @@ pragma solidity 0.8.18;
 
 import { IPause } from './interfaces/IPause.sol';
 import { _PAUSER_ROLE } from '../constants/roles.sol';
-import { Common } from '../common/Common.sol';
+import { Common } from '../../layer_0/common/Common.sol';
 
 abstract contract Pause is IPause, Common {
     function pause() external override onlyUnpaused onlyRole(_PAUSER_ROLE) returns (bool success_) {