diff --git a/ifrs17/Report/ReportScopes.ipynb b/ifrs17/Report/ReportScopes.ipynb
index 4fad9ffa..1933fbe3 100644
--- a/ifrs17/Report/ReportScopes.ipynb
+++ b/ifrs17/Report/ReportScopes.ipynb
@@ -269,7 +269,7 @@
             "source": [
                 "public interface BestEstimate: IScope<(ReportIdentity Id, CurrencyType CurrencyType), ReportStorage>, IDataCube<ReportVariable> {",
                 "\n    IDataCube<ReportVariable> BestEstimate => Identity.Id switch {",
-                "\n            { ValuationApproach: ValuationApproaches.PAA } => GetScope<LockedBestEstimate>(Identity).LockedBestEstimate, //TODO we should use the economic basis driver to decide which Economic basis to use",
+                "\n            { ValuationApproach: ValuationApproaches.PAA, LiabilityType: LiabilityTypes.LRC } => GetScope<LockedBestEstimate>(Identity).LockedBestEstimate, //TODO we should use the economic basis driver to decide which Economic basis to use",
                 "\n            { ValuationApproach: ValuationApproaches.BBA, IsOci: true } => GetScope<LockedBestEstimate>(Identity).LockedBestEstimate,",
                 "\n            _ => GetScope<CurrentBestEstimate>(Identity).CurrentBestEstimate };",
                 "\n}",
@@ -310,6 +310,7 @@
             "source": [
                 "public interface RiskAdjustment: IScope<(ReportIdentity Id, CurrencyType CurrencyType), ReportStorage>, IDataCube<ReportVariable> {",
                 "\n    IDataCube<ReportVariable> RiskAdjustment => Identity.Id switch {",
+                "\n            { ValuationApproach: ValuationApproaches.PAA, LiabilityType: LiabilityTypes.LRC } => GetScope<LockedRiskAdjustment>(Identity).LockedRiskAdjustment, //TODO we should use the economic basis driver to decide which Economic basis to use",
                 "\n            { ValuationApproach: ValuationApproaches.BBA, IsOci: true } => GetScope<LockedRiskAdjustment>(Identity).LockedRiskAdjustment,",
                 "\n            _ => GetScope<CurrentRiskAdjustment>(Identity).CurrentRiskAdjustment };",
                 "\n}",
@@ -322,6 +323,11 @@
                 "\npublic interface CurrentRiskAdjustment: IScope<(ReportIdentity Id, CurrencyType CurrencyType), ReportStorage>, IDataCube<ReportVariable> {",
                 "\n    IDataCube<ReportVariable> CurrentRiskAdjustment =>  GetScope<FxData>((Identity.Id, Identity.CurrencyType, EstimateTypes.RA)).FxData",
                 "\n        .Filter((\"LiabilityType\", Identity.Id.LiabilityType), (\"EconomicBasis\", EconomicBases.C));",
+                "\n}",
+                "\n",
+                "\npublic interface NominalRiskAdjustment: IScope<(ReportIdentity Id, CurrencyType CurrencyType), ReportStorage>, IDataCube<ReportVariable> {",
+                "\n    IDataCube<ReportVariable> NominalRiskAdjustment => GetScope<FxData>((Identity.Id, Identity.CurrencyType, EstimateTypes.RA)).FxData",
+                "\n        .Filter((\"LiabilityType\", Identity.Id.LiabilityType), (\"EconomicBasis\", EconomicBases.N));",
                 "\n}"
             ],
             "metadata": {},