diff --git a/apps/api/src/models/rule.ts b/apps/api/src/models/rule.ts
index f935d2ad31..4985b26477 100644
--- a/apps/api/src/models/rule.ts
+++ b/apps/api/src/models/rule.ts
@@ -13,19 +13,21 @@ import { EvaluationResult } from './interfaces/evaluation-result.interface';
 import { RuleInterface } from './interfaces/rule.interface';
 
 export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
+  protected exchangeRateDataService: ExchangeRateDataService;
+
   private key: XRayRuleKey;
   private languageCode: string;
 
-  public constructor(
-    protected exchangeRateDataService: ExchangeRateDataService,
-    {
-      key,
-      languageCode
-    }: {
-      key: XRayRuleKey;
-      languageCode: string;
-    }
-  ) {
+  public constructor({
+    exchangeRateDataService,
+    key,
+    languageCode
+  }: {
+    exchangeRateDataService: ExchangeRateDataService;
+    key: XRayRuleKey;
+    languageCode: string;
+  }) {
+    this.exchangeRateDataService = exchangeRateDataService;
     this.key = key;
     this.languageCode = languageCode;
   }
diff --git a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts b/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
index ccba4258c3..de76c7686f 100644
--- a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
@@ -20,7 +20,8 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'AccountClusterRiskCurrentInvestment'
     });
diff --git a/apps/api/src/models/rules/account-cluster-risk/single-account.ts b/apps/api/src/models/rules/account-cluster-risk/single-account.ts
index 98a17a9c80..ee86ab6b99 100644
--- a/apps/api/src/models/rules/account-cluster-risk/single-account.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/single-account.ts
@@ -18,7 +18,8 @@ export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'AccountClusterRiskSingleAccount'
     });
diff --git a/apps/api/src/models/rules/asset-class-cluster-risk/equity.ts b/apps/api/src/models/rules/asset-class-cluster-risk/equity.ts
index fc36d6dba3..3baece2df8 100644
--- a/apps/api/src/models/rules/asset-class-cluster-risk/equity.ts
+++ b/apps/api/src/models/rules/asset-class-cluster-risk/equity.ts
@@ -18,7 +18,8 @@ export class AssetClassClusterRiskEquity extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'AssetClassClusterRiskEquity'
     });
diff --git a/apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts b/apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts
index f4c333fafb..5a543a1ad2 100644
--- a/apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts
+++ b/apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts
@@ -18,7 +18,8 @@ export class AssetClassClusterRiskFixedIncome extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'AssetClassClusterRiskFixedIncome'
     });
diff --git a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
index 88f3ecbfe8..5c42438869 100644
--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
@@ -18,7 +18,8 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'CurrencyClusterRiskBaseCurrencyCurrentInvestment'
     });
diff --git a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
index 525476d17c..987fd3db87 100644
--- a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
@@ -18,7 +18,8 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'CurrencyClusterRiskCurrentInvestment'
     });
diff --git a/apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts b/apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts
index 50b33a0bd3..b6d4495ebd 100644
--- a/apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts
+++ b/apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts
@@ -21,7 +21,8 @@ export class EconomicMarketClusterRiskDevelopedMarkets extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'EconomicMarketClusterRiskDevelopedMarkets'
     });
diff --git a/apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts b/apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts
index 02ff3c41cd..e0bc0f5385 100644
--- a/apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts
+++ b/apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts
@@ -21,7 +21,8 @@ export class EconomicMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'EconomicMarketClusterRiskEmergingMarkets'
     });
diff --git a/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts b/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts
index e0a8c9fa4c..bef127ca41 100644
--- a/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts
+++ b/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts
@@ -26,7 +26,8 @@ export class EmergencyFundCoverage extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'EmergencyFundCoverage'
     });
diff --git a/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts b/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
index f01f0675a6..6603a482df 100644
--- a/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
+++ b/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
@@ -18,10 +18,7 @@ export class EmergencyFundSetup extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
-      languageCode,
-      key: 'EmergencyFundSetup'
-    });
+    super({ exchangeRateDataService, languageCode, key: 'EmergencyFundSetup' });
 
     this.emergencyFund = emergencyFund;
     this.i18nService = i18nService;
diff --git a/apps/api/src/models/rules/fees/fee-ratio-total-investment-volume.ts b/apps/api/src/models/rules/fees/fee-ratio-total-investment-volume.ts
index 67dd2a687e..551ad9cbf2 100644
--- a/apps/api/src/models/rules/fees/fee-ratio-total-investment-volume.ts
+++ b/apps/api/src/models/rules/fees/fee-ratio-total-investment-volume.ts
@@ -21,7 +21,8 @@ export class FeeRatioTotalInvestmentVolume extends Rule<Settings> {
     languageCode: string;
     totalInvestmentVolumeInBaseCurrency: number;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'FeeRatioTotalInvestmentVolume'
     });
diff --git a/apps/api/src/models/rules/liquidity/buying-power.ts b/apps/api/src/models/rules/liquidity/buying-power.ts
index 5ac07c9abf..b22654cfe9 100644
--- a/apps/api/src/models/rules/liquidity/buying-power.ts
+++ b/apps/api/src/models/rules/liquidity/buying-power.ts
@@ -18,10 +18,7 @@ export class BuyingPower extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
-      languageCode,
-      key: 'BuyingPower'
-    });
+    super({ exchangeRateDataService, languageCode, key: 'BuyingPower' });
 
     this.buyingPower = buyingPower;
     this.i18nService = i18nService;
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts b/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
index f65f814e63..75e99fa950 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskAsiaPacific'
     });
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts b/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
index d0fe7619ac..04ce81d35f 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskEmergingMarkets'
     });
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts b/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
index 3d7d3c7505..ee9cea1aae 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskEurope'
     });
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts b/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
index 483329bb7d..6dc9b3207b 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
     japanValueInBaseCurrency: number;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskJapan'
     });
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts b/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
index e6c1548b1c..368b452f2d 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
     languageCode: string;
     northAmericaValueInBaseCurrency: number;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskNorthAmerica'
     });